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

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/CalendarView.java

@@ -429,7 +429,7 @@ public class    CalendarView extends View implements View.OnTouchListener {
             weekPaint = new Paint();
             weekPaint.setColor(textColor);
             weekPaint.setAntiAlias(true);
-            float weekTextSize = weekHeight * 0.6f;
+            float weekTextSize = weekHeight * 0.5f;
             weekPaint.setTextSize(weekTextSize);
             //weekPaint.setTypeface(Typeface.DEFAULT_BOLD);
             datePaint = new Paint();
@@ -442,7 +442,7 @@ public class    CalendarView extends View implements View.OnTouchListener {
             circlePaint.setFilterBitmap(true);
             circlePaint.setStyle(Paint.Style.STROKE);//空心
             circlePaint.setStrokeWidth(3);
-            float cellTextSize = cellHeight * 0.5f;
+            float cellTextSize = cellHeight * 0.35f;
             datePaint.setTextSize(cellTextSize);
             //datePaint.setTypeface(Typeface.DEFAULT_BOLD);
             boxPath = new Path();

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

@@ -156,8 +156,8 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="下属工作日志"
-                android:textSize="20dp" />
+                android:text="下属工作日历"
+                android:textSize="16dp" />
 
             <TextView
                 android:id="@+id/my_log"
@@ -165,9 +165,9 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="我的工作日志"
+                android:text="我的工作日历"
                 android:textCursorDrawable="@color/yellow_home"
-                android:textSize="20dp" />
+                android:textSize="16dp" />
         </LinearLayout>
 
         <LinearLayout