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

WeiChat/src/main/AndroidManifest.xml

@@ -597,10 +597,10 @@
         <activity android:name=".ui.erp.activity.oa.OAMainActivity" />
 
         <!-- 分享开始   umeng api key -->
-        <!--TODO 分享Id   android:value="57ea27bb67e58e088c003bbf" -->
+        <!--TODO Bitliker   android:value="574504a167e58eec520017df" -->
         <meta-data
             android:name="UMENG_APPKEY"
-            android:value="574504a167e58eec520017df" />
+            android:value="57ea27bb67e58e088c003bbf" />
         <!-- weixin -->
         <activity
             android:name=".wxapi.WXEntryActivity"

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -155,7 +155,7 @@ public class MyApplication extends Application {
     }
 
     private void initUmengStatistics() {
-        MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(this, "574504a167e58eec520017df",
+        MobclickAgent.UMAnalyticsConfig config = new MobclickAgent.UMAnalyticsConfig(this, "57ea27bb67e58e088c003bbf",
                 "baidu", MobclickAgent.EScenarioType.E_UM_NORMAL);
         MobclickAgent.startWithConfigure(config);
     }

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

@@ -34,6 +34,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
     //装饰物 decorat
     private String decoratDays;
     private int maxDay;//当月有多少天
+    private int[] workWeeks={2,3,4,5,6};
 
 
     private Calendar calendar;
@@ -205,9 +206,7 @@ public class OACalendarView extends View implements View.OnTouchListener {
         //使文字垂直居中
         Paint.FontMetrics fontMetrics = surface.hineDatePaint.getFontMetrics();
         float fontHeight = fontMetrics.bottom - fontMetrics.top;
-//        float dayTextY = surface.weekHeight +(surface.cellHeight +surface.dateTaxtSize) / 2;
         float dayTextY = surface.weekHeight + (surface.cellHeight + fontHeight) / 2 - fontMetrics.bottom;
-
         for (int i = 0; i < startIndex; i++) {
             float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
             canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);