2016/8/31-1

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

@@ -472,7 +472,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private void chaneTAG(boolean isMy) {
         if (isMy) {
             if (!my_client_log.getText().toString().trim().equals("下属工作日志")) {
-                my_client_log.setText("下属工作日志");
+                my_client_log.setText("下属工作日历");
             }
             tag = 1;
             ok_scale.setVisibility(View.GONE);

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

@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_alignLeft="@+id/name_tv"
             android:layout_below="@+id/line"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="15dp"
             android:text="你今天完成签到"
             android:textSize="20dp" />
 
@@ -53,11 +53,9 @@
             android:id="@+id/num_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tv"
-            android:layout_alignBottom="@+id/name_tv"
+            android:layout_alignBottom="@+id/tv"
             android:layout_marginLeft="5dp"
             android:layout_toRightOf="@+id/tv"
-            android:paddingBottom="5dp"
             android:text="0 "
             android:textColor="@color/mainList2"
             android:textSize="25dp" />

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:background="@color/oa_main"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:background="@color/oa_main">
     <RelativeLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
@@ -34,7 +33,6 @@
             android:padding="8dp"
             android:src="@drawable/setting" />
     </RelativeLayout>
-
     <LinearLayout
         android:id="@+id/oa_range_addr_rl"
         android:layout_width="match_parent"
@@ -58,7 +56,6 @@
             android:text="地点微调"
             android:textColor="@color/cadetblue" />
     </LinearLayout>
-
     <ImageView
         android:id="@+id/signin_btn"
         android:layout_width="wrap_content"
@@ -82,4 +79,12 @@
         android:focusable="false"
         android:longClickable="false"
         android:minHeight="100dp" />
+
+    <View
+        android:layout_width="2px"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/signin_btn"
+        android:layout_below="@+id/top"
+        android:layout_centerHorizontal="true"
+        android:background="@color/item_line" />
 </RelativeLayout>

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

@@ -11,7 +11,7 @@
         android:background="@drawable/signin_point" />
 
     <View
-        android:layout_width="6px"
+        android:layout_width="2px"
         android:layout_height="180dp"
         android:layout_below="@+id/point"
         android:layout_centerHorizontal="true"