代码冲突

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_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -208,7 +208,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 intent.putExtra("type", 1);
                 intent.putExtra("title", getString(R.string.booking_object_name));
                 intent.putExtra("isSingleSelect", false);
-                intent.putParcelableArrayListExtra("models",models);
+                intent.putParcelableArrayListExtra("models",models);//状态回传
                 startActivityForResult(intent, 0x01);
             }
         } else if (i == R.id.rl_company) {
@@ -328,7 +328,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
             bt_commit.setEnabled(true);
             return;
         }
-        //ab_bcompany
+        //前面四个值是连带出来的
         String map = "{" +
                 "\"ab_bman\":\"" + tvBookObject.getText().toString() + "\"," +
                 "\"ab_bmanid\":\"" + imId + "\"," +

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/activity/ContactsActivity.java

@@ -467,15 +467,15 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             public void run() {
                 final List<ContactsModel> lists = getLocalContactsByDB();
                 //上传
-//                if (!ListUtils.isEmpty(stateModels)){
-//                    for (int i = 0; i <lists.size() ; i++) {
-//                        for (int j = 0; j <stateModels.size(); j++) {
-//                            if (lists.get(i).getImid().equals(stateModels.get(j).getImid())){
-//                                lists.get(i).setClick(stateModels.get(j).isClick);
-//                            }
-//                        }
-//                    }
-//                }
+                if (!ListUtils.isEmpty(stateModels)){
+                    for (int i = 0; i <lists.size() ; i++) {
+                        for (int j = 0; j <stateModels.size(); j++) {
+                            if (lists.get(i).getImid().equals(stateModels.get(j).getImid())){
+                                lists.get(i).setClick(stateModels.get(j).isClick);
+                            }
+                        }
+                    }
+                }
                 ThreadPool.getThreadPool().addTask(new Runnable() {
                     @Override
                     public void run() {

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

@@ -34,6 +34,7 @@ import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.common.LogUtil;
 import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.common.file.FileUtils;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.DisplayUtil;
@@ -187,7 +188,11 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         findViewById(R.id.clear_cache_rl).setOnClickListener(this);
         findViewById(R.id.use_help_rl).setOnClickListener(this);
         findViewById(R.id.about_us_rl).setOnClickListener(this);
-        long cacheSize = FileUtils.getFileSize(new File(MyApplication.getInstance().mAppDir));
+        String path= MyApplication.getInstance().mAppDir;
+        if (StringUtil.isEmpty(path)){
+            path=getCacheDir().getPath();
+        }
+        long cacheSize = FileUtils.getFileSize(new File(path));
         mCacheTv.setText(FileUtils.formatFileSize(cacheSize));
         uas_website_tv.setText(CommonUtil.getSharedPreferences(this, "erp_baseurl"));