18:03

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -139,8 +139,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	public void onResume() {
 		super.onResume();
 		presenter.loadData();
-		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1
-				&& !CommonUtil.isReleaseVersion())
+		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1)
 			uustep_rl.setVisibility(View.VISIBLE);
 		else
 			uustep_rl.setVisibility(View.GONE);

app_core/network/src/main/java/com/me/network/app/http/interceptor/LogInterceptor.java

@@ -1,8 +1,12 @@
 package com.me.network.app.http.interceptor;
 
+import android.util.Log;
+
+import com.alibaba.fastjson.JSON;
 import com.me.network.app.http.HttpClient;
 
 import java.io.IOException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -77,10 +81,10 @@ public class LogInterceptor implements Interceptor {
 		  okhttp3.MediaType mediaType = response.body().contentType();
           String content = response.body().string();
          if (builder.isDebug()) {
-//			 LogUtil.d("HttpLogs","接口URL:" + JSON.toJSONString(response.request().url().toString()));
-//			 LogUtil.d("HttpLogs","请求头:"+ JSON.toJSONString(response.request().headers().toMultimap()));
-//			 LogUtil.d("HttpLogs","参数:" + URLDecoder.decode(postParam.toString(),"UTF-8"));
-//			 LogUtil.d("HttpLogs","返回结果:" + content);
+			 Log.d("HttpLogs","接口URL:" + JSON.toJSONString(response.request().url().toString()));
+			 Log.d("HttpLogs","请求头:"+ JSON.toJSONString(response.request().headers().toMultimap()));
+			 Log.d("HttpLogs","参数:" + URLDecoder.decode(postParam.toString(),"UTF-8"));
+			 Log.d("HttpLogs","返回结果:" + content);
 		}
     
 		return response.newBuilder()

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

@@ -28,6 +28,7 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
 
     private String sc_industry = null;
     private String sc_industrycode = null;
+    private String business_iamge;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -42,7 +43,6 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyType")
                 .add("companyid", Constant.BASE_COMPANYID)
-//                .add("companyid",201)
                 .add("token",MyApplication.getInstance().mAccessToken)
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
@@ -60,12 +60,15 @@ public class BSettingActivity extends BaseActivity implements View.OnClickListen
                 sc_industrycode = array.getJSONObject(0).getString("sc_industrycode");
             }
         }));
+
+        business_iamge = getIntent().getStringExtra("business_iamge");
     }
 
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.image_setting_rl){
-            startActivity(new Intent(this,ImageSettingActivity.class));
+            startActivity(new Intent(this,ImageSettingActivity.class)
+            .putExtra("business_iamge",business_iamge));
         }else if (v.getId() == R.id.keshi_setting_rl){
             
         }else if (v.getId() == R.id.people_setting_rl){

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FeedbackActivity.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;
@@ -32,6 +33,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
@@ -237,7 +239,11 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                 int viewType = mAdapter.getItemViewType(position);
 
                 if (viewType == 1) {
-                    showSelectPictureDialog();//第一个
+                    if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
+                        ToastUtil.showToast(ct, com.uas.appworks.R.string.not_camera_permission);
+                    } else {
+                        showSelectPictureDialog();//添加
+                    }
                     //TODO 选择图片页面
 //                    startActivityForResult(new Intent(ct, PhoneSelectActivity.class), 222);
 
@@ -314,7 +320,14 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
-                            takePhoto();
+                            try {
+                                takePhoto();
+                            } catch (Exception e) {
+                                String message=e.getMessage();
+                                if (!StringUtil.isEmpty(message)&&message.contains("Permission")){
+                                    ToastUtil.showToast(ct, com.uas.appworks.R.string.not_system_permission);
+                                }
+                            }
                         } else {
                             selectPhoto();
                         }

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

@@ -77,12 +77,20 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
         findViewById(R.id.image_tv).setOnClickListener(this);
         findViewById(R.id.btn_save).setOnClickListener(this);
         mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
+
+        String business_iamge = getIntent().getStringExtra("business_iamge");
+        if (!StringUtil.isEmpty(business_iamge))
+            ImageLoader.getInstance().displayImage(business_iamge,mImageIm);
     }
 
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.image_tv){
-            showSelectPictureDialog();
+            if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
+                ToastUtil.showToast(ct,R.string.not_camera_permission);
+            } else {
+                showSelectPictureDialog();//添加
+            }
         }else if (v.getId() == R.id.btn_save){
             if (!CommonUtil.isNetWorkConnected(ct)){
                 ToastMessage(getString(R.string.common_notlinknet));

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

@@ -103,6 +103,7 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     private PopupWindow setWindow = null;//
     private RelativeLayout businessmen_setting_rl;
     private TextView bsettingRed;
+    private String business_iamge;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -269,10 +270,14 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_BOOKING_SETTING_URL).isDebug(true).build(true);
         httpClient.Api().send(new HttpClient.Builder()
                 .url("user/appCompanyAdmin")
-//                .add("companyid",CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_uu"))
-                .add("companyid",201)
+//                .add("companyid",201)
+//                .add("userid",100254)
+//                .add("token",1)
+                .add("companyid",Constant.BASE_COMPANYID)
                 .add("userid", MyApplication.getInstance().mLoginUser.getUserId())
                 .add("token",MyApplication.getInstance().mAccessToken)
+
+
                 .method(Method.GET)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
@@ -280,13 +285,19 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                 if (!JSONUtil.validate(o.toString()) || o == null) return;
                 LogUtil.prinlnLongMsg("appCompanyAdmin", o.toString()+"");
                 try {
+                    //{"result":"1","url":"http://113.105.74.140:8081/u/0/0/201710/o/48fda5af663f40f795f2dd49e2d8801f.jpg"}
                     if (o.toString().contains("result")) {
-                        if ("1".equals(JSON.parseObject(o.toString()).getString("result")) && !CommonUtil.isReleaseVersion())
+                        if ("1".equals(JSON.parseObject(o.toString()).getString("result"))){
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        else if (!CommonUtil.isReleaseVersion())
+                            if (o.toString().contains("url"))
+                                business_iamge = JSON.parseObject(o.toString()).getString("url");
+                        }
+                        else if (!CommonUtil.isReleaseVersion()) {
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        else if (CommonUtil.isReleaseVersion())
+                        }
+                        else if (CommonUtil.isReleaseVersion()) {
                             businessmen_setting_rl.setVisibility(View.GONE);
+                        }
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -423,7 +434,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
        }else if (v.getId() == R.id.cancel_tv){
            closePopupWindow();
        }else if (v.getId() == R.id.businessmen_setting_rl){
-           startActivity(new Intent(this,BSettingActivity.class));
+           startActivity(new Intent(this,BSettingActivity.class)
+           .putExtra("business_iamge",business_iamge));
            PreferenceUtils.putBoolean(Constant.B_SETTINGRED, true);
            bsettingRed.setVisibility(View.GONE);
        }

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

@@ -1824,7 +1824,11 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                 int viewType = mAdapter.getItemViewType(position);
                 int mPosition = (int) parent.getItemIdAtPosition(position);
                 if (viewType == 1) {
-                    showSelectPictureDialog();//第一个
+                    if (PermissionUtil.lacksPermissions(ct, Manifest.permission.CAMERA)) {
+                        ToastUtil.showToast(ct,R.string.not_camera_permission);
+                    } else {
+                        showSelectPictureDialog();//添加
+                    }
                     //TODO 选择图片页面
 //                    startActivityForResult(new Intent(ct, PhoneSelectActivity.class), 222);
                 } else {