需求完成：上传本地通讯录过滤已经注册的用户

WeiChat/build.gradle

@@ -29,12 +29,10 @@ android {
         versionName rootProject.ext.android.versionName
         multiDexEnabled true
         signingConfig signingConfigs.config
-
-        // 默认是umeng的渠道
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
         ndk {
-            abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips","x86_64","mips64"
         }
     }
 

WeiChat/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.xzjmyk.pm.activity"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.xzjmyk.pm.activity"
+    android:versionCode="114"
+    android:versionName="5.9.2">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -882,13 +884,12 @@
             android:name=".ui.erp.activity.oa.SelectCollisionActivity"
             android:configChanges="keyboardHidden|orientation"
             android:label="@string/select_join_number"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" >
+            android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
                 <action android:name="com.modular.main.SelectCollisionActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-  
 
 
         <!-- 消息红点模块 -->
@@ -968,8 +969,7 @@
         <activity android:name=".ui.erp.activity.ADActivity" />
         <activity
             android:name=".ui.erp.activity.oa.AddContactsActivity"
-            android:label="@string/add_contact">
-        </activity>
+            android:label="@string/add_contact"></activity>
         <activity
             android:name=".ui.erp.activity.oa.AddVisitReportActivity"
             android:label="@string/visitrecord" />
@@ -984,17 +984,17 @@
         <activity
             android:name=".ui.erp.activity.secretary.SelectPContactsActivity"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity" >
+        <activity android:name=".ui.erp.activity.secretary.BookingDetailActivity">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingDetailActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.erp.activity.secretary.BookingListActivity" >
+        <activity android:name=".ui.erp.activity.secretary.BookingListActivity">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingListActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>  
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"

app_core/common/src/main/java/com/common/config/VersionUtil.java

@@ -6,7 +6,7 @@ package com.common.config;
 public class VersionUtil {
 
     public static boolean showUUHelper() {
-        return false;
+        return true;
     }
 
 }

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingDetailActivity.java

@@ -214,6 +214,8 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
     }
 
     private void updateUi(boolean isShared) {
+        ll_bottom.setVisibility(View.VISIBLE);
+        sv_top.setVisibility(View.VISIBLE);
         tvTime.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
                 model.getAb_endtime().substring(11,16));
         tvAddress.setText(model.getAb_address());
@@ -296,8 +298,7 @@ public class BBookingDetailActivity extends OABaseActivity implements View.OnCli
             ll_bottom.setVisibility(View.GONE);
             isMenuShuffle=false;
         }
-        ll_bottom.setVisibility(View.VISIBLE);
-        sv_top.setVisibility(View.VISIBLE);
+     
     }
 
     public void initEvent(){

app_modular/appbooking/src/main/res/layout/activity_bbooking_add.xml

@@ -41,6 +41,7 @@
             </RelativeLayout>
             <RelativeLayout
                 android:id="@+id/rl_company"
+                android:visibility="gone"
                 style="@style/item_menu">
 
                 <TextView

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

@@ -889,10 +889,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             "},");
                 }
             }
-            LogUtil.d("HttpLogs","token:"+MyApplication.getInstance().mAccessToken);
-            LogUtil.d("HttpLogs","userid:"+MyApplication.getInstance().mLoginUser.getUserId());
-            LogUtil.d("HttpLogs","username:"+MyApplication.getInstance().mLoginUser.getNickName());
-            LogUtil.prinlnLongMsg("HttpLogs","map:"+mapBuilder.toString());
+           LogUtil.prinlnLongMsg("HttpLogs",mapBuilder.toString());
             HttpClient httpClient = new HttpClient.Builder().url(Constants.IM_BASE_URL)
                     .isDebug(true).build(true);
             httpClient.Api().send(new HttpClient.Builder()
@@ -906,8 +903,10 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
 
                 @Override
                 public void onResponse(Object o) {
+                    LogUtil.prinlnLongMsg("HttpLogs",o.toString());
+                    LogUtil.d("HttpLogs","result:"+o.toString());
                        if(JSONUtil.validate(o.toString())){
-                        LogUtil.d("HttpLogs","result:"+o.toString());
+                       
                        }
                 }
             }));

version.gradle

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