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

# Conflicts:
#	WeiChat/src/main/AndroidManifest.xml
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java
#	app_core/common/src/main/java/com/core/model/SelectCollisionTurnBean.java
#	app_core/network/src/main/java/com/me/network/app/http/impl/RetrofitImpl.java
#	app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ComplaintDetailActivity.java
#	app_modular/appmessages/src/main/java/com/modular/appmessages/activity/ProcessMsgActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/TaskAddErpActivity.java
#	app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

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

@@ -146,7 +146,11 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             type = getIntent().getIntExtra("type", 0);
             String title = getIntent().getStringExtra("title");
             isSingleSelect = getIntent().getBooleanExtra("isSingleSelect", true);
-           
+            if(isSingleSelect){
+                select_rl.setVisibility(View.GONE);
+            }else{
+                select_rl.setVisibility(View.VISIBLE);
+            }
             if (!StringUtil.isEmpty(title)) {
                 getSupportActionBar().setTitle(title);
             } else {
@@ -424,7 +428,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     List<Contacts> contacts =
                             ContactsUtils.getContacts1();
                     //上传数据到服务器
-                    uploadData(contacts);
+                  uploadData(contacts);
                     if (contacts != null) {
                         for (Contacts entity : contacts) {
                             ContactsModel model = new ContactsModel();
@@ -463,6 +467,14 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             @Override
             public void run() {
                 final List<ContactsModel> lists = getLocalContactsByDB();
+//                List<ContactsModel> contacts=new ArrayList<>();
+//                for (ContactsModel model:lists){
+//                    if ("0".equals(model.getImid())){
+//                        contacts.add(model);
+//                    }
+//                }
+//                uploadData(contacts);
+                    
                 LogUtil.d("Test", "!ListUtils.isEmpty(lists)=" + !ListUtils.isEmpty(lists));
                 boolean falg = !ListUtils.isEmpty(lists) && !isHasNet;
                 LogUtil.d("Test", "缓存不为空！" + falg);
@@ -481,13 +493,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                                 mlist.onRefreshComplete();
                                 voiceSearchView.getSearch_edit().setHint(lists.size() + "位联系人");
                                 dimssLoading();
-                                if(isSingleSelect){
-                                    select_rl.setVisibility(View.GONE);
-                                    //include_tag.getBackground().setAlpha(0);
-                                }else{
-                                    select_rl.setVisibility(View.VISIBLE);
-                                    // include_tag.getBackground().setAlpha(100);
-                                }
+                              
                             }
                         }
                     });

version.gradle

@@ -11,8 +11,8 @@ ext {
             minSdkVersion    : 9,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 113,
-            versionName      : '5.9.1',
+            versionCode      : 114,
+            versionName      : '5.9.2',
     ]
 
     depsVersion = [