developer 分支备份

MPAndroidChart/build.gradle

@@ -1,13 +1,12 @@
-
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,5 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }

WeiChat/build.gradle

@@ -3,14 +3,9 @@ apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
 
-    lintOptions {
-        abortOnError false
-    }
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
-    dexOptions {
-        incremental true
-        javaMaxHeapSize "4g"
-    }
     signingConfigs {
         config {
             storeFile file('C:/sigin/applicationsignname[20150409]')
@@ -19,12 +14,10 @@ android {
             keyPassword '13237658359'
         }
     }
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
         minSdkVersion 11
-        targetSdkVersion 22
+        targetSdkVersion 24
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
@@ -32,10 +25,19 @@ android {
         multiDexEnabled true
         signingConfig signingConfigs.config
     }
+
+    useLibrary 'org.apache.http.legacy'
+    lintOptions {
+        abortOnError false
+    }
+
+
+
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -58,7 +60,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.5'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
     }
 }
 
@@ -75,9 +77,7 @@ dexcount {
 }
 
 dependencies {
-
     compile project(':pullToRefershLibraryMy')
-    compile project(':materialdialogs')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')
     compile project(':libfloatingactionbutton')
@@ -119,14 +119,12 @@ dependencies {
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.alibaba:fastjson:1.2.24'
-    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:support-v4:22.2.1'
-    compile 'com.android.support:appcompat-v7:22.2.1'
-    compile 'com.android.support:cardview-v7:22.2.1'
-    compile 'com.android.support:design:22.2.1'
+    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'
@@ -134,8 +132,10 @@ dependencies {
     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 files('libs/core.jar')
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SearchSelectActivity.java

@@ -131,9 +131,9 @@ public class SearchSelectActivity extends BaseActivity {
                 pullToRefreshListView.onRefreshComplete();
                 JSONObject object = JSON.parseObject(message);
                 JSONArray listdata = object.getJSONArray("listdata");
-                if (ListUtils.isEmpty(listdata))
-                    ToastUtil.showToast(ct, R.string.nothing_now);
                 if (SearchSelectActivity.this.page > 1) {
+                    if (ListUtils.isEmpty(listdata))
+                        ToastUtil.showToast(ct, R.string.nothing_now);
                     listdata.addAll(0, seachResult);
                 }
                 if (ListUtils.isEmpty(listdata)) {//为空

WeiChat/src/main/res/values-en/strings.xml

@@ -689,16 +689,10 @@
         <string name = "dialog_confim_phone"> confirm whether to call </string>
         <string name = "dialog_phone"> phone number </string>
         <string name = "dialog_phone_action"> dial </string>
-
         <string name = "friend_add"> Add Friend </string>
-    <string name="task_unconfim"> Pending </string>
-    <string name="task_confimed"> Approved </string>
-    <string name="task_request_me"> Mine </string>
-
         <string name = "task_unconfim"> Pending </string>
         <string name = "task_confimed"> Approved </string>
         <string name = "task_request_me"> Mine </string>
-
         <string name = "task_add"> New Task  </string>
         <string name = "task_send"> Save </string>
         <string name = "task_title"> Title </string>
@@ -706,7 +700,6 @@
         <string name = "task_executor"> Executor </string>
         <string name = "task_starttime"> Start time </string>
         <string name = "task_endtime"> End time </string>
-
         <string name = "taskdetail_title"> task handling </string>
         <string name = "taskdetail_info"> task info </string>
         <string name = "taskdetail_name"> task name </string>
@@ -716,22 +709,18 @@
         <string name = "taskdetail_endtime"> End Time </string>
         <string name = "taskdetail_state"> status </string>
         <string name = "taskdetail_desc"> task description </string>
-
         <string name = "taskdetail_content_title"> reply to content </string>
         <string name = "taskdetail_inputman"> entry person </string>
         <string name = "taskdetail_time"> time </string>
         <string name = "taskdetail_content"> content </string>
-
         <string name = "subscribe_time"> subscription number </string>
         <string name = "subscribe_manager"> subscription management </string>
-
         <string name = "subscribe_unsure"> not subscribed </string>
         <string name = "subscribe_confirmed"> subscribed </string>
-
         <string name = "subscribe_setting"> set </string>
         <string name = "subscribe_unsetting"> Unsubscribed settings </string>
         <string name = "subscribe_hide_nodata"> You do not have a hidden subscription number </string>
-    <string name = "umeng_socialize_network_break_alert" translatable = "false"> Please try to connect to the network! </string>
+        <string name = "umeng_socialize_network_break_alert" translatable = "false"> Please try to connect to the network! </string>
         <string name = "umeng_socialize_comment" translatable = "false"> comments </string>
         <string name = "umeng_socialize_comment_detail" translatable = "false"> comment details </string>
         <string name = "umeng_socialize_back" translatable = "false"> returns </string>
@@ -745,11 +734,9 @@
         <string name = "umeng_socialize_msg_hor" translatable = "false"> hours ago </string>
         <string name = "umeng_socialize_ucenter_login_title_guide" translatable = "false"> visitor login </string>
         <string name = "umeng_socialize_ucenter_login_title_platform" translatable = "false"> login account </string>
-
         <dimen name = "alphabet_size"> 12dip </dimen>
         <dimen name = "umeng_socialize_pad_window_height"> 350dip </dimen>
         <dimen name = "umeng_socialize_pad_window_width"> 580dip </dimen>
-
         <string name = "umeng_socialize_share_content"> AUO Socialization Component (SDK) allows mobile applications to quickly integrate social sharing, and we simplify the access of social platforms and provide developers with a solid foundation of services. (A) to support the major mainstream social platform,
     (B) support pictures, text, gif moving picture, audio, video; @ friends, concerned about the official microblogging and other functions.
     (C) to provide a detailed background user social behavior analysis. Www.umeng.com/social </string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.10'
+        classpath 'com.android.tools.build:gradle:2.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }

lib-zxing/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
 
@@ -27,8 +27,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile files('libs/zxing.jar')
-    compile 'com.android.support:appcompat-v7:22+'
-    compile 'com.android.support:support-v4:22+'
+    compile 'com.android.support:appcompat-v7:24.2.1'
     testCompile 'junit:junit:4.12'
 }
 

libbdupdatesdk/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,5 +21,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }

libedittextformlibrary/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,5 +21,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }

libfloatingactionbutton/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -20,5 +20,5 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }

library-refreshlayout/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 24
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 8
         versionName "1.2.3"
     }
