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

WeiChat/build.gradle

@@ -23,7 +23,7 @@ android {
     buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
-        minSdkVersion 8
+        minSdkVersion 9
         targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -119,4 +119,8 @@ dependencies {
     compile files('libs/SocialSDK_umengsina.jar')
     compile files('libs/SocialSDK_Sina.jar')
     compile files('libs/weiboSDKCore_3.1.4.jar')
+    compile 'cat.ereza:customactivityoncrash:1.5.0'
+    compile ('com.facebook.stetho:stetho:1.4.1'){
+        force = true
+    }
 }

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

@@ -14,6 +14,7 @@ import android.util.Log;
 import com.android.volley.RequestQueue;
 import com.android.volley.toolbox.Volley;
 import com.baidu.mapapi.SDKInitializer;
+import com.facebook.stetho.Stetho;
 import com.lidroid.xutils.DbUtils;
 import com.lidroid.xutils.HttpUtils;
 import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
@@ -65,6 +66,8 @@ public class MyApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        //Stetho调试工具初始化
+        Stetho.initializeWithDefaults(this);
         INSTANCE = this;
         ZXingLibrary.initDisplayOpinion(this);
         mRequestQueue = Volley.newRequestQueue(this);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/SubscribeDetailActivity.java

@@ -113,8 +113,8 @@ public class SubscribeDetailActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_about, menu);
-        return true;
+//        getMenuInflater().inflate(R.menu.menu_about, menu);
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
@@ -132,7 +132,7 @@ public class SubscribeDetailActivity extends BaseActivity {
                         .withTitle("UU互联订阅号")
                         .withText(mSubName)
                         .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                        .withTargetUrl(subscribeUrl)
+                        .withTargetUrl(subscribeUrl+"&sessionUser="+CommonUtil.getSharedPreferences(mContext, "erp_username"))
                         .setCallback(CommonUtil.umShareListener)
                         .open();
                 break;