代码冲突

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

@@ -3,7 +3,8 @@ apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'me.tatarka.retrolambda'
 //定义时间
 def releaseTime() {
-    return new Date().format("yyyyMMdd.HHmm.ss")
+   // return new Date().format("yyyyMMdd.HHmm.ss")
+    return new Date().format("yyyyMMdd.HHmm")
 }
 //设置发布的显示的版本号
 def getVersionName() {
@@ -17,11 +18,15 @@ def getVersionCode() {
         versionProps.load(new FileInputStream(versionFile))
         def versionCode = versionProps['versionCode'].toInteger()
         def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
-//        if (':app:assembleRelease' in runTasks) {
+        println 'runTasks:'+runTasks
+        if(':WeiChat:assembleBaiduDebug'in runTasks){
+            println 'runTasks:'+'debug模式打包apk'
+        }
+        if(':WeiChat:assembleBaiduRelease'in runTasks){
+            println 'runTasks:'+'发布模式打包apk'
             versionProps['versionCode'] = (++versionCode).toString()
             versionProps.store(versionFile.newWriter(), null)
-//        }
-        
+        }
         return versionCode
     } else {
         throw new GradleException("Could not find version.properties!")
@@ -102,11 +107,17 @@ android {
             def fileName
             if (outputFile != null && outputFile.name.endsWith('.apk')) {
                 if (variant.buildType.name.equals('release')) {
-                    variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-                    fileName = "WeiChat_${variant.mergedFlavor.versionName}_release.apk"
+                    //赋值app属性版本名
+                    //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    def releaseInfo= getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    fileName = "WeiChat_${releaseInfo}_release.apk"
+                    
                 } else if (variant.buildType.name.equals('debug')) {
-                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name
-                    fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
+                    //赋值app属性版本名
+                    //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    fileName = "WeiChat_${debugInfo}_debug.apk"
+                    
                 }
                 output.outputFile = new File(outputFile.parent, fileName)
             }

WeiChat/version.properties

@@ -1,2 +1,3 @@
-#Wed Nov 15 17:06:38 CST 2017
-versionCode=131
+#Fri Nov 17 09:13:29 CST 2017
+versionName=606
+versionCode=151

app_core/common/src/main/java/com/core/widget/view/selectcalendar/SelectCalendarActivity.java

@@ -1364,6 +1364,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 .add("type", businessType)
                 .add("commonid", serviceId)
                 .add("yearmonth", ym)
+                .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
                 .add("companyid", companyId)
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)

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

@@ -489,7 +489,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     JSONObject object = JSON.parseObject(dataService);
                     String recordId = object.getString("sb_recordid");
                     if (MyApplication.getInstance().mLoginUser.getUserId().equals(recordId)) {
-                        cancle(String.valueOf(model.getId()));
+                        showActionDialog("取消");
                     } else {
                         ToastMessage("商家不可取消预约！");
                     } 
@@ -503,7 +503,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         ToastMessage("只有商家可以释放！");
                     } else {
                         //商家释放
-                       release();
+                        showActionDialog("释放");
                     }
                 }
             }
@@ -512,12 +512,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
     private static final String TAG = "BServiceAddActivity";
 
-    public void cancle(String id) {
-        LogUtil.d(TAG, "id:" + id);
+    public void cancle() {
+        LogUtil.d(TAG, "id:" + String.valueOf(model.getId()));
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCancelService")
-                .add("id", id)
+                .add("id", String.valueOf(model.getId()))
                 .add("token", MyApplication.getInstance().mAccessToken)
                 .method(Method.POST)
                 .build(), new ResultSubscriber<Object>(new ResultListener<Object>() {
@@ -1358,7 +1358,35 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
 
     }
     
-    
+    //展示取消  释放
+    public void  showActionDialog(final String action){
+        MaterialDialog dialog = new MaterialDialog.Builder(this)
+                .title(getString(R.string.app_dialog_title))
+                .content("您是否要进行"+action+"操作？")
+                .positiveText(getString(R.string.sure))
+                .negativeText(getString(R.string.common_cancel))
+                .autoDismiss(false)
+                .callback(new MaterialDialog.ButtonCallback() {
+                    @Override
+                    public void onPositive(MaterialDialog dialog) {
+                        dialog.dismiss();
+                        if (action.equals("释放")){
+                            release();
+                        }
+                        if (action.equals("取消")){
+                            cancle();
+                        }
+                    }
+
+                    @Override
+                    public void onNegative(MaterialDialog dialog) {
+                       dialog.dismiss();
+                    }
+                }).build();
+        dialog.show();
+                
+    }
+     
     //商家释放预约接口
     public void release(){
         Map<String,Object> map=new HashMap<>();

version.gradle

@@ -12,7 +12,7 @@ ext {
             targetSdkVersion : 24,
             javaVersion      : JavaVersion.VERSION_1_8,
             versionCode      : 125,
-            versionName      : '6.0.5',
+            versionName      : '6.0.6',
     ]
 
     depsVersion = [