Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties
#	app_third/libbdupdatesdk/src/main/AndroidManifest.xml

WeiChat/src/main/java/com/xzjmyk/pm/activity/CustomCrashActivity.java

@@ -8,6 +8,10 @@ import android.widget.Button;
 import android.widget.ImageView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
 
 import cat.ereza.customactivityoncrash.CustomActivityOnCrash;
 
@@ -30,10 +34,25 @@ public class CustomCrashActivity extends Activity {
         mErrorIv = (ImageView) findViewById(R.id.error_image);
         intent = getIntent();
         stackTraceString = CustomActivityOnCrash.getAllErrorDetailsFromIntent(this, intent);
-//        if (stackTraceString != null && !CommonUtil.isReleaseVersion()) {
-            new MaterialDialog.Builder(this).content(stackTraceString)
+
+        new MaterialDialog.Builder(this).content(stackTraceString)
                     .build().show();
-//        }
+
+        HttpClient httpClient = new HttpClient.Builder("http://10.1.80.56:8085/")
+                .isDebug(true)
+                .build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("mail/errorInfo")
+                .add("message", stackTraceString)
+                .method(Method.GET)
+                .build(), new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+               
+               
+            }
+        }));
+        
         final Class<? extends Activity> activityClassFromIntent = CustomActivityOnCrash.getRestartActivityClassFromIntent(intent);
         final CustomActivityOnCrash.EventListener listenerFromIntent = CustomActivityOnCrash.getEventListenerFromIntent(intent);
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -688,6 +688,23 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         //初始化面部识别
         com.baidu.aip.excep.utils.FaceConfig.initFace(ct);
         Login();
+        
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                testOOM();
+                 
+            }
+        }).start();
+    }
+    
+    public String testOOM(){
+        StringBuilder stringBuilder=new StringBuilder("");
+        for (int i=0;i<1;i++){
+            stringBuilder.append(""+i+testOOM());
+        }
+        
+        return stringBuilder.toString();
     }
 
     private AutoPresenter autoPresenter;

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed May 15 15:28:51 CST 2019
-debugName=975
+#Tue May 21 20:23:25 CST 2019
+debugName=984
 versionName=654
-debugCode=975
+debugCode=984
 versionCode=209

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -24,7 +24,6 @@ import com.core.net.ssl.AuthImageDownloader;
 import com.core.net.utils.NetUtils;
 import com.core.net.volley.FastVolley;
 import com.core.service.InitializeService;
-import com.core.utils.CommonUtil;
 import com.hss01248.notifyutil.NotifyUtil;
 import com.lidroid.xutils.HttpUtils;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
@@ -107,7 +106,7 @@ public class MyApplication extends BaseApplication {
         mRequestQueue = Volley.newRequestQueue(this);
         mHttpUtils = new HttpUtils();
         configHttpUtils();
-
+        initUmengStatistics() ;
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -118,6 +117,7 @@ public class MyApplication extends BaseApplication {
                 // 初始化图片加载
                 initImageLoader();
                 NotifyUtil.init(getInstance());
+                
 
             }
         }, 1);
@@ -205,9 +205,8 @@ public class MyApplication extends BaseApplication {
         MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(this, "57ea27bb67e58e088c003bbf",
                 "baidu", MobclickAgent.EScenarioType.E_UM_NORMAL);
         MobclickAgent.startWithConfigure(config);
-        if (!CommonUtil.isReleaseVersion()) {//当前为开发版本时候不需要上传友盟
-            MobclickAgent.setCatchUncaughtExceptions(false);
-        }
+       // MobclickAgent.setCatchUncaughtExceptions(false);
+      
     }
 
     private void configHttpUtils() {

app_core/common/src/main/java/com/core/service/InitializeService.java

@@ -8,6 +8,7 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.baidu.mapapi.SDKInitializer;
+import com.common.LogUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.preferences.SharedUtil;
 import com.core.app.AppConfig;
@@ -15,7 +16,6 @@ import com.core.app.Constants;
 import com.core.db.DBOpenHelper;
 import com.core.db.DatabaseManager;
 import com.core.db.SQLiteHelper;
-import com.core.utils.CommonUtil;
 import com.facebook.stetho.Stetho;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechUtility;
@@ -143,8 +143,9 @@ public class InitializeService extends IntentService {
         MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(mContext, "57ea27bb67e58e088c003bbf",
                 "baidu", MobclickAgent.EScenarioType.E_UM_NORMAL);
         MobclickAgent.startWithConfigure(config);
-        if (!CommonUtil.isReleaseVersion()) {//当前为开发版本时候不需要上传友盟
-            MobclickAgent.setCatchUncaughtExceptions(false);
-        }
+        LogUtil.d("initUmengStatistics()");
+//        if (!CommonUtil.isReleaseVersion()) {//当前为开发版本时候不需要上传友盟
+           // MobclickAgent.setCatchUncaughtExceptions(false);
+//        }
     }
 }