@@ -18,6 +18,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }
 

library-swipemenu_lv/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
     resourcePrefix "swipemenulistview"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -21,76 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }
 
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-version = "1.3.0"
-
-def siteUrl = 'https://github.com/baoyongzhang/SwipeMenuListView'
-def gitUrl = 'https://github.com/baoyongzhang/SwipeMenuListView.git'
-group = "com.baoyz.swipemenulistview"
-install {
-    repositories.mavenInstaller {
-        pom {
-            project {
-                packaging 'aar'
-                // Add your description here
-                name 'SwipeMenuListView' 	//项目描述
-                url siteUrl
-                // Set your license
-                licenses {
-                    license {
-                        name 'The MIT License (MIT)'
-                        url 'http://baoyz.com/licenses/LICENSE.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'baoyongzhang'		//填写的一些基本信息
-                        name 'baoyongzhang'
-                        email 'baoyz94@gmail.com'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = "maven"
-        name = "SwipeMenuListView"	//发布到JCenter上的项目名字
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = ["MIT"]
-        publish = true
-    }
-}

library-viewpager-indicator/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
     }
 
     buildTypes {
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:22.+'
+    compile 'com.android.support:appcompat-v7:24.2.1'
 }

materialdialogs/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
 
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
@@ -20,6 +20,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:recyclerview-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+
 }

pullToRefershLibraryMy/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "25.0.0"
     defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 22
+        minSdkVersion 9
+        targetSdkVersion 24
     }
 
     buildTypes {
@@ -17,4 +17,4 @@ android {
 
 dependencies {
     compile project(':MPAndroidChart')
-}
+}