打包测试发布版本

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

@@ -262,7 +262,11 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.ViewHoler> {
     private String getWorkEndOrOffStart(String hhmm, boolean iswork) {
         if (AutoMemoryUtil.nonclass == 0)
             AutoMemoryUtil.nonclass = 90;
-        return getForAddMin(hhmm, iswork ? AutoMemoryUtil.nonclass : -AutoMemoryUtil.nonclass);
+        String time = getForAddMin(hhmm, iswork ? AutoMemoryUtil.nonclass : -AutoMemoryUtil.nonclass);
+        if (time.compareTo(hhmm) < 0)//跨天
+            return "23:59";
+        else
+            return time;
     }
 
     private String getForAddMin(String hhmm, int time) {

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

@@ -6,7 +6,8 @@
     <RelativeLayout
         android:id="@+id/work_context"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+    >
 
         <View
             android:id="@+id/point"
@@ -14,11 +15,10 @@
             android:layout_height="15dp"
             android:layout_centerHorizontal="true"
             android:background="@drawable/signin_point" />
-
         <View
             android:layout_width="2px"
             android:layout_height="180dp"
-            android:layout_below="@id/point"
+            android:layout_below="@+id/point"
             android:layout_centerHorizontal="true"
             android:background="@color/item_line" />
 
@@ -26,9 +26,10 @@
             android:id="@+id/work_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/point"
+            android:layout_alignTop="@+id/point"
             android:layout_marginRight="10dp"
-            android:layout_toLeftOf="@id/point"
+            android:layout_toLeftOf="@+id/point"
+            android:gravity="center"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
@@ -38,6 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/point"
             android:layout_toLeftOf="@+id/work_time"
+            android:gravity="center"
             android:text="上班时间   "
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -51,7 +53,7 @@
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/point"
             android:text="上班打卡 "
-            android:textColor="@color/text_main"
+            android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -60,7 +62,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/point"
             android:layout_toRightOf="@+id/signin_tag"
-            android:textColor="@color/text_main"
+            android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -105,6 +107,7 @@
             android:layout_alignTop="@+id/point2"
             android:layout_marginRight="10dp"
             android:layout_toLeftOf="@+id/point2"
+            android:gravity="center"
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
@@ -114,6 +117,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/point2"
             android:layout_toLeftOf="@+id/off_time"
+            android:gravity="center"
             android:text="下班时间   "
             android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
@@ -127,7 +131,7 @@
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/point2"
             android:text="下班打卡  "
-            android:textColor="@color/text_main"
+            android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -136,7 +140,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/point2"
             android:layout_toRightOf="@+id/signin_tag2"
-            android:textColor="@color/text_main"
+            android:textColor="@color/text_hine"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -171,8 +175,8 @@
         android:id="@+id/free_context"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="10dp"
-        android:visibility="gone">
+        android:visibility="gone"
+        android:padding="10dp">
 
         <View
             android:layout_width="15dp"
@@ -187,6 +191,7 @@
             android:layout_height="wrap_content"
             android:layout_alignTop="@+id/point"
             android:layout_toRightOf="@+id/point"
+            android:gravity="center"
             android:paddingTop="5dp"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
@@ -198,6 +203,7 @@
             android:layout_alignTop="@+id/point"
             android:layout_marginLeft="10dp"
             android:layout_toRightOf="@+id/point"
+            android:gravity="center"
             android:paddingTop="5dp"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />