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

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

@@ -114,59 +114,85 @@ public class BSettingLocationActivity extends BaseActivity implements View.OnCli
         }else if (v.getId() == R.id.save_bt){
             LogUtil.prinlnLongMsg("mList", JSON.toJSONString(mList));
             if (ListUtils.isEmpty(mList)) return;
-            if (update && !StringUtil.isEmpty(st_id))
-                doUpdate();
-            else
-                doSave(mList);
+            if (!CommonUtil.isNetWorkConnected(this)) {
+                ToastMessage(getString(R.string.common_notlinknet));
+                return;
+            }else {
+                if (update && !StringUtil.isEmpty(st_id))
+                    doUpdate();
+                else
+                    doSave(mList);
+            }
+
         }
     }
 
     private void doUpdate() {
-        Map<String,Object> param = new HashMap<>();
-        param.put("st_id",st_id);
-        param.put("st_name",mList.get(0).getSt_name());
-        param.put("st_siid",mList.get(0).getSt_siid());
-        param.put("st_companyid",mList.get(0).getSt_companyid());
-        param.put("st_companyname",mList.get(0).getSt_companyname());
-
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("user/appServiceSet")
-                .add("map",JSON.toJSONString(param))
-                .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
-                LogUtil.prinlnLongMsg("appServiceSet", o.toString()+"");
-                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
-                    Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
-                    setResult(20);
-                    finish();
+        if (StringUtil.isEmpty(mList.get(0).getSt_name())){
+            ToastMessage("请输入名称");
+           return;
+        }else {
+            Map<String,Object> param = new HashMap<>();
+            param.put("st_id",st_id);
+            param.put("st_name",mList.get(0).getSt_name());
+            param.put("st_siid",mList.get(0).getSt_siid());
+            param.put("st_companyid",mList.get(0).getSt_companyid());
+            param.put("st_companyname",mList.get(0).getSt_companyname());
+            progressDialog.show();save_bt.setEnabled(false);
+
+            HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+            httpClient.Api().send(new HttpClient.Builder()
+                    .url("user/appServiceSet")
+                    .add("map",JSON.toJSONString(param))
+                    .add("token",MyApplication.getInstance().mAccessToken)
+                    .method(Method.POST)
+                    .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                @Override
+                public void onResponse(Object o) {
+                    if (!JSONUtil.validate(o.toString()) || o == null) return;
+                    LogUtil.prinlnLongMsg("appServiceSet", o.toString()+"");
+                    if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
+                        Toast.makeText(ct,getString(R.string.update_success),Toast.LENGTH_LONG).show();
+                        setResult(20);
+                        finish();
+                    }
+
+                    progressDialog.dismiss();save_bt.setEnabled(true);
                 }
-            }
-        }));
+            }));
+        }
+
     }
 
     private void doSave(List<BSetLocationBean> mList) {
-        HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
-        httpClient.Api().send(new HttpClient.Builder()
-                .url("user/appBatchPlace")
-                .add("map",JSON.toJSONString(mList))
-                .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.POST)
-                .build(),new ResultSubscriber<>(new ResultListener<Object>() {
-            @Override
-            public void onResponse(Object o) {
-                if (!JSONUtil.validate(o.toString()) || o == null) return;
-                LogUtil.prinlnLongMsg("appBatchPlace", o.toString()+"");
-                if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
-                    Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
-                    finish();
-                }
+        for (int i = 0; i < mList.size(); i++) {
+            if (StringUtil.isEmpty(mList.get(i).getSt_name())){
+                ToastMessage("请输入名称");
+                break;
+            }else if (i==mList.size()-1){
+                progressDialog.show();save_bt.setEnabled(false);
+                HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
+                httpClient.Api().send(new HttpClient.Builder()
+                        .url("user/appBatchPlace")
+                        .add("map",JSON.toJSONString(mList))
+                        .add("token",MyApplication.getInstance().mAccessToken)
+                        .method(Method.POST)
+                        .build(),new ResultSubscriber<>(new ResultListener<Object>() {
+                    @Override
+                    public void onResponse(Object o) {
+                        if (!JSONUtil.validate(o.toString()) || o == null) return;
+                        LogUtil.prinlnLongMsg("appBatchPlace", o.toString()+"");
+                        if (o.toString().contains("result") && JSON.parseObject(o.toString()).getBooleanValue("result")) {
+                            Toast.makeText(ct,getString(R.string.common_save_success),Toast.LENGTH_LONG).show();
+                            finish();
+                        }
+                        progressDialog.dismiss();save_bt.setEnabled(true);
+                    }
+                }));
             }
-        }));
+        }
+
+
     }
 
     private class BSetLocationAdapter extends BaseAdapter{

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

@@ -1,5 +1,6 @@
 package com.uas.appme.settings.activity;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -18,6 +19,7 @@ import com.common.LogUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.core.app.MyApplication;
@@ -63,7 +65,16 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
 
         initView();
     }
-
+    @Override
+    protected void onResume() {
+        super.onResume();
+        String[] permissions = new String[]{Manifest.permission.CAMERA, Manifest.permission.READ_EXTERNAL_STORAGE};
+        for (String permission : permissions) {
+            if (PermissionUtil.lacksPermissions(ct, permission)) {
+                PermissionUtil.requestPermission(this, PermissionUtil.DEFAULT_REQUEST, permission);
+            }
+        }
+    }
     private void initView() {
         mImageIm = (ImageView) findViewById(R.id.image_im);
         findViewById(R.id.image_tv).setOnClickListener(this);
@@ -208,8 +219,12 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
     }
 
     private void takePhoto() {
-        mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
-        CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        try {
+            mNewPhotoUri = CameraUtil.getOutputMediaFileUri(this, MyApplication.getInstance().getLoginUserId(), CameraUtil.MEDIA_TYPE_IMAGE);
+            CameraUtil.captureImage(this, mNewPhotoUri, REQUEST_CODE_CAPTURE_PHOTO);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private void selectPhoto() {