1、企业框架UI调整

2、模块我UI调整
3、外勤签到页面UI调整
4、外勤签到-我的外勤页面UI调整
5、通讯录-个人资料页面UI调整

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

@@ -1122,7 +1122,7 @@ public class CompanyContactsActivity extends BaseActivity {
                     }
                     item.iv_enter.setVisibility(View.GONE);
                 } else {
-                    convertView.setBackgroundColor(Color.parseColor("#FFFFFF"));
+                    convertView.setBackgroundColor(Color.parseColor("#f3f3f3"));
                 }
             }
             return convertView;

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

@@ -234,24 +234,26 @@ public class WebViewCommActivity extends BaseActivity implements View.OnClickLis
                 mPosition++;
                 break;
         }
-        getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTITLE_());
-        if (mPosition == 0){
-            mPreTv.setVisibility(View.GONE);
-            mNextTv.setVisibility(View.VISIBLE);
-        }else if (mPosition == mSubscriptionMessages.size() - 1){
-            mPreTv.setVisibility(View.VISIBLE);
-            mNextTv.setVisibility(View.GONE);
-        }else {
-            mPreTv.setVisibility(View.VISIBLE);
-            mNextTv.setVisibility(View.VISIBLE);
+        if (mSubscriptionMessages != null){
+            getSupportActionBar().setTitle(mSubscriptionMessages.get(mPosition).getTITLE_());
+            if (mPosition == 0){
+                mPreTv.setVisibility(View.GONE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }else if (mPosition == mSubscriptionMessages.size() - 1){
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.GONE);
+            }else {
+                mPreTv.setVisibility(View.VISIBLE);
+                mNextTv.setVisibility(View.VISIBLE);
+            }
+            url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
+                    + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
+                    + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
+                    + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
+            Map<String,String> headers=new HashMap<>();
+            headers.put("client-name","uasClient");
+            webView.getRefreshableView().loadUrl(url,headers);
         }
-        url = mSubsurl  + "?numId=" + mSubscriptionMessages.get(mPosition).getNUM_ID_()
-                + "&mainId=" + mSubscriptionMessages.get(mPosition).getINSTANCE_ID_()
-                + "&insId=" + mSubscriptionMessages.get(mPosition).getID_()
-                + "&title=" + mSubscriptionMessages.get(mPosition).getTITLE_();
-        Map<String,String> headers=new HashMap<>();
-        headers.put("client-name","uasClient");
-        webView.getRefreshableView().loadUrl(url,headers);
     }
 
 

WeiChat/src/main/res/drawable/oa_signin_tv_bg.xml

@@ -8,13 +8,13 @@
         android:width="0.5dp"
         android:color="@android:color/black" />
     <!-- 圆角 -->
-    <corners android:radius="9dp" />
+    <corners android:radius="15dp" />
     <!-- 边距 -->
     <padding
-        android:bottom="10dp"
-        android:left="10dp"
-        android:right="10dp"
-        android:top="10dp" />
+        android:bottom="5dp"
+        android:left="5dp"
+        android:right="5dp"
+        android:top="5dp" />
     <!-- 渐变 -->
     <!--<gradient-->
     <!--android:angle="270"-->

WeiChat/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
+    <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
+
+    <item android:drawable="@color/me_menu_item_normal"/>
+</selector>

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

@@ -54,7 +54,7 @@
                     android:id="@+id/hv_head_view"
                     android:layout_width="fill_parent"
                     android:layout_height="40dip"
-                    android:background="#F2F2F2"
+                    android:background="#ffffff"
                     android:fadingEdge="none"
                     android:scrollbars="none">
 
@@ -104,6 +104,8 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="5"
+                        android:divider="#dfdede"
+                        android:dividerHeight="0.5dp"
                         android:scrollbars="none" />
                 </LinearLayout>
             </LinearLayout>

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

@@ -24,7 +24,7 @@
                 android:drawableTop="@drawable/add_friend"
                 android:gravity="center"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
 
             <TextView
                 android:id="@+id/push_task_tv"
@@ -36,7 +36,7 @@
                 android:gravity="center"
                 android:text="发任务"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_hine" />
         </LinearLayout>
 
 
@@ -47,7 +47,7 @@
 
             <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="250dp">
+                android:layout_height="220dp">
 
                 <ImageView
                     android:id="@+id/max_img"
@@ -77,8 +77,8 @@
                         android:layout_below="@id/avatar_img"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_hine" />
 
                     <TextView
                         android:id="@+id/sub_tv"
@@ -87,8 +87,8 @@
                         android:layout_below="@id/name_tv"
                         android:layout_centerHorizontal="true"
                         android:layout_marginTop="10dp"
-                        android:textColor="@color/text_main"
-                        android:textSize="@dimen/text_main" />
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/text_hine" />
 
 
                 </RelativeLayout>
@@ -101,7 +101,7 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
+                android:layout_height="45dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp">
 
@@ -141,7 +141,7 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/item_height"
+                android:layout_height="45dp"
                 android:paddingLeft="20dp"
                 android:paddingRight="20dp">
 
@@ -150,7 +150,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:text="邮箱"
+                    android:text="Email"
                     android:textColor="@color/text_main"
                     android:textSize="@dimen/text_main" />
 

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

@@ -32,41 +32,50 @@
                 android:drawableRight="@drawable/oa_next"
                 android:text="2016-07-01" />
 
-            <ImageView
-                android:id="@+id/head_img"
-                android:layout_width="60dp"
-                android:layout_height="60dp"
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="80dp"
                 android:layout_alignParentBottom="true"
-                android:layout_margin="10dp"
-                android:scaleType="fitXY" />
+                android:background="#60000000">
+                <ImageView
+                    android:id="@+id/head_img"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_margin="10dp"
+                    android:scaleType="fitXY" />
 
