代码冲突

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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -681,7 +681,9 @@ public class ViewUtil {
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "spaceId", String.valueOf(entity.getSpaceId()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "companyName", String.valueOf(entity.getName()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "companyEnUu", String.valueOf(entity.getEnuu()));
+                                                //兼容uas
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "erp_uu", String.valueOf(entity.getEnuu()));
+                                                CommonUtil.setSharedPreferences(MyApplication.getInstance(), "erp_commpany", String.valueOf(entity.getName()));
                                                 CommonUtil.setSharedPreferences(MyApplication.getInstance(), "userRole", "3");
                                                 LoginB2BTask(phone, password, entity.getSpaceId());//登录B2B
                                             }

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -121,7 +121,7 @@ public class HttpClient {
         public Builder() {
             this.method = Method.GET;
             this.params.put("client","Android Client");
-            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+           this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
         }
 
         public Builder(String url) {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -129,13 +129,16 @@ public class BComSetCompanyRestActivity extends BaseActivity implements View.OnC
                 .build(),new ResultSubscriber<>(new Result2Listener<Object>() {
             @Override
             public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                if (!JSONUtil.validate(o.toString()) || o == null) {
+                    progressDialog.dismiss();
+                    return;
+                }
                 LogUtil.prinlnLongMsg("appBatchMrest", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                    progressDialog.dismiss();
                     finish();
                 }
+                progressDialog.dismiss();
             }
 
             @Override

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -194,9 +194,9 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
                 LogUtil.prinlnLongMsg("appBatchMrest", o.toString()+"");
                 if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
                     Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                    progressDialog.dismiss();
                     finish();
                 }
+                progressDialog.dismiss();
             }
 
             @Override

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -108,6 +108,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
+//            model.setSt_id("0");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }
@@ -146,7 +147,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_companyid(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"));
             model.setSt_siid(sc_industrycode);
             model.setSt_name("");
-            model.setSt_id("0");
+//            model.setSt_id("0");
             mList.add(model);
             myAdapter.notifyDataSetChanged();
         }else if (v.getId() == R.id.save_bt){

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 123,
-            versionName      : '6.0.2',
+            versionCode      : 122,
+            versionName      : '6.0.1',
     ]
 
     depsVersion = [