add:travis ci自动化编译

darkal · darkal · commit 6cb5da662537 · 2017-09-08T16:54:47.000+08:00
fix:修复app启动一定概率空指针crash
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,28 @@
+language: android
+jdk: oraclejdk8
+dist: trusty
+global_env: _JAVA_OPTIONS=-Xmx4g
+
+android:
+  components:
+    - build-tools-24.0.3
+    - android-22
+    - sys-img-armeabi-v7a-android-22
+    - android-24
+    - extra-android-m2repository
+    - extra-android-support
+  licenses:
+    - android-sdk-license-.+
+    - '.+'
+before_script:
+    - wget http://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+    - unzip gradle-2.14.1-bin.zip
+    - export GRADLE_HOME=$PWD/gradle-2.14.1
+    - export PATH=$GRADLE_HOME/bin:$PATH
+    - mkdir "$ANDROID_HOME/licenses" || true
+    - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+    - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+    - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+    - emulator -avd test -no-audio -no-window &
+    - android-wait-for-emulator
+    - adb shell input keyevent 82 &
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'android-apt'
 apply plugin: 'bugly'
 
 bugly {
+    upload = false
     appId = 'db9f598223' // 注册时分配的App ID
     appKey = '119ae85f-0c0b-485c-8ae2-da08e472b9e2' // 注册时分配的App Key
 }
@@ -16,6 +17,9 @@ android {
             storePassword '333333'
         }
     }
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
     compileSdkVersion 24
     buildToolsVersion '24.0.3'
     dataBinding {
@@ -60,6 +64,9 @@ android {
     }
     productFlavors {
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
+        android:resizeableActivity="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/SysApplication.java b/app/src/main/java/cn/darkal/networkdiagnosis/SysApplication.java
@@ -23,6 +23,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Random;
@@ -38,7 +39,7 @@ public class SysApplication extends MultiDexApplication {
     public static Boolean isInitProxy = false;
     public static int proxyPort = 8888;
     public BrowserMobProxy proxy;
-    public List<ResponseFilterRule> ruleList;
+    public List<ResponseFilterRule> ruleList = new ArrayList<>();
 
     @Override
     public void onCreate() {
diff --git a/app/src/main/java/cn/darkal/networkdiagnosis/Utils/DeviceUtils.java b/app/src/main/java/cn/darkal/networkdiagnosis/Utils/DeviceUtils.java
@@ -80,6 +80,8 @@ public static void changeHost(BrowserMobProxy browserMobProxy,String newValue){
                 Log.e("~~~~remapHost ", temp.split(" ")[1] + " " + temp.split(" ")[0]);
             }
         }
+
+
         browserMobProxy.setHostNameResolver(advancedHostResolver);
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ apply plugin: 'android-apt'`
`3`	`3`	`apply plugin: 'bugly'`
`4`	`4`
`5`	`5`	`bugly {`
	`6`	`+ upload = false`
`6`	`7`	`appId = 'db9f598223' // 注册时分配的App ID`
`7`	`8`	`appKey = '119ae85f-0c0b-485c-8ae2-da08e472b9e2' // 注册时分配的App Key`
`8`	`9`	`}`
`@@ -16,6 +17,9 @@ android {`
`16`	`17`	`storePassword '333333'`
`17`	`18`	`}`
`18`	`19`	`}`
	`20`	`+ dexOptions {`
	`21`	`+ javaMaxHeapSize "4g"`
	`22`	`+ }`
`19`	`23`	`compileSdkVersion 24`
`20`	`24`	`buildToolsVersion '24.0.3'`
`21`	`25`	`dataBinding {`
`@@ -60,6 +64,9 @@ android {`
`60`	`64`	`}`
`61`	`65`	`productFlavors {`
`62`	`66`	`}`
	`67`	`+ lintOptions {`
	`68`	`+ abortOnError false`
	`69`	`+ }`
`63`	`70`	`}`
`64`	`71`
`65`	`72`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,8 @@ public static void changeHost(BrowserMobProxy browserMobProxy,String newValue){`
`80`	`80`	`Log.e("~~~~remapHost ", temp.split(" ")[1] + " " + temp.split(" ")[0]);`
`81`	`81`	`}`
`82`	`82`	`}`
	`83`	`+`
	`84`	`+`
`83`	`85`	`browserMobProxy.setHostNameResolver(advancedHostResolver);`
`84`	`86`	`}`
`85`	`87`