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

# Conflicts:
#	WeiChat/src/main/res/layout/activity_workdaily_detail.xml

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

@@ -9,9 +9,6 @@
     <com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginLeft="20dp"
         android:layout_weight="1"
         android:fillViewport="true"
         android:scrollbars="none">
@@ -21,14 +18,17 @@
             android:layout_height="wrap_content"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:layout_marginTop="5dp"
+            >
 
             <LinearLayout
                 android:id="@+id/ly_head_display"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:layout_marginBottom="10dp">
+                android:layout_marginBottom="10dp"
+                >
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/line"
@@ -36,6 +36,13 @@
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="5dp"
                     android:background="@color/item_line" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    >
                 <RelativeLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -80,8 +87,7 @@
                 <TextView
                     android:id="@+id/work_daily_detail_summary_et"
                     style="@style/form_relative_right_text1"
-                    android:layout_marginLeft="10dp"
-                    android:text="工作总结"
+                    android:text="总结啦"
                     android:textColor="#575757"
                     />
                 <View
@@ -108,8 +114,7 @@
                     android:id="@+id/work_daily_detail_plan_tv"
                     style="@style/form_relative_right_text1"
                     android:textColor="#575757"
-                    android:layout_marginLeft="10dp"
-                    android:text="工作计划"/>
+                    android:text="计划啦"/>
 
                 <View
                     android:layout_width="match_parent"
@@ -138,8 +143,7 @@
                     android:id="@+id/work_daily_detail_experience_tv"
                     style="@style/form_relative_right_text1"
                     android:textColor="#575757"
-                    android:layout_marginLeft="10dp"
-                    android:text="工作心得"
+                    android:text="心得啦"
                     />
                         <View
                             android:layout_width="match_parent"
@@ -148,7 +152,7 @@
                             android:layout_marginLeft="5dp"
                             android:layout_marginRight="5dp"/>
                  </LinearLayout>
-
+                </LinearLayout>
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -159,7 +163,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="已完成任务"
-                    android:paddingLeft="5dp"
+                    android:layout_marginLeft="20dp"
                     android:layout_marginTop="5dp"
                     android:textSize="18sp"
                     android:textColor="#575757"
@@ -171,8 +175,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="今天暂无分配工作任务"
+                    android:layout_marginLeft="20dp"
                     android:textColor="#575757"
-                    android:padding="8dp"
                     android:visibility="visible"
                     />
 
@@ -189,7 +193,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="未完成任务"
-                        android:paddingLeft="5dp"
+                        android:layout_marginLeft="20dp"
                         android:layout_marginTop="5dp"
                         android:textSize="18sp"
                         android:textColor="#575757"
@@ -208,7 +212,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="5dp"
                     android:background="#EBE9E9"
-                    android:layout_marginTop="2dp"
+                    android:layout_marginTop="5dp"
                     android:visibility="visible"/>
 
                 <com.xzjmyk.pm.activity.view.MyListView

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

@@ -4,18 +4,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     >
+        <LinearLayout
+            android:id="@+id/node_ll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="20dp">
+            <ImageView
+                android:id="@+id/item_daily_details_approval_flow_node_img"
+                android:layout_width="15dp"
+                android:layout_height="15dp"
+                android:background="@drawable/node_wait3"
+                android:contentDescription="@string/app_name"
+                />
 
+        </LinearLayout>
 
-         <ImageView
-            android:id="@+id/item_daily_details_approval_flow_node_img"
-            android:layout_width="15dp"
-            android:layout_height="15dp"
-            android:background="@drawable/node_wait3"
-            android:contentDescription="@string/app_name"
-            android:layout_marginLeft="20px"
-             android:layout_marginTop="20dp"
-
-             />
 
         <ImageView
             android:id="@+id/item_daily_details_approval_flow_photo_img"
@@ -23,8 +28,8 @@
             android:layout_height="40dp"
             android:background="@drawable/avatar_normal"
             android:contentDescription="@string/app_name"
-            android:layout_marginLeft="5dp"
-            android:layout_toRightOf="@id/item_daily_details_approval_flow_node_img"
+            android:layout_marginLeft="15dp"
+            android:layout_toRightOf="@id/node_ll"
             android:layout_marginTop="10dp"
             android:layout_marginBottom="10dp" />
 

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

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="#f6f5f5"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/item_daily_details_task_title_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="3dp"
-        android:layout_marginBottom="3dp"
-        android:text="标题1标题1标题1标题1"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="5dp"
+        android:text="新添日报，日报列表界面的重写，日报详情的显示。"
         android:textSize="15sp"
         />
 
@@ -25,6 +27,7 @@
         android:layout_marginBottom="3dp"
         android:text="发起人"
         android:textSize="15sp"
+        android:visibility="gone"
         />
 
-</RelativeLayout>
+</LinearLayout>

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

@@ -332,6 +332,7 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">top</item>
+        <item name="android:layout_marginLeft">10dp</item>
         <item name="android:minHeight">20dp</item>
         <item name="android:padding">5dp</item>
         <item name="android:width">160dp</item>