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

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

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.ui.erp.activity.message;
 
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -614,11 +615,13 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                             if (status.equals("待审批")) {
                                 model.status.setTextColor(getResources().getColor(R.color.orange));
                                 status = "等待" + nodename + "(" + codename + ")" + getString(R.string.approvel);
-                            }
-                            if (status.equals("未通过")) {
+                            }else if(status.equals("未通过")) {
                                 model.status.setTextColor(getResources().getColor(R.color.red));
 //                                status = getString(R.string.Did_not_pass) + nodename + "(" + codename + ")" + getString(R.string.approvel);
                                 status = "已拒绝";
+                            }else if(status.equals("已审批")){
+                                model.status.setTextColor(getResources().getColor(R.color.titleBlue));
+                                status = "已同意";
                             }
                         } else {
                             status = " ";

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

@@ -1,7 +1,8 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#ebe9e9">
+    android:background="#ebe9e9"
+    android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:background="@drawable/selector_me_menu_item_bg">
     <ImageView
+        android:visibility="gone"
         android:id="@+id/photo_img"
         android:layout_width="40dp"
         android:layout_height="40dp"