重构升级。

WeiChat/build.gradle

@@ -97,6 +97,11 @@ dependencies {
     releaseCompile deps.leakcanaryNp
     //project
     compile project(':common')
+    compile project(':network')
+    compile project(':imageload')
+    compile project(':applogin')
+//    compile project(':message')
+    
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/contact/ContactFragment.java

@@ -82,11 +82,10 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     private TextView text_dialog;
     @ViewInject(R.id.pull_refresh_list)
     private StickyListHeadersListView refreshListView;
-    
-    
-  
-    private TextView  tv_uu_new;
-    
+
+
+    private TextView tv_uu_new;
+
     private FriendSortAdapter adapter;
     private String loginUserId;
     private List<BaseSortModel<Friend>> showDatas;//显示的数据
@@ -147,7 +146,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
 //                if (OAConfig.canShowCrm2_0())
 //                    startActivity(new Intent(getActivity(), AddContactsActivity.class));
 //                else
-                    startActivity(new Intent(getActivity(), UserSearchActivity.class));
+                startActivity(new Intent(getActivity(), UserSearchActivity.class));
             } else {
                 showPopupWindow();
             }
@@ -239,15 +238,15 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         mPullToRefreshView.setOnRefreshListener(new PullToRefreshView.OnRefreshListener() {
             @Override
             public void onRefresh() {
-                if ("1".equals(UserRoleUtils.getUserRole())){
+                if ("1".equals(UserRoleUtils.getUserRole())) {
                     mPullToRefreshView.setRefreshing(false, false);
                     mcProgressDialog.dismiss();
-                   
-                }else{
+
+                } else {
                     loadFriendsNet();
-                   
+
                 }
-                
+
             }
         });
         //item点击事件处理
@@ -287,7 +286,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         loadDataInThread();
         //mcProgressDialog.show();
 
-       
+
     }
 
     @Override
@@ -306,7 +305,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
         headview.findViewById(R.id.group).setOnClickListener(this);//商务群
         headview.findViewById(R.id.uu_friend).setOnClickListener(this);//我的好友
         headview.findViewById(R.id.peculiar_tv).setOnClickListener(this);//我的好友
-        tv_uu_new= (TextView) headview.findViewById(R.id.tv_uu_new);
+        tv_uu_new = (TextView) headview.findViewById(R.id.tv_uu_new);
         tv_uu_new.setVisibility(CommonUtil.getSharedPreferencesBoolean(ct, Constants.SET_UU_NEW, false) ? View.GONE : View.VISIBLE);
     }
 
@@ -522,7 +521,7 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
                 break;
             case R.id.peculiar_tv://常用联系人
                 intent = new Intent(ct, MyFriendActivity.class);
-                intent.putExtra("isPeculiar",true);
+                intent.putExtra("isPeculiar", true);
                 ct.startActivity(intent);
 //                intent = new Intent(ct, SelectPContactsActivity.class);
 //                SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
@@ -537,6 +536,4 @@ public class ContactFragment extends EasyFragment implements View.OnClickListene
     }
 
 
-
-
 }

app_core/message/build.gradle

@@ -23,7 +23,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.github.johnpersano:supertoasts:2.0'
+    testCompile deps.junit
+    compile deps.appcompatV7
+    compile  deps.supertoasts
 }

app_core/network/build.gradle

@@ -26,9 +26,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7
-
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
+    
     compile deps.rxjava
     compile deps.rxandroid
     compile deps.okhttp

app_third/lib-zxing/src/androidTest/java/com/uuzuche/lib_zxing/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.uuzuche.lib_zxing;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.uuzuche.lib_zxing.test", appContext.getPackageName());
-    }
-}

version.gradle

@@ -8,7 +8,7 @@ ext {
     android = [
             compileSdkVersion: 24,
             buildToolsVersion: '25.0.0',
-            minSdkVersion    : 14,
+            minSdkVersion    : 16,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 111,