合并6.8.0代码

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.
  */