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

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

@@ -181,18 +181,22 @@ public class BComSetEmployeeRestActivity extends BaseActivity implements View.On
     private void doSave(List<ComRestBean> mList) {
         Boolean canSave = true;
         if (mList.size() > 1){
-            for (int i = 0; i < mList.size() - 1; i++) {
-                for (int j = 1;j < mList.size();j++){
+            for (int i = 0; i < mList.size(); i++) {
+                for (int j = i+1;j < mList.size();j++){
                     if (mList.get(i).getSf_username().equals(mList.get(j).getSf_username()) &&
                             mList.get(i).getSf_date().equals(mList.get(j).getSf_date())){
                         ToastMessage("存在重复的条目明细");
+                        LogUtil.prinlnLongMsg("fanglh",mList.get(i).getSf_username()+","+
+                                mList.get(j).getSf_username() +","+
+                                mList.get(i).getSf_date()+","+
+                                mList.get(j).getSf_date());
                         canSave = false;
                         break;
                     }
                 }
             }
         }
-        
+
         if (!canSave) return;
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
         progressDialog.show();

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

@@ -379,7 +379,7 @@ public class BSetComRestListActivity extends BaseActivity {
 			viewHolder.name_tv.setText(model.getResult().get(position).getSt_name());
 
 			//显示服务时间
-			viewHolder.sTime_tv.setText(model.getResult().get(position).getSt_servicetime() + getString(R.string.minute));
+			viewHolder.sTime_tv.setText(model.getResult().get(position).getSt_servicetime());
 
 			//显示照片
 			if (!StringUtil.isEmpty(model.getResult().get(position).getSt_imageurl())){

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

@@ -94,7 +94,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         super.onCreate(savedInstanceState);
         setContentView(R.layout.service_bcom_setting_activity);
         initView();
-        initData();
+        judgeWhichType();
         String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
         for (String permission : permissions) {
             if (PermissionUtil.lacksPermissions(ct, permission)) {
@@ -103,11 +103,34 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         }
     }
 
+    private void judgeWhichType() {
+        HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build(true);
+        httpClient.Api().send(new HttpClient.Builder()
+                .url("user/appCompanyType")
+                .add("companyid", CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
+                .add("token",MyApplication.getInstance().mAccessToken)
+                .method(Method.GET)
+                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+            @Override
+            public void onResponse(Object o) {
+                if (!JSONUtil.validate(o.toString()) || o == null) return;
+                LogUtil.prinlnLongMsg("appCompanyType", o.toString()+"");
+
+                //{"result":[{"sc_industry":"医疗","sc_industrycode":"10001"}]}
+                JSONArray array = JSON.parseObject(o.toString()).getJSONArray("result");
+                if (ListUtils.isEmpty(array)) return;
+                JSONObject object = array.getJSONObject(0);
+                if (object == null) return;
+                sc_industry = object.getString("sc_industry");
+                sc_industrycode = object.getString("sc_industrycode");
+                Log.i("fanglh1",sc_industry+"");
+                initData();
+            }
+        }));
+
+    }
     private void initData() {
 
-        //接收商家类型
-        sc_industry = getIntent().getStringExtra("sc_industry");
-        sc_industrycode = getIntent().getStringExtra("sc_industrycode");
         updateData = getIntent().getStringExtra("updateData");
         if (!StringUtil.isEmpty(updateData) &&  JSONUtil.validate(updateData) ){  // 更新状态则不显示 + 新增按钮，且保存改为更新
             deleteBtn.setVisibility(View.VISIBLE);
@@ -125,6 +148,7 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_servicetime(JSON.parseObject(updateData).getString("st_servicetime"));
             model.setSt_imageurl(JSON.parseObject(updateData).getString("st_imageurl"));
             mList.add(model);
+            myAdapter.setIndustry(sc_industry);
             myAdapter.notifyDataSetChanged();
         }else {
             deleteBtn.setVisibility(View.GONE);
@@ -137,8 +161,10 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
             model.setSt_imageurl("");
 //            model.setSt_id("0");
             mList.add(model);
+            myAdapter.setIndustry(sc_industry);
             myAdapter.notifyDataSetChanged();
         }
+        Log.i("fanglh",sc_industry+"");
     }
 
     private void initView() {
@@ -463,6 +489,15 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         private Context mContext;
         private List<BSetLocationBean> modelList;
         private ArrayList<String> photoList;
+        private String industry;
+
+        public String getIndustry() {
+            return industry;
+        }
+
+        public void setIndustry(String industry) {
+            this.industry = industry;
+        }
 
         public ArrayList<String> getPhotoList() {
             return photoList;
@@ -514,13 +549,14 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
                 viewHolder.name_tv.setKeyListener(null);
                 viewHolder.sTime_et.setFocusable(false);
                 viewHolder.sTime_et.setKeyListener(null);
-                if("会所".equals(sc_industry))
-                    viewHolder.sTime_rl.setVisibility(View.VISIBLE);
-                else
-                    viewHolder.sTime_rl.setVisibility(View.GONE);
             }else {
                 viewHolder = (ViewHolder) convertView.getTag();
             }
+            if("会所".equals(industry))
+                viewHolder.sTime_rl.setVisibility(View.VISIBLE);
+            else
+                viewHolder.sTime_rl.setVisibility(View.GONE);
+
             viewHolder.name_tv.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -596,11 +632,11 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
 
 
             //显示服务时间/分钟
-            if (!ListUtils.isEmpty(modelList) && !StringUtil.isEmpty(modelList.get(position).getSt_servicetime()))
+            if (!ListUtils.isEmpty(modelList) && !StringUtil.isEmpty(modelList.get(position).getSt_servicetime())){
                 viewHolder.sTime_et.setText(modelList.get(position).getSt_servicetime());
-            else
+            }else{
                 viewHolder.sTime_et.setText(null);
-
+            }
             return convertView;
         }
         class ViewHolder{

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

@@ -431,7 +431,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
                     if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBoolean("result")){
                         if (o.toString().contains("imid")){
                             String imid = JSON.parseObject(o.toString()).getString("imid");
-                            if (StringUtil.isEmpty(imid)) return;
+                            if (StringUtil.isEmpty(imid)) {
+                               ToastMessage("imid获取失败，请稍后再试");
+                                return;
+                            }
                             if (updateChangeP) {  //更换过照片
                                 unLoadHeader(imid);
                             }else {
@@ -528,7 +531,10 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         String modeid2 = "fd4ac30e-b176-4410-ac0e-e39c8b71dfe0";
 
-        if (!StringUtil.isEmpty(sm_id)) return; //更新时不发短信
+        if (!StringUtil.isEmpty(sm_id)) {
+            jumpTo();
+            return; //更新时不发短信
+        }
         sendMessages(modeid1,name,phone);
         sendMessages(modeid2,name,phone);
     }

app_modular/appme/src/main/res/layout/com_location_input_item.xml

@@ -147,6 +147,7 @@
                 android:gravity="center_vertical|right"
                 android:inputType="number"
                 android:textColor="@color/text_main"
+                android:maxLength="6"
                 />
             <ImageView
                 android:layout_width="@dimen/next_width"