合并6.8.0代码

app/build.gradle

@@ -4,6 +4,7 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'com.alibaba.arouter'
 apply from: "../package_config.gradle"
+
 android {
     namespace "com.pandoralive.shayu"
     /*  applicationVariants.all { variant ->
@@ -215,9 +216,9 @@ android {
             def server = ''
             if (variant.name.startsWith('huawei')) {
                 channel = "华为"
-            } else if (variant.name.startsWith('samsung')) {
+            } else if (variant.name.contains('samsung')) {
                 channel = "三星"
-            } else if (variant.name.startsWith('google')) {
+            } else if (variant.name.contains('google')) {
                 channel = "谷歌"
             } else {
                 channel = "链接"
@@ -311,11 +312,13 @@ android {
             String tskReqStr = gradle.getStartParameter().getTaskRequests().args.toString()
             println("处理ndk 版本 = " + tskReqStr)
             def isLink = tskReqStr.contains("Link")
-            if (isLink) {
+            if (isLink) {//移除32位so库可以有效降低包体大小，等需要时再弄
                 abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+                //abiFilters "arm64-v8a", "x86_64"
                 println("打包ndk 链接")
             } else {
                 abiFilters "armeabi-v7a", "arm64-v8a"
+                //abiFilters "arm64-v8a"
                 println("打包ndk其他")
             }
 

app/proguard-rules.pro

@@ -315,3 +315,7 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.qiniu.**{*;}
 -keep class com.qiniu.**{public <init>();}
 -ignorewarnings
+
+-keep class com.qiniu.**{*;}
+-keep class com.qiniu.**{public <init>();}
+-ignorewarnings

app/src/main/AndroidManifest.xml

@@ -97,6 +97,9 @@
     <queries>
         <package android:name="com.twitter.android" />
         <package android:name="jp.naver.line.android" />
+        <package android:name="th.co.truemoney.wallet" />
+        <package android:name="com.eg.android.AlipayGphone" />
+        <package android:name="my.com.tngdigital.ewallet" />
 
     </queries>
     <application

app/src/main/java/com/shayu/phonelive/AppContext.java

@@ -6,6 +6,8 @@ import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.LauncherActivity;
 import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.net.http.HttpResponseCache;
 import android.os.Build;
 import android.os.Bundle;

app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java

@@ -8,12 +8,10 @@ import android.os.Looper;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.yunbao.common.BuildConfig;
 import com.yunbao.common.bean.CrashSaveBean;
 import com.yunbao.common.utils.AppManager;
 import com.yunbao.common.utils.FileUtil;
 import com.yunbao.common.utils.SpUtil;
-import com.yunbao.common.utils.ToastUtil;
 
 import java.io.File;
 import java.io.PrintWriter;

app/src/main/java/com/shayu/phonelive/activity/LauncherActivity.java

@@ -74,6 +74,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 
+
 /**
  * Created by cxf on 2018/9/17.
  */