17:31

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu Dec 21 13:34:25 CST 2017
-debugName=220
+#Thu Dec 21 17:28:38 CST 2017
+debugName=225
 versionName=612
-debugCode=220
+debugCode=225
 versionCode=151

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

@@ -63,13 +63,10 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 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);
+                    tableSetRl.setVisibility(View.VISIBLE);
                 }
-
             }
         }));
 

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

@@ -93,6 +93,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
+        progressDialog.show();
         initView();
         judgeWhichType();
         String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
@@ -170,6 +171,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             myAdapter.notifyDataSetChanged();
         }
         Log.i("fanglh",sc_industry+"");
+        progressDialog.dismiss();
     }
 
     private void initView() {

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

@@ -139,6 +139,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
                 model.setAs_maxperson("");
+                model.setAs_booknumber("");
                 tableList.add(model);
                 myAdapter.notifyDataSetChanged();
         }else if (id == R.id.save_bt){
@@ -336,6 +337,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.number_et.setText(modeList.get(position).getAs_number()+"");
             tableView.remark_et.setText(modeList.get(position).getAs_remark()+"");
             tableView.days_et.setText(modeList.get(position).getAs_booknumber());
+            tableView.maxperson_et.setText(modeList.get(position).getAs_maxperson()+"");
             return convertView;
         }
 

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

@@ -327,7 +327,6 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
     private void doNewSubmit(Bitmap pathBm, String plainpath) {
         String url = "http://192.168.253.58:8080/ERP/"+"mobile/salary/salaryBack.action";
-        byte[] ppp = getBitmapByte(pathBm);
         RequestParams params = new RequestParams();
         params.addBodyParameter("emcode", emcode);
         params.addBodyParameter("sl_id",sl_id);