-            <TextView
-                android:id="@+id/name_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/head_img"
-                android:layout_toRightOf="@id/head_img"
-                android:textColor="@color/text_main" />
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/head_img"
+                    android:layout_toRightOf="@id/head_img"
+                    android:textSize="12dp"
+                    android:textColor="@color/white" />
 
-            <TextView
-                android:id="@+id/num_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@id/name_tv"
-                android:layout_below="@id/name_tv"
-                android:layout_marginTop="5dp"
-                android:textColor="@color/text_hine"
-                android:visibility="gone" />
+                <TextView
+                    android:id="@+id/num_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/name_tv"
+                    android:layout_below="@id/name_tv"
+                    android:layout_marginTop="5dp"
+                    android:textSize="12dp"
+                    android:textColor="@color/white"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/prot_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignLeft="@id/num_tv"
+                    android:layout_below="@id/num_tv"
+                    android:layout_marginTop="5dp"
+                    android:textSize="12dp"
+                    android:text="name"
+                    android:textColor="@color/white" />
+            </RelativeLayout>
 
-            <TextView
-                android:id="@+id/prot_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@id/num_tv"
-                android:layout_below="@id/num_tv"
-                android:layout_marginTop="5dp"
-                android:text="name"
-                android:textColor="@color/text_hine" />
         </RelativeLayout>
     </FrameLayout>
 

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

@@ -1,7 +1,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main">
+    android:background="#ebe9e9">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -10,7 +10,8 @@
 
         <RelativeLayout
             android:id="@+id/info_rl"
-            style="@style/IMTbleLine_UP_">
+            style="@style/IMTbleLine_UP_"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <ImageView
                 android:id="@+id/avatar_img"
@@ -58,7 +59,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -192,11 +193,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
 
         <RelativeLayout
             android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine">
+            style="@style/IMTbleLine"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/tv_zone"
@@ -224,7 +228,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -238,12 +242,15 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
         <!--公司-->
         <!--账套-->
         <RelativeLayout
             android:id="@+id/rl_company_change"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/company_text"
@@ -271,17 +278,20 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/rl_master_change"
-            style="@style/IMTbleLine_UP_Me">
+            style="@style/IMTbleLine_UP_Me"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:id="@+id/master_text"
@@ -309,7 +319,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -317,11 +327,14 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
 
         <RelativeLayout
             android:id="@+id/app_scan_code_rl"
             style="@style/IMTbleLine_UP_Me"
+            android:background="#faf9f9"
             android:visibility="gone">
 
             <TextView
@@ -360,7 +373,7 @@
 
         <RelativeLayout
             android:id="@+id/app_drafts_rl"
-
+            android:background="#faf9f9"
             style="@style/IMTbleLine_UP_Me"
             android:visibility="gone">
 
@@ -404,6 +417,7 @@
             android:id="@+id/my_b2b_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
+            android:background="#faf9f9"
             android:visibility="gone">
 
             <TextView
@@ -442,7 +456,8 @@
         <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp">
+            android:layout_marginTop="7dp"
+            android:background="@drawable/selector_me_menu_item_bg">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -460,7 +475,7 @@
                 android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-
+                android:layout_marginRight="8dp"
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
@@ -468,6 +483,8 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@color/item_line" />
     </LinearLayout>
 

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

@@ -2,7 +2,7 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_main">
+    android:background="#EBE9E9">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -97,7 +97,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/tv"
-            android:background="@color/white"
+            android:background="#faf9f9"
             android:padding="10dp">
 
             <com.baidu.mapapi.map.MapView
@@ -124,7 +124,7 @@
                 android:layout_marginLeft="5dp"
                 android:layout_toRightOf="@id/tag_img"
                 android:gravity="center_vertical"
-                android:textSize="@dimen/text_hine" />
+                android:textSize="@dimen/text_min" />
 
             <ImageView
                 android:id="@+id/tag_img2"
@@ -144,7 +144,7 @@
                 android:layout_below="@+id/date_tv"
                 android:gravity="center_vertical"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="@dimen/text_min" />
 
             <TextView
                 android:id="@+id/addr_tv"
@@ -155,7 +155,7 @@
                 android:layout_marginTop="5dp"
                 android:maxLines="3"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
+                android:textSize="@dimen/text_min" />
 
             <TextView
                 android:id="@+id/do_trim"
@@ -166,8 +166,8 @@
                 android:layout_marginTop="10dp"
                 android:maxLines="1"
                 android:text="地点微调"
-                android:textColor="@color/green"
-                android:textSize="@dimen/text_hine" />
+                android:textColor="#f17e21"
+                android:textSize="@dimen/text_min" />
         </RelativeLayout>
 
         <View

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

@@ -34,7 +34,7 @@
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="20dp"
             android:text="10:45"
             android:textColor="@color/text_main"
             android:textSize="20dp" />
@@ -56,6 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@id/location"
             android:layout_below="@id/location"
+            android:layout_marginTop="5dp"
             android:src="@drawable/addr" />
 
 

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

@@ -70,6 +70,7 @@
         android:layout_centerVertical="true"
         android:layout_toLeftOf="@id/add_friend"
         android:padding="5dp"
+        android:layout_marginRight="5dp"
         android:src="@drawable/info_phone" />
 
 </RelativeLayout>

WeiChat/src/main/res/values/colors.xml

@@ -293,4 +293,7 @@
     <color name="button_invalid">#C0C0C0</color>
     <color name="button_focus">#2475FB</color>
     <color name="text_normal">#808A87</color>
+
+    <color name="me_menu_item_normal">#FAF9F9</color>
+    <color name="me_menu_item_press">#DFDEDE</color>
 </resources>