提交代码保存

1.隐藏CRm2.0功能
2.修复个别bug
3.修正个别翻译

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

@@ -252,6 +252,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         }
     }
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -843,8 +844,10 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         int yeas = c.get(Calendar.YEAR);
         int month = c.get(Calendar.MONTH) + 1;
         int day = c.get(Calendar.DAY_OF_MONTH);
-        yeas_tv.setText(yeas + getString(R.string.common_year) + month + getString(R.string.common_month));
-        day_tv.setText(day + getString(R.string.common_day));
+//        yeas_tv.setText(yeas + getString(R.string.common_year) + month + getString(R.string.common_month));
+//        day_tv.setText(day + getString(R.string.common_day));
+        yeas_tv.setText(yeas + "年" + month + "月");
+        day_tv.setText(day + "日");
         week_tv.setText(TimeUtils.getWeek(TimeUtils.s_format.format(date)));
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -21,6 +21,7 @@ import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.WorkHandlerUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
@@ -227,19 +228,18 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
 
 
     private void handlerDate(JSONObject object) {
-        l1.setText("应该出勤 " + getNull(object, "ychuqin") + " 天");
-        r1.setText("实际出勤 " + getNull(object, "achuqin") + " 天");
-        l2.setText("正常打卡 " + getNull(object, "nday") + " 天");
-        r2.setText(getString(R.string.sign_actualtime) + "    " + getNull(object, "atime") + " " + getString(R.string.sign_hour_day));
-        l3.setText(getString(R.string.sign_late) + "  " + getNull(object, "latecount") + " " + getString(R.string.sign_Times));
-        r3.setText(getString(R.string.sign_leave) + "  " + getNull(object, "earlycount") + " " + getString(R.string.sign_Times));
-        l4.setText(getString(R.string.sign_Absenteeism) + "  " + getNull(object, "noncount") + " " + getString(R.string.sign_Times));
-        l5.setText("请假    " + getNull(object, "qjdaty") + " 天");
-        r5.setText("加班    " + getNull(object, "overtime") + " 次/2小时");
-        l6.setText("出差    " + getNull(object, "outdays") + " 天");
-        r6.setText(getString(R.string.oaoutplan_title) + " " + getNull(object, "outcount") + " 天/3次");
-
-        r4.setText("补卡    " + getNull(object, "signcard") + " " + getString(R.string.sign_Times));
+        l1.setText("应该出勤 " + OACheckUtil.getJson2Text(object, "ychuqin") + " 天");
+        r1.setText("实际出勤 " + OACheckUtil.getJson2Text(object, "achuqin") + " 天");
+        l2.setText("正常打卡 " + OACheckUtil.getJson2Text(object, "nday") + " 天");
+        r2.setText(getString(R.string.sign_actualtime) + "  " + OACheckUtil.getJson2Text(object, "atime") + " " + getString(R.string.sign_hour_day));
+        l3.setText(getString(R.string.sign_late) + "  " + OACheckUtil.getJson2Text(object, "latecount") + " " + getString(R.string.sign_Times));
+        r3.setText(getString(R.string.sign_leave) + "  " + OACheckUtil.getJson2Text(object, "earlycount") + " " + getString(R.string.sign_Times));
+        l4.setText(getString(R.string.sign_Absenteeism) + "  " + OACheckUtil.getJson2Text(object, "noncount") + " " + getString(R.string.sign_Times));
+        l5.setText("请假    " + OACheckUtil.getJson2Text(object, "qjdaty") + " 天");
+        r5.setText("加班    " + OACheckUtil.getJson2Text(object, "overtime") + " 次/2小时");
+        l6.setText("出差    " + OACheckUtil.getJson2Text(object, "outdays") + " 天");
+        r6.setText(getString(R.string.oaoutplan_title) + " " + OACheckUtil.getJson2Text(object, "outcount") + " 天/3次");
+        r4.setText("补卡    " +  OACheckUtil.getJson2Text(object, "signcard") + " " + getString(R.string.sign_Times));
     }
 
     private void setDate2Adapter(ArrayList<WorkModel> models) {
@@ -259,7 +259,7 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
         JSONObject object = JSON.parseObject(message);
         switch (what) {
             case 0x11:
-                handlerDate(object);
+                handlerDate(object.getJSONArray("listdata").getJSONObject(0));
                 break;
             case 0x12:
                 try {

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -684,6 +684,14 @@
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
 
+    <string name="leave">请假</string>
+    <string name="overtime">加班</string>
+    <string name="ychuqin">应该出勤</string>
+    <string name="achuqin">实际出勤</string>
+    <string name="nday">正常打卡</string>
+    <string name="outdays">出差</string>
+    <string name="signcard">补卡</string>
+
     <!--end by Bitliker-->
 
     <!--start by Arison-->