导航栏统一改为灰色前 备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/WorkDailyAdapter.java

@@ -72,9 +72,9 @@ public class WorkDailyAdapter extends BaseAdapter {
        // }
         //为日报列表界面赋值（状态，总结）,注意已审批和待审批的字体颜色
         if(mWorkDailyBeanList.get(position).getSTATUS().equals("已审批")){
-            viewHolder.WorkDailyStatus.setTextColor(Color.GREEN);
+            viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.approval));
         }else {
-            viewHolder.WorkDailyStatus.setTextColor(Color.RED);
+            viewHolder.WorkDailyStatus.setTextColor(mContext.getResources().getColor(R.color.no_approval));
         }
         viewHolder.WorkDailyStatus.setText(mWorkDailyBeanList.get(position).getSTATUS());
         viewHolder.WorkDailySummary.setText(mWorkDailyBeanList.get(position).getWD_COMMENT());

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

@@ -134,9 +134,9 @@ public class DailydetailsActivity extends BaseActivity {
             wdd_data.setText(date);
             wdd_summary.setText(summary);
             if(status.equals("已审批")){
-                wdd_status.setTextColor(Color.GREEN);
+                wdd_status.setTextColor(mContext.getResources().getColor(R.color.approval));
             }else{
-                wdd_status.setTextColor(Color.RED);
+              wdd_status.setTextColor(mContext.getResources().getColor(R.color.no_approval));
             }
             wdd_status.setText(status);
             wdd_plan.setText(plan);

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

@@ -2,7 +2,7 @@
 <LinearLayout 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"
     android:orientation="vertical">
 
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
@@ -30,13 +30,14 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/HalfBlack" />
+                    android:background="@color/HalfBlack"
+                    android:visibility="gone"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="16sp"
                     android:text="工作总结"
-                    android:paddingLeft="20dp"
+                    android:paddingLeft="10dp"
                     android:layout_marginTop="8dp"
                     />
                 <EditText
@@ -51,13 +52,14 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/HalfBlack" />
+                    android:background="@color/HalfBlack"
+                    android:visibility="gone"/>
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textSize="16sp"
                     android:text="工作计划"
-                    android:paddingLeft="20dp"
+                    android:paddingLeft="10dp"
                     android:layout_marginTop="8dp"/>
                 <EditText
                     android:id="@+id/add_work_daily_plan_et"
@@ -71,7 +73,8 @@
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
-                    android:background="@color/HalfBlack" />
+                    android:background="@color/HalfBlack"
+                    android:visibility="gone"/>
 
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -83,7 +86,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="工作心得"
-                        android:paddingLeft="20dp"
+                        android:paddingLeft="10dp"
                         android:textSize="16sp"
                         android:layout_marginTop="8dp"
                         />
@@ -91,7 +94,7 @@
                         android:id="@+id/add_work_daily_sharing_experience_im"
                         android:layout_width="30dp"
                         android:layout_height="30dp"
-                        android:src="@drawable/icon_app_share"
+                        android:src="@drawable/icon_share"
                         android:layout_alignParentRight="true"
                         android:layout_marginTop="0dp"
                         android:layout_marginRight="20dp"

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

@@ -25,7 +25,8 @@
                 android:drawableTop="@drawable/add_friend"
                 android:gravity="center"
                 android:textColor="@color/text_hine"
-                android:textSize="@dimen/text_hine" />
+                android:textSize="@dimen/text_hine"
+                />
 
             <TextView
                 android:id="@+id/push_task_tv"

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

@@ -24,8 +24,8 @@
 
         <com.xzjmyk.pm.activity.view.ClearEditText
             android:id="@+id/search_edit"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_centerHorizontal="true"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
@@ -96,10 +96,9 @@
             android:id="@+id/tv_transtered" />
 
     </LinearLayout>
-   
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
-        android:headerDividersEnabled="false"
         android:dividerHeight ="10dp"
         style="@style/ListViewBasic">
     </com.handmark.pulltorefresh.library.PullToRefreshListView>

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:layout_marginLeft="20dp"
+    android:layout_marginLeft="10dp"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OutofficeSetActivity">
 
     <RelativeLayout
@@ -26,7 +26,7 @@
             android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="20dp" />
+            android:layout_marginRight="10dp" />
     </RelativeLayout>
 
     <View
@@ -53,7 +53,7 @@
             android:layout_height="25dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:layout_marginRight="20dp" />
+            android:layout_marginRight="10dp" />
     </RelativeLayout>
 
     <View
@@ -85,7 +85,7 @@
             android:gravity="center_vertical"
             android:text="500米"
             android:textColor="@color/text_main"
-            android:layout_marginRight="20dp"/>
+            android:layout_marginRight="10dp"/>
     </RelativeLayout>
 
     <View

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="#ebe9e9"
     android:orientation="vertical"
    >
 
@@ -40,8 +40,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:layout_marginLeft="20dp"
-                    android:layout_marginRight="20dp"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginRight="10dp"
                     >
                 <RelativeLayout
                     android:layout_width="wrap_content"
@@ -168,7 +168,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="已完成任务"
-                    android:layout_marginLeft="20dp"
+                    android:layout_marginLeft="10dp"
                     android:layout_marginTop="5dp"
                     android:textSize="18sp"
                     android:textColor="#575757"
@@ -180,7 +180,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
-                    android:layout_marginLeft="20dp"
+                    android:layout_marginLeft="10dp"
                     android:textColor="#575757"
                     android:visibility="visible"
                     />
@@ -198,7 +198,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="未完成任务"
-                        android:layout_marginLeft="20dp"
+                        android:layout_marginLeft="10dp"
                         android:layout_marginTop="5dp"
                         android:textSize="18sp"
                         android:textColor="#575757"
@@ -229,14 +229,7 @@
                     android:visibility="visible"
                     >
                 </com.xzjmyk.pm.activity.view.MyListView>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_marginTop="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
-                android:background="@color/item_line" />
+
                  </LinearLayout>
              </LinearLayout>
         </LinearLayout>

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

@@ -2,14 +2,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/item_color2"
+    android:background="#ebe9e9"
     android:orientation="vertical"
     >
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="10dp"
-    android:layout_marginRight="10dp"
     android:orientation="vertical"
     >
 

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

@@ -2,6 +2,7 @@
 <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#ebe9e9"
     >
     <LinearLayout
         android:descendantFocusability="blocksDescendants"
@@ -9,7 +10,7 @@
         style="@style/crm_ll_card"
         android:id="@+id/business_detail_ll"
         android:paddingBottom="10dp"
-        android:paddingLeft="10dp">
+        >
 
         <LinearLayout style="@style/crm_ll_sale_item">
 
@@ -124,7 +125,7 @@
         android:id="@+id/iv_business_qiang"
         android:layout_width="100dp"
         android:layout_height="30dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginRight="10dp"
         android:layout_alignParentRight="true"
         android:src="@drawable/ic_qiang"
         android:layout_marginBottom="10dp"

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

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     android:orientation="vertical"
     >
         <LinearLayout
@@ -9,7 +10,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:layout_marginLeft="20dp"
+            android:layout_marginLeft="10dp"
             android:layout_marginTop="20dp">
             <ImageView
                 android:id="@+id/item_daily_details_approval_flow_node_img"
@@ -62,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_marginRight="20dp"
+            android:layout_marginRight="10dp"
             android:text="2016-11-4 19:40"
             android:textColor="#9F9595"
             android:textSize="@dimen/text_hine"

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#f6f5f5"
+    android:background="#ebe9e9"
     android:orientation="vertical">
 
     <TextView

WeiChat/src/main/res/menu/menu_list.xml

@@ -6,7 +6,7 @@
     <item
         android:id="@+id/push"
         android:title="日报记录"
-        android:icon="@drawable/xlist"
+        android:icon="@drawable/xlist1"
         app:showAsAction="ifRoom" />
 
 </menu>

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="no_approval">#f10813</color>
+    <color name="approval">#268509</color>
     <!--umeng-->
     <color name="umeng_socialize_comments_bg">#F4F4F4</color>
     <color name="umeng_socialize_color_group">#2c3035</color>

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

@@ -351,8 +351,8 @@
         <item name="android:textColorHint">#969595</item>
         <item name="android:textSize">14sp</item>
         <item name="android:layout_marginTop">1dp</item>
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginRight">10dp</item>
         <item name="android:paddingTop">1dp</item>
         <item name="android:background">@null</item>