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

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(){
@@ -81,10 +82,10 @@ android {
             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+"_release"
                     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+"_debug"
                     fileName = "WeiChat_${variant.mergedFlavor.versionName}_debug.apk"
                 }
                 output.outputFile = new File(outputFile.parent, fileName)

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -61,6 +61,15 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 if (object == null) return;
                 sc_industry = array.getJSONObject(0).getString("sc_industry");
                 sc_industrycode = array.getJSONObject(0).getString("sc_industrycode");
+
+                if ("餐饮".equals(sc_industry)) {
+                    rTyperl.setVisibility(View.GONE);
+                    tableSetRl.setVisibility(View.VISIBLE);
+                }else {
+                    rTyperl.setVisibility(View.GONE);
+                    tableSetRl.setVisibility(View.GONE);
+                }
+
             }
         }));
 
@@ -123,12 +132,6 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         tableSetRl = (RelativeLayout) findViewById(R.id.table_setting_rl);
         tableSetRl.setOnClickListener(this);
 
-        if ("餐饮".equals(sc_industry)) {
-            rTyperl.setVisibility(View.GONE);
-            tableSetRl.setVisibility(View.VISIBLE);
-        }else {
-            rTyperl.setVisibility(View.GONE);
-            tableSetRl.setVisibility(View.GONE);
-        }
+
     }
 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -80,7 +80,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             model.setAs_number("");
             model.setAs_type("大桌");
             model.setAs_remark("");
-            model.setAs_id("0");
+//            model.setAs_id("0");
             model.setAs_companyid(as_companyid);
             model.setAs_booknumber("");
             tableList.add(model);