15:24

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -98,6 +98,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
         mAdapter.setMaxSiz(9);
         mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_waitting));
         initView();
+        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() {
@@ -163,17 +169,17 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
             }
         });
     }
-
-    @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);
-            }
-        }
-    }
+//
+//    @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);
+//            }
+//        }
+//    }
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {

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

@@ -98,6 +98,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 	private MessagePresenter.UnReaderListener unReaderListener;
 	private RelativeLayout uustep_rl;
 	private TextView uustepRedtv;
+	private View uustep_v;
 
 
 	@Override
@@ -216,6 +217,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 		dingyue_num = (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
 		tv_dingyue_desc = (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
 		uustepRedtv = (TextView) view.findViewById(R.id.uustep_red_tv);  //UU运动红点
+		uustep_v = view.findViewById(R.id.uustep_v);
 
 		if (PreferenceUtils.getBoolean(MyApplication.getInstance(),Constant.UU_STEP_RED))
 			uustepRedtv.setVisibility(View.GONE);
@@ -245,10 +247,14 @@ public class MessageFragment extends EasyFragment implements IMessageView, View.
 			view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
 		}
 
-		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1)
+		if (PreferenceUtils.getInt(MyApplication.getInstance(), Constant.UU_STEP) == 1) {
 			uustep_rl.setVisibility(View.VISIBLE);
-		else
+			uustep_v.setVisibility(View.VISIBLE);
+		}
+		else {
 			uustep_rl.setVisibility(View.GONE);
+			uustep_v.setVisibility(View.GONE);
+		}
 		return view;
 	}
 

WeiChat/src/main/res/layout/new_message_header.xml

@@ -393,7 +393,12 @@
     </RelativeLayout>
 
 
-
+    <View
+        android:id="@+id/uustep_v"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"
+        android:layout_alignParentTop="true"/>
     <RelativeLayout
         android:id="@+id/uustep_rl"
         android:layout_width="match_parent"
@@ -404,11 +409,7 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:visibility="visible">
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line"
-            android:layout_alignParentTop="true"/>
+
         <FrameLayout
             android:id="@+id/head_uustep"
             android:layout_width="57dp"

app_core/common/src/main/res/layout/new_message_header.xml

@@ -392,7 +392,12 @@
 
     </RelativeLayout>
 
-
+    <View
+        android:id="@+id/uustep_v"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:background="@color/item_line"
+        android:layout_alignParentTop="true"/>
 
     <RelativeLayout
         android:id="@+id/uustep_rl"
@@ -404,11 +409,7 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:visibility="visible">
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line"
-            android:layout_alignParentTop="true"/>
+
         <FrameLayout
             android:id="@+id/head_uustep"
             android:layout_width="57dp"

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/PersonalPageActivity.java

@@ -127,11 +127,12 @@ public class PersonalPageActivity extends BaseActivity implements View.OnClickLi
         if (StringUtil.isEmpty(userid)) return;
         progressDialog.show();
         HttpClient httpClient = new HttpClient.Builder(Constant.BASE_STEP_URL).isDebug(true).build(true);
+        httpClient.getHeaders().remove("Content-Type");
         httpClient.Api().send(new HttpClient.Builder()
                 .url("appSteps")
                 .add("userid", userid)
                 .add("token", MyApplication.getInstance().mAccessToken)
-                .method(Method.GET)
+                .method(Method.POST)
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -159,7 +159,8 @@ public class UURanking extends BaseActivity implements View.OnClickListener {
                 .url("appStepsrank")
                 .add("userid",MyApplication.getInstance().mLoginUser.getUserId())
                 .add("token",MyApplication.getInstance().mAccessToken)
-                .method(Method.GET)
+
+                .method(Method.POST)
                 .build(),new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {

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

@@ -212,7 +212,14 @@ public class ImageSettingActivity extends BaseActivity implements View.OnClickLi
                     @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,R.string.not_system_permission);
+                                }
+                            }
                         } else {
                             selectPhoto();
                         }

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

@@ -151,6 +151,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
             mUserSexTv.setText("1".equals(model.getResult().get(position).getSm_sex()) ? getString(R.string.user_body) : getString(R.string.user_girl));
             sm_id = model.getResult().get(position).getSm_id();
             mBtnSave.setText(getString(R.string.common_update_button));
+            getSupportActionBar().setTitle(getString(R.string.common_update_button));
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -283,8 +283,10 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
                     if (o.toString().contains("result")) {
                         if ("1".equals(JSON.parseObject(o.toString()).getString("result")) && !CommonUtil.isReleaseVersion())
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
-                        else
+                        else if (!CommonUtil.isReleaseVersion())
                             businessmen_setting_rl.setVisibility(View.VISIBLE);
+                        else if (CommonUtil.isReleaseVersion())
+                            businessmen_setting_rl.setVisibility(View.GONE);
                     }
                 } catch (Exception e) {
                     e.printStackTrace();

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

@@ -15,7 +15,10 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/contentRV"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:layout_marginLeft="25dp"
+            android:layout_marginRight="25dp"
+            android:layout_marginTop="25dp"/>
 
         <Button
             android:id="@+id/saveBtn"

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

@@ -402,6 +402,12 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_expense_reimbursement);
         ViewUtils.inject(this);
+        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);
+            }
+        }
         initView();
         initTypeAndMoneyData();  // 获取该表单相关字段，
 
@@ -1837,7 +1843,14 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
                     @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,R.string.not_system_permission);
+                                }
+                            }
                         } else {
                             selectPhoto();
                         }
@@ -2127,17 +2140,17 @@ public class ExpenseReimbursementActivity extends BaseActivity implements View.O
         }
         return -1;
     }
-
-    @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);
-            }
-        }
-    }
+//
+//    @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 judgeApprovers(int keyValue) {