Browse Source

降版本
1.添加商机跟进程序错误处理
2.添加拜访报告新处理

Bitliker 8 years ago
parent
commit
3b0fe078a4

+ 5 - 5
MPAndroidChart/build.gradle

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

+ 19 - 19
WeiChat/build.gradle

@@ -2,10 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
 
+    lintOptions {
+        abortOnError false
+    }
+
+    dexOptions {
+        incremental true
+        javaMaxHeapSize "4g"
+    }
     signingConfigs {
         config {
             storeFile file('C:/sigin/applicationsignname[20150409]')
@@ -14,10 +19,12 @@ android {
             keyPassword '13237658359'
         }
     }
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     defaultConfig {
         applicationId "com.xzjmyk.pm.activity"
         minSdkVersion 11
-        targetSdkVersion 24
+        targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7
@@ -25,19 +32,10 @@ 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
@@ -60,7 +58,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.5'
     }
 }
 
@@ -77,7 +75,9 @@ dexcount {
 }
 
 dependencies {
+
     compile project(':pullToRefershLibraryMy')
+    compile project(':materialdialogs')
     compile project(':MPAndroidChart')
     compile project(':libedittextformlibrary')
     compile project(':libfloatingactionbutton')
@@ -119,12 +119,14 @@ 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:appcompat-v7:24.2.1'
-    compile 'com.android.support:cardview-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
+    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.commit451:PhotoView:1.2.5'
     compile 'me.gujun.android.taggroup:library:1.4@aar'
     compile 'com.umeng.analytics:analytics:latest.integration'
@@ -132,10 +134,8 @@ 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')
 }

+ 4 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/BusinessLessActivity.java

@@ -188,7 +188,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
             switch (msg.what) {
                 case Constants.HTTP_SUCCESS_INIT:
                     progressDialog.dismiss();
-                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result")+" type:"+type);
+                    Log.i(TAG, "handleMessage:" + msg.getData().getString("result") + " type:" + type);
                     Crouton.makeText(activity, 30, "操作成功!", Style.holoGreenLight, 2000).show();
                     if (type == 2) {
                         updataSchedule(0x16);
@@ -214,7 +214,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
                     Log.i(TAG, "handleMessage:" + msg.getData().getString("result"));
 //                    Crouton.makeText(activity,35, msg.getData().getString("result"),
 //                            Style.holoRedLight, 2000).show();
-                    ViewUtil.ToastMessage(mContext, msg.getData().getString("result"),Style.holoRedLight,3000);
+                    ViewUtil.ToastMessage(mContext, msg.getData().getString("result"), Style.holoRedLight, 3000);
                     break;
                 case 2:
                     progressDialog.dismiss();
@@ -265,7 +265,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
 
     private void sendHttpResquest(int what, String typeStr) {
         progressDialog.show();
-        String remark = et_remark.getText().toString();
+        String remark = StringUtils.string2Json(et_remark.getText().toString());
         String gridSoreData = "{\n";
         for (int i = 0; i < datas.size(); i++) {
             String value = mEditText.get(i) == null ? "" : mEditText.get(i).toString();
@@ -275,7 +275,7 @@ public class BusinessLessActivity extends BaseActivity implements View.OnClickLi
         if (StringUtils.isEmpty(emname)) {
             emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
         }
-        if(StringUtils.isEmpty(tv_business_state.getText().toString())&&type==2){
+        if (StringUtils.isEmpty(tv_business_state.getText().toString()) && type == 2) {
             progressDialog.dismiss();
             ToastMessage("商机阶段为必填项");
             return;

BIN
WeiChat/src/main/jniLibs/armeabi-v7a/libmsc.so


BIN
WeiChat/src/main/jniLibs/armeabi/libmsc.so


BIN
WeiChat/src/main/jniLibs/mips/libmsc.so


BIN
WeiChat/src/main/jniLibs/mips64/libmsc.so


BIN
WeiChat/src/main/jniLibs/x86/libmsc.so


BIN
WeiChat/src/main/jniLibs/x86_64/libmsc.so


+ 7 - 2
build.gradle

@@ -1,3 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
 buildscript {
     repositories {
         jcenter()
@@ -5,12 +7,15 @@ buildscript {
         maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.0'
     }
 }
 
+
+
+
 allprojects {
     repositories {
         jcenter()
@@ -20,4 +25,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

+ 6 - 5
lib-zxing/build.gradle

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

+ 5 - 5
libbdupdatesdk/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 24
+        minSdkVersion 8
+        targetSdkVersion 22
         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:24.2.1'
+    compile 'com.android.support:appcompat-v7:22.2.0'
 }

+ 5 - 5
libedittextformlibrary/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 24
+        minSdkVersion 8
+        targetSdkVersion 22
         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:24.2.1'
+    compile 'com.android.support:appcompat-v7:22.2.0'
 }

+ 5 - 5
libfloatingactionbutton/build.gradle

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

+ 4 - 4
library-refreshlayout/build.gradle

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

+ 74 - 5
library-swipemenu_lv/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     resourcePrefix "swipemenulistview"
 
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 24
+        minSdkVersion 8
+        targetSdkVersion 22
         versionCode 1
         versionName "1.0"
     }
@@ -21,7 +21,76 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:support-v4:22.1.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
+    }
+}

+ 5 - 5
library-viewpager-indicator/build.gradle

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

+ 6 - 6
materialdialogs/build.gradle

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

+ 4 - 4
pullToRefershLibraryMy/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 24
-    buildToolsVersion "25.0.0"
+    compileSdkVersion 22
+    buildToolsVersion "22.0.1"
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 24
+        minSdkVersion 8
+        targetSdkVersion 22
     }
 
     buildTypes {