代码冲突

Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java
#	app_core/common/src/main/java/com/common/data/StringUtil.java

WeiChat/build.gradle

@@ -6,9 +6,27 @@ def releaseTime() {
     return new Date().format("yyyyMMdd.HHmm.ss")
 }
 //设置发布的显示的版本号
-def getVersionName(){
+def getVersionName() {
     return rootProject.ext.android.versionName
 }
+//读取版本号
+def getVersionCode() {
+    def versionFile = file('version.properties')
+    if (versionFile.canRead()) {
+        Properties versionProps = new Properties()
+        versionProps.load(new FileInputStream(versionFile))
+        def versionCode = versionProps['versionCode'].toInteger()
+        def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
+        if (':app:assembleRelease' in runTasks) {
+            versionProps['versionCode'] = (++versionCode).toString()
+            versionProps.store(versionFile.newWriter(), null)
+        }
+        
+        return versionCode
+    } else {
+        throw new GradleException("Could not find version.properties!")
+    }
+}
 
 android {
     compileOptions {
@@ -27,16 +45,18 @@ android {
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
+        def currentVersionCode = getVersionCode()
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
-        versionCode rootProject.ext.android.versionCode
+       // versionCode rootProject.ext.android.versionCode
+        versionCode currentVersionCode
         versionName rootProject.ext.android.versionName
         multiDexEnabled true
         signingConfig signingConfigs.config
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
         ndk {
-            abiFilters "armeabi", "armeabi-v7a", "x86", "mips","x86_64","mips64"
+            abiFilters "armeabi", "armeabi-v7a", "x86", "mips", "x86_64", "mips64"
         }
     }
 
@@ -45,7 +65,7 @@ android {
         checkReleaseBuilds false
         abortOnError false
     }
-    
+
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
@@ -61,8 +81,8 @@ android {
             signingConfig signingConfigs.config
         }
     }
-    
-    productFlavors {   
+
+    productFlavors {
         wandoujia {}
         _360 {}
         baidu {}
@@ -74,17 +94,17 @@ android {
     productFlavors.all {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
     }
-    
+
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def outputFile = output.outputFile
             def fileName
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
-                    variant.mergedFlavor.versionName = getVersionName()+"_"+variant.productFlavors[0].name
+                    variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name
                     fileName = "WeiChat_${variant.mergedFlavor.versionName}_release.apk"
                 } else if (variant.buildType.name.equals('debug')) {
-                    variant.mergedFlavor.versionName = getVersionName()+"_"+releaseTime()+ "_"+variant.productFlavors[0].name
+                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name
                     fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
                 }
                 output.outputFile = new File(outputFile.parent, fileName)
@@ -95,7 +115,7 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    
+
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.cardviewV7
@@ -104,7 +124,7 @@ dependencies {
     compile(deps.stetho) {
         force = true
     }
-   
+
     compile deps.jodatime
     compile deps.systembartint
     compile deps.photoView
@@ -115,7 +135,7 @@ dependencies {
     compile deps.stickyGridHeaders
     compile deps.materialDialogs
     compile deps.okhttp
-    
+
     androidTestCompile deps.leakcanaryNp
     debugCompile deps.leakcanary
     releaseCompile deps.leakcanaryNp

WeiChat/version.properties

@@ -0,0 +1,2 @@
+versionCode=125
+

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServiceAddActivity.java

@@ -528,8 +528,8 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     if (JSONUtil.validate(o.toString())) {
                         if ("true".equals(JSON.parseObject(o.toString()).getString("result"))) {
                             ToastMessage("取消成功！");
-                            //取消  通知商家取消
-                            invite("", "");
+                            //取消  通知商家取消  模板7
+                            invite(JSON.parseObject(dataService).getString("sc_telephone"), "584f32ed-a24e-4818-99bf-191a5aa0f061");
                             Intent intent = new Intent("com.modular.booking.BookingListActivity");
                             intent.putExtra("curDate", model.getEndtime() == null ? "" : model.getEndtime());
                             startActivity(intent);
@@ -1378,7 +1378,21 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
           
                      @Override
                      public void onResponse(Object o) {
-                         
+                         try {
+                             if (JSONUtil.validate(o.toString())) {
+                                 if ("true".equals(JSON.parseObject(o.toString()).getString("result"))) {
+                                     ToastMessage("取消成功！");
+                                     Intent intent = new Intent("com.modular.booking.BookingListActivity");
+                                     intent.putExtra("curDate", model.getEndtime() == null ? "" : model.getEndtime());
+                                     startActivity(intent);
+                                 }
+                             } else {
+                                 ToastMessage("操作失败！");
+                             }
+                         } catch (Exception e) {
+                             e.printStackTrace();
+                             ToastMessage("操作失败！");
+                         }
                      }
                  }));
     }

build.gradle

@@ -1,4 +1,3 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 apply from: "version.gradle"
 buildscript {
     repositories {

gradle.properties

@@ -4,6 +4,6 @@ org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx5120m
 
 applicationId=com.xzjmyk.pm.activity
-
-
+versionCode=125
+versionName=6.0.5