代码冲突

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

@@ -10,31 +10,48 @@ def releaseTime() {
 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 versionName=versionProps['versionName'].toInteger()
         def versionCode = versionProps['versionCode'].toInteger()
+        def debugName=versionProps['debugName'].toInteger()
+        def debugCode = versionProps['debugCode'].toInteger()
+        def versionArray=new Integer[4]
+    
         def runTasks = gradle.startParameter.taskNames        //仅在assembleRelease任务是增加版本号
         println 'runTasks:'+runTasks
         if(':WeiChat:assembleBaiduDebug'in runTasks){
             println 'runTasks:'+'debug模式打包apk'
+            versionProps['debugCode'] = (++debugCode).toString()
+            versionProps.store(versionFile.newWriter(), null)
         }
         if(':WeiChat:assembleBaiduRelease'in runTasks){
             println 'runTasks:'+'发布模式打包apk'
             versionProps['versionCode'] = (++versionCode).toString()
+            versionProps['versionName'] = (++versionName).toString()
             versionProps.store(versionFile.newWriter(), null)
         }
-        return versionCode
+        versionArray[0]=versionName
+        versionArray[1]=versionCode
+        versionArray[2]=debugName
+        versionArray[3]=debugCode
+        
+        println versionArray[0].toString()
+        return  versionArray
     } else {
         throw new GradleException("Could not find version.properties!")
     }
 }
-def currentVersionCode = getVersionCode()
+
 
 android {
+    def versionArray = getVersionCode()
+   
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -51,13 +68,14 @@ android {
     buildToolsVersion rootProject.ext.android.buildToolsVersion
 
     defaultConfig {
-   
+        def versionNames="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
         applicationId project.applicationId
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
        // versionCode rootProject.ext.android.versionCode
-        versionCode currentVersionCode
-        versionName rootProject.ext.android.versionName
+        //versionName rootProject.ext.android.versionName
+        versionCode versionArray[1]
+        versionName versionNames
         multiDexEnabled true
         signingConfig signingConfigs.config
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "umeng"]
@@ -109,13 +127,14 @@ android {
                 if (variant.buildType.name.equals('release')) {
                     //赋值app属性版本名
                     //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-                    def releaseInfo= getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
+                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
                     fileName = "WeiChat_${releaseInfo}_release.apk"
                     
                 } else if (variant.buildType.name.equals('debug')) {
                     //赋值app属性版本名
                     //variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
-                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
+                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
                     fileName = "WeiChat_${debugInfo}_debug.apk"
                     
                 }

WeiChat/version.properties

@@ -1,3 +1,5 @@
-#Fri Nov 17 09:13:29 CST 2017
-versionName=606
-versionCode=151
+#Fri Nov 17 18:22:10 CST 2017
+debugName=1
+versionName=619
+debugCode=4
+versionCode=168

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

@@ -1389,6 +1389,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
      
     //商家释放预约接口
     public void release(){
+
         Map<String,Object> map=new HashMap<>();
         if (!StringUtil.isEmpty(dataService)){
             JSONObject object=JSON.parseObject(dataService);

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/form/DataFormDetailActivity.java

@@ -474,9 +474,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     Boolean success = null;
                     try {
                         success = JSON.parseObject(result).getBoolean("success");
-                        if ("ExtraWork$".equals(caller)){
+                        if ("ExtraWork$".equals(caller)) {
                             va_id = JSON.parseObject(result).getIntValue("wod_id");
-                        }else{
+                        } else {
                             va_id = JSON.parseObject(result).getIntValue(formidkey);
                         }
                         if (success) {
@@ -581,28 +581,28 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     }
 
     private void commitSuccess() {
-        if(formid==0){
+        if (formid == 0) {
             ToastMessage("提交成功！");
-        }else{
+        } else {
             ToastMessage("更新成功！");
         }
         mHandler.postDelayed(new Runnable() {
             @Override
             public void run() {
                 if (mContext == null) return;
-                LogUtil.d("当前线程是："+CommonUtil.isMainThread());
-                    if(formid==0){
-                        startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
-                                .putExtra("caller", caller)
-                                .putExtra("keyValue", va_id)
-                                .putExtra("status", "已提交"));
-                    }else{
-                        startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
-                                .putExtra("caller", caller)
-                                .putExtra("keyValue", formid)
-                                .putExtra("update", "1")
-                                .putExtra("status", "已提交"));
-                    }
+                LogUtil.d("当前线程是：" + CommonUtil.isMainThread());
+                if (formid == 0) {
+                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+                            .putExtra("caller", caller)
+                            .putExtra("keyValue", va_id)
+                            .putExtra("status", "已提交"));
+                } else {
+                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+                            .putExtra("caller", caller)
+                            .putExtra("keyValue", formid)
+                            .putExtra("update", "1")
+                            .putExtra("status", "已提交"));
+                }
                 finish();
                 overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
             }
@@ -643,20 +643,20 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     endDate = "sa_enddate";
                     formidkey = "sa_id";
                     getSupportActionBar().setTitle("特殊考勤");
-                } else if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
+                } else if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
                     startDate = "wod_startdate";
                     endDate = "wod_enddate";
                     d_startDate = "wod_startdate";
                     d_endDate = "wod_enddate";
-                    if ("ExtraWork$".equals(caller)){
+                    if ("ExtraWork$".equals(caller)) {
                         formidkey = "wod_id";//主表id  ---适应接口频繁调整
-                    }else{
+                    } else {
                         formidkey = "wo_id";//主表id
                     }
                     detailkey_id = "wod_id";//明细id
                     detailkey_did = "wod_woid";//主表id
                     getSupportActionBar().setTitle("加班单");
-                } else if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
+                } else if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
                     startDate = "fp_prestartdate";
                     endDate = "fp_preenddate";
                     d_startDate = "fpd_date1";
@@ -755,7 +755,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             } else {
                 menu.findItem(R.id.oa_signin_set).setVisible(false);
             }
-        }else {
+        } else {
             if (PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false)) {
                 menu.findItem(R.id.oa_signin_set).setVisible(true);
             } else {
@@ -773,7 +773,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.oa_signin_set){
+        if (item.getItemId() == R.id.oa_signin_set) {
             ArrayList<Data> fields = new ArrayList<>();
             ArrayList<Data> fieldsDis = new ArrayList<>();
             LogUtil.d(JSON.toJSONString(mDatasNet));
@@ -800,7 +800,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             .putParcelableArrayListExtra("fieldsDis", fieldsDis)
                             .putExtra("caller", caller),
                     0x25);
-        }else if (item.getItemId() == R.id.oa_leave){
+        } else if (item.getItemId() == R.id.oa_leave) {
             startActivity(new Intent(mContext, FormListSelectActivity.class)
                     .putExtra("caller",
                             caller)
@@ -808,7 +808,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             if (formid != 0) {
                 finish();
             }
-        }else if (item.getItemId() == android.R.id.home){
+        } else if (item.getItemId() == android.R.id.home) {
             if ("在录入".equals(status)) {
                 FormListSelectActivity.reload = false;
             } else if ("已提交".equals(status)) {
@@ -844,12 +844,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
 
     @Override
     public void onClick(View v) {
-        if (v.getId() == R.id.ll_item_add){
+        if (v.getId() == R.id.ll_item_add) {
             addGridItemData();
-        }else if (v.getId() == R.id.click_btn){
+        } else if (v.getId() == R.id.click_btn) {
             if (formid == 0)
                 commit();
-        }else if (v.getId() == R.id.btn_update){
+        } else if (v.getId() == R.id.btn_update) {
             updata();
         }
     }
@@ -1044,8 +1044,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                         if (StringUtil.isEmpty(itemValue.getGroup())) {
                             header.setVisibility(View.GONE);
                         } else {
-                           // header.setVisibility(View.GONE);
-                            LogUtil.d("MainActivity:"+itemValue.getGroup());
+                            // header.setVisibility(View.GONE);
+                            LogUtil.d("MainActivity:" + itemValue.getGroup());
                             if (itemValue.getGroup().contains("明细") && !itemValue.getGroup().equals("明细项1")) {
                                 item_add.setVisibility(View.VISIBLE);
                             } else {
@@ -1133,13 +1133,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                         || "ExtraWork$".equals(caller)
                                         || "FeePlease!CCSQ!new".equals(caller)) {
                                     startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
-                                            .putExtra("startDate", startDate_v)
-                                            .putExtra("endDate", endDate_v)
-                                            .putExtra("hasMenu", hasMenu)
-                                            .putExtra("id", categoryIndex)
-                                            .putExtra("field", data.getField())
-                                            .putExtra("object", data)
-                                            .putExtra("caller", caller)
+                                                    .putExtra("startDate", startDate_v)
+                                                    .putExtra("endDate", endDate_v)
+                                                    .putExtra("hasMenu", hasMenu)
+                                                    .putExtra("id", categoryIndex)
+                                                    .putExtra("field", data.getField())
+                                                    .putExtra("object", data)
+                                                    .putExtra("caller", caller)
                                             , 0x30);
                                 } else {
                                     showDateDialog(ct, (EditText) v, data);
@@ -1222,13 +1222,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                             }
                             //连带操作
                             if (data.getType().equals("DF")) {
-                                if ("fpd_d5".equals(data.getField())){
+                                if ("fpd_d5".equals(data.getField())) {
                                     //出差单 客户名称联动操作特殊处理
                                     Intent intent = new Intent("com.modular.form.SelectAimActivity")
                                             .putExtra("groupId", data.getGroupId());
-                                   currentGroupId= data.getGroupId();
+                                    currentGroupId = data.getGroupId();
                                     startActivityForResult(intent, 0x23);
-                                }else{
+                                } else {
                                     HashMap param = new HashMap<>();
                                     String[] fields = new String[]{"sa_custname"};
                                     if (caller.equals("StandbyApplication")) {
@@ -1264,9 +1264,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                                     startActivityForResult(intent, categoryIndex);
                                     isLeave = true;
                                 }
-                               
+
                             }
-                            
+
 
                         }
                     });
@@ -1418,9 +1418,9 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         switch (resultCode) {
             case 0x20:
                 if (data == null) return;
-                SelectBean b=new SelectBean();
-                if (data.getParcelableExtra("data") instanceof SelectBean){
-                     b = data.getParcelableExtra("data");
+                SelectBean b = new SelectBean();
+                if (data.getParcelableExtra("data") instanceof SelectBean) {
+                    b = data.getParcelableExtra("data");
                 }
                 if (requestCode == b.getId() && resultCode == 0x20) {
                     if (b == null || StringUtil.isEmpty(b.getJson())) return;
@@ -1442,17 +1442,17 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                     if (d == null) return;
                     String name = StringUtil.isEmpty(d.getName()) ? "" : d.getName();
                     getEmnameByReturn(name);
-                }else if (requestCode==0x23){
+                } else if (requestCode == 0x23) {
                     SelectAimModel entity = data.getParcelableExtra("data");
                     PopupWindowHelper.create(this, getString(R.string.perfect_company_name), entity, new PopupWindowHelper.OnClickListener() {
                         @Override
                         public void result(SelectAimModel model) {
                             //出差单 写死固定参数1
                             String cu_name = model.getName();
-                            String cu_address=model.getAddress();
+                            String cu_address = model.getAddress();
                             int sa_custname = 0;
                             int sa_custaddress = 0;
-                            LogUtil.d("currentGroup:"+currentGroupId);
+                            LogUtil.d("currentGroup:" + currentGroupId);
                             List<Data> tempLists = mAdapter.getmListData().get(currentGroupId).getDatas();
                             for (int i = 0; i < tempLists.size(); i++) {
                                 Data tempData = tempLists.get(i);
@@ -1507,7 +1507,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 try {
                     parseResultByField(data);
                 } catch (Exception e) {
-                   
+
                 }
                 break;
         }
@@ -1515,7 +1515,8 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
     }
 
     private void parseResultByField(Intent data) {
-        int id;Data model = data.getParcelableExtra("object");
+        int id;
+        Data model = data.getParcelableExtra("object");
         id = data.getIntExtra("id", 0);
         String startDate = data.getStringExtra("startDate");
         String endDate = data.getStringExtra("endDate");
@@ -1547,7 +1548,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
             mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
             mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
         }
-        if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
+        if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
             int va_alldays = 0;
             int va_alltimes = 0;
 
@@ -1569,7 +1570,7 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
 
 
-        if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
+        if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
             int va_alldays = 0;
             int va_alltimes = 0;
             //fp_preenddate
@@ -2164,10 +2165,10 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         }
         progressDialog.show();
         click_btn.setEnabled(false);
-        String url =null;
-        if ("ExtraWork$".equals(caller)){
+        String url = null;
+        if ("ExtraWork$".equals(caller)) {
             url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkSaveAndSubmit.action";
-        }else{
+        } else {
             url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/commonSaveAndSubmit.action";
         }
         Map<String, Object> params = new HashMap<>();
@@ -2378,12 +2379,12 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
         progressDialog.show();
         btn_update.setEnabled(false);
 
-        String url =null;
+        String url = null;
         Map<String, Object> params = new HashMap<>();
-        if ("ExtraWork$".equals(caller)){
+        if ("ExtraWork$".equals(caller)) {
             url = CommonUtil.getAppBaseUrl(ct) + "/mobile/oa/ExtraWorkUpdateAndSubmit.action";
             params.put("id", String.valueOf(formid));
-        }else{
+        } else {
             url = CommonUtil.getAppBaseUrl(ct) + "/mobile/commonUpdate.action";
             params.put("keyid", String.valueOf(formid));
         }