update gradle配置化完毕

WeiChat/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    
+
     signingConfigs {
         config {
             storeFile file('C:/sigin/applicationsignname[20150409]')
@@ -17,10 +17,10 @@ android {
             keyPassword '13237658359'
         }
     }
-    
+
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     buildToolsVersion rootProject.ext.android.buildToolsVersion
-   
+
     defaultConfig {
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
@@ -35,7 +35,7 @@ android {
     lintOptions {
         abortOnError false
     }
-    
+
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
@@ -53,14 +53,53 @@ android {
     }
     productFlavors {
     }
-    
+
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+
+    //依赖库
+    testCompile deps.junit
+    compile deps.appcompatV7
+    compile deps.cardviewV7
+    compile deps.design
+    compile deps.multidex
+    compile deps.fastjson
+    compile(deps.stetho) {
+        force = true
+    }
+    compile deps.circleimageview
+    compile deps.jodatime
+    compile deps.systembartint
+    compile deps.photoView
+    compile deps.tagGroup
+    compile deps.analytics
+    compile deps.activityOnCrash
+    compile deps.stickyListHeaders
+    compile deps.stickyGridHeaders
+    compile deps.materialDialogs
+
+    androidTestCompile deps.leakcanaryNp
+    debugCompile deps.leakcanary
+    releaseCompile deps.leakcanaryNp
+
+    //project
+    compile project(':pullToRefershLibraryMy')
+    compile project(':MPAndroidChart')
+    compile project(':libedittextformlibrary')
+    compile project(':libfloatingactionbutton')
+    compile project(':libbdupdatesdk')
+    compile project(':library-swipemenu_lv')
+    compile project(':library-viewpager-indicator')
+    compile project(':lib-zxing')
+    compile project(':library-refreshlayout')
 }
 
 buildscript {
     repositories {
         mavenCentral()
     }
-
     dependencies {
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
     }
@@ -77,72 +116,3 @@ dexcount {
     teamCityIntegration = false
     enableForInstantRun = false
 }
-
-dependencies {
-    //工程
-    compile project(':pullToRefershLibraryMy')
-    compile project(':MPAndroidChart')
-    compile project(':libedittextformlibrary')
-    compile project(':libfloatingactionbutton')
-    compile project(':libbdupdatesdk')
-    compile project(':library-swipemenu_lv')
-    compile project(':library-viewpager-indicator')
-    compile project(':lib-zxing')
-    compile project(':library-refreshlayout')
-    //架包
-    compile files('libs/android-async-http-1.4.5.jar')
-    compile files('libs/asmack.jar')
-    compile files('libs/BaiduLBS_Android.jar')
-    compile files('libs/cyberplayer-sdk.jar')
-    compile files('libs/httpmime-4.2.jar')
-    compile files('libs/nineoldandroids.jar')
-    compile files('libs/org.xbill.dns_2.1.6.jar')
-    compile files('libs/ormlite-android-4.48.jar')
-    compile files('libs/ormlite-core-4.48.jar')
-    compile files('libs/pinyin4j-2.5.0.jar')
-    compile files('libs/universal-image-loader-1.9.0.jar')
-    compile files('libs/volley.jar')
-    compile files('libs/xutils.jar')
-    compile files('libs/flexjson-2.1.jar')
-    compile files('libs/SocialSDK_WeiXin_2.jar')
-    compile files('libs/SocialSDK_umengwx.jar')
-    compile files('libs/SocialSDK_QQZone_3.jar')
-    compile files('libs/SocialSDK_umengqq.jar')
-    compile files('libs/umeng_social_apiv6.0.0.jar')
-    compile files('libs/umeng_social_netv6.0.0.jar')
-    compile files('libs/umeng_social_viewv6.0.0.jar')
-    compile files('libs/SocialSDK_umengsina.jar')
-    compile files('libs/SocialSDK_Sina.jar')
-    compile files('libs/weiboSDKCore_3.1.4.jar')
-    compile('com.facebook.stetho:stetho:1.4.1') {
-        force = true
-    }
-    compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
-    compile files('libs/lite-orm-1.7.0.jar')
-    compile files('libs/Msc.jar')
-    compile files('libs/zhy_treeview.jar')
-    compile files('libs/core.jar')
-    //依赖库
-    compile 'com.alibaba:fastjson:1.2.24'
-    compile 'de.hdodenhof:circleimageview:2.1.0'
-    compile 'joda-time:joda-time:2.9.4'
-    compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
-    compile 'com.commit451:PhotoView:1.2.5'
-    compile 'me.gujun.android.taggroup:library:1.4@aar'
-    compile 'com.umeng.analytics:analytics:latest.integration'
-    compile 'com.android.support:multidex:1.0.1'
-    compile 'cat.ereza:customactivityoncrash:1.5.0'
-    compile 'se.emilsjolander:stickylistheaders:2.7.0'
-    compile 'com.github.TonicArtos:StickyGridHeaders:1.0.1'
-    compile 'com.afollestad.material-dialogs:core:0.9.0.2'
-    testCompile 'junit:junit:4.12'
-    androidTestCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
-    compile 'com.android.support:design:24.2.1'
-
-
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java

@@ -463,15 +463,13 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                 MyApplication.getInstance().getConfig().APP_QUER_YUSER, new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-//                ToastUtil.showErrorNet(MyApplication.getInstance());
-                //   showModel(models);
+                ToastUtil.showErrorNet(MyApplication.getInstance());
             }
         }, new StringJsonObjectRequest.Listener<String>() {
             @Override
             public void onResponse(ObjectResult<String> result) {
                 String message = result.toString();
                 if (!OACheckUtil.isEmpty(message)) {
-                    LogUtil.d("Test","message:"+message);
                     hanlderAppQueryuserInThread(message);
                 }
             }
@@ -642,8 +640,10 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     if (success) {
                         String role = UserRoleUtils.getUserRole();
                         if ("1".equals(role)) {
+                            LogUtil.d("Test","个人用户不需要加载企业架构");
                             //个人用户不需要加载企业架构
                             loadLocalContacts();
+                            return;
                         }
                         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
                         JSONObject object = JSON.parseObject(message);

app_core/imageload/build.gradle

@@ -19,10 +19,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

app_core/network/build.gradle

@@ -20,10 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

app_third/MPAndroidChart/build.gradle

@@ -19,5 +19,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

app_third/lib-zxing/build.gradle

@@ -19,12 +19,8 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile files('libs/zxing.jar')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    testCompile 'junit:junit:4.12'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }
 
 ext {

app_third/libbdupdatesdk/build.gradle

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

app_third/libedittextformlibrary/build.gradle

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

app_third/libfloatingactionbutton/build.gradle

@@ -19,5 +19,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

app_third/library-refreshlayout/build.gradle

@@ -9,14 +9,11 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }
 

app_third/library-swipemenu_lv/build.gradle

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

app_third/library-viewpager-indicator/build.gradle

@@ -19,5 +19,6 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

app_third/materialdialogs/build.gradle

@@ -19,6 +19,8 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
+    testCompile deps.junit
+    compile deps.appcompatV7
+    compile deps.design
+
 }

app_third/pullToRefershLibraryMy/build.gradle

@@ -18,5 +18,6 @@ android {
 }
 
 dependencies {
-    compile project(':MPAndroidChart')
+    testCompile deps.junit
+    compile deps.appcompatV7
 }

version.gradle

@@ -1,7 +1,5 @@
 /*
 Shared gradle properties
-    android:versionCode="111"
-    android:versionName="5.8.9"
 */
 
 ext {
@@ -11,51 +9,82 @@ ext {
             minSdkVersion    : 14,
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
-            versionCode      : 1,
-            versionName      : '1.0',
+            versionCode      : 111,
+            versionName      : '5.8.9',
     ]
 
     depsVersion = [
-            junitVersion      : '4.12',
-            supportVersion    : '24.2.1',
-            butterknifeVersion: '8.2.1',
-            fastjsonVersion   : '1.2.24',
-            logVersion        : '1.15',
-            rxJavaVersion     : '1.1.8',
-            rxAndroidVersion  : '1.2.1',
-            okhttpVersion     : '3.4.1',
-            retrofitVersion   : '2.1.0',
-            glideVersion      : '3.8.0',
-            supertoastsVersion: '2.0',
-            alerterVersion    : '1.0.6',
+            junitVersion            : '4.12',
+            supportVersion          : '24.2.1',
+            multidex                : '1.0.1',
+            butterknifeVersion      : '8.2.1',
+            fastjsonVersion         : '1.2.24',
+            logVersion              : '1.15',
+            rxJavaVersion           : '1.1.8',
+            rxAndroidVersion        : '1.2.1',
+            okhttpVersion           : '3.4.1',
+            retrofitVersion         : '2.1.0',
+            stethoVersion           : '1.4.1',
+            glideVersion            : '3.8.0',
+            supertoastsVersion      : '2.0',
+            alerterVersion          : '1.0.6',
+            circleimageviewVersion  : '2.1.0',
+            systembartintVersion    : '1.0.3',
+            photoViewVersion        : '1.2.5',
+            leakcanaryVersion       : '1.5',
+            materialDialogsVersion  : '0.9.0.2',
+            stickyGridHeadersVersion: '1.0.1',
+            stickyListHeadersVersion: '2.7.0',
+            activityOnCrashVersion  : '1.5.0',
+            analyticsVersion        : 'latest.integration',
+            tagGroupVersion         : '1.4@aar',
+            jodatimeVersion         : '2.9.4'
     ]
 
     deps = [
-            junit             : 'junit:junit:' + depsVersion.junitVersion,
-            appcompatV7       : 'com.android.support:appcompat-v7:' + depsVersion.supportVersion,
-            supportV4         : 'com.android.support:support-v4:' + depsVersion.supportVersion,
-            supportAnnotations: 'com.android.support:support-annotations:' + depsVersion.supportVersion,
-            design            : 'com.android.support:design:' + depsVersion.supportVersion,
-            gridlayoutV7      : 'com.android.support:gridlayout-v7:' + depsVersion.supportVersion,
-            recyclerviewV7    : 'com.android.support:recyclerview-v7:' + depsVersion.supportVersion,
-            cardviewV7        : 'com.android.support:cardview-v7:' + depsVersion.supportVersion,
-           
-            logger            : 'com.orhanobut:logger:'+depsVersion.logVersion,
-            fastjson          : 'com.alibaba:fastjson:'+depsVersion.fastjsonVersion,
-            
-            butterknife       : 'com.jakewharton:butterknife:' + depsVersion.butterknifeVersion,
-            butterknifeCompiler   : 'com.jakewharton:butterknife-compiler:' + depsVersion.butterknifeVersion,
-            rxjava            : 'io.reactivex:rxjava:' + depsVersion.rxJavaVersion,
-            rxandroid         : 'io.reactivex:rxandroid:' + depsVersion.rxAndroidVersion,
-            okhttp            : 'com.squareup.okhttp3:okhttp:' + depsVersion.okhttpVersion,
-            retrofit          : 'com.squareup.retrofit2:retrofit:' + depsVersion.retrofitVersion,
-            converterGson     : 'com.squareup.retrofit2:converter-gson:' + depsVersion.retrofitVersion,
-            adapterRxjava     : 'com.squareup.retrofit2:adapter-rxjava:' + depsVersion.retrofitVersion,
-
-            glide             : 'com.github.bumptech.glide:glide:' + depsVersion.glideVersion,
-            
-            supertoasts       :'com.github.johnpersano:supertoasts:'+depsVersion.supertoastsVersion,
-            alerter            :'com.tapadoo.android:alerter:'+depsVersion.alerterVersion
+            junit              : 'junit:junit:' + depsVersion.junitVersion,
+            appcompatV7        : 'com.android.support:appcompat-v7:' + depsVersion.supportVersion,
+            supportV4          : 'com.android.support:support-v4:' + depsVersion.supportVersion,
+            supportAnnotations : 'com.android.support:support-annotations:' + depsVersion.supportVersion,
+            design             : 'com.android.support:design:' + depsVersion.supportVersion,
+            gridlayoutV7       : 'com.android.support:gridlayout-v7:' + depsVersion.supportVersion,
+            recyclerviewV7     : 'com.android.support:recyclerview-v7:' + depsVersion.supportVersion,
+            cardviewV7         : 'com.android.support:cardview-v7:' + depsVersion.supportVersion,
+            multidex           : 'com.android.support:multidex:' + depsVersion.multidex,
+
+            logger             : 'com.orhanobut:logger:' + depsVersion.logVersion,
+            fastjson           : 'com.alibaba:fastjson:' + depsVersion.fastjsonVersion,
+            stetho             : 'com.facebook.stetho:stetho:' + depsVersion.stethoVersion,
+
+            butterknife        : 'com.jakewharton:butterknife:' + depsVersion.butterknifeVersion,
+            butterknifeCompiler: 'com.jakewharton:butterknife-compiler:' + depsVersion.butterknifeVersion,
+            rxjava             : 'io.reactivex:rxjava:' + depsVersion.rxJavaVersion,
+            rxandroid          : 'io.reactivex:rxandroid:' + depsVersion.rxAndroidVersion,
+            okhttp             : 'com.squareup.okhttp3:okhttp:' + depsVersion.okhttpVersion,
+            retrofit           : 'com.squareup.retrofit2:retrofit:' + depsVersion.retrofitVersion,
+            converterGson      : 'com.squareup.retrofit2:converter-gson:' + depsVersion.retrofitVersion,
+            adapterRxjava      : 'com.squareup.retrofit2:adapter-rxjava:' + depsVersion.retrofitVersion,
+
+            glide              : 'com.github.bumptech.glide:glide:' + depsVersion.glideVersion,
+
+            supertoasts        : 'com.github.johnpersano:supertoasts:' + depsVersion.supertoastsVersion,
+            alerter            : 'com.tapadoo.android:alerter:' + depsVersion.alerterVersion,
+
+            circleimageview    : 'de.hdodenhof:circleimageview:' + depsVersion.circleimageviewVersion,
+            systembartint      : 'com.readystatesoftware.systembartint:systembartint:' + depsVersion.systembartintVersion,
+            photoView          : 'com.commit451:PhotoView:' + depsVersion.photoViewVersion,
+
+            tagGroup           : 'me.gujun.android.taggroup:library:' + depsVersion.tagGroupVersion,
+            analytics          : 'com.umeng.analytics:analytics:' + depsVersion.analyticsVersion,
+            activityOnCrash    : 'cat.ereza:customactivityoncrash:' + depsVersion.activityOnCrashVersion,
+            stickyListHeaders  : 'se.emilsjolander:stickylistheaders:' + depsVersion.stickyListHeadersVersion,
+            stickyGridHeaders  : 'com.github.TonicArtos:StickyGridHeaders:' + depsVersion.stickyGridHeadersVersion,
+            materialDialogs    : 'com.afollestad.material-dialogs:core:' + depsVersion.materialDialogsVersion,
+            leakcanary         : 'com.squareup.leakcanary:leakcanary-android:' + depsVersion.leakcanaryVersion,
+            leakcanaryNp       : 'com.squareup.leakcanary:leakcanary-android-no-op:' + depsVersion.leakcanaryVersion,
+            jodatime           : 'joda-time:joda-time:' + depsVersion.jodatimeVersion
+
+
     ]
 }