提交代码保存

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

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

@@ -33,6 +33,7 @@ import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -228,18 +229,28 @@ public class AttendanceFragment extends EasyFragment implements OnHttpResultList
 
 
     private void handlerDate(JSONObject object) {
+        float achuqin = OACheckUtil.getJsonFloat(object, "achuqin");
+        int atime = (int) OACheckUtil.getJsonFloat(object, "atime");
+        DecimalFormat df = new DecimalFormat(".##");
+        String atimes = null;
+        if (achuqin != 0)
+            atimes = df.format(atime / achuqin);
+        else atimes = "0";
+        String achuqins = null;
+        if (achuqin == (int) achuqin) achuqins = String.valueOf((int) achuqin);
+        else achuqins = String.valueOf(achuqin);
         l1.setText(getString(R.string.ychuqin) + "  " + OACheckUtil.getJson2Text(object, "ychuqin") + " 天");
-        r1.setText(getString(R.string.achuqin) + "  " + OACheckUtil.getJson2Text(object, "achuqin") + " 天");
+        r1.setText(getString(R.string.achuqin) + "  " + achuqins + " 天");
         l2.setText(getString(R.string.nday) + "  " + OACheckUtil.getJson2Text(object, "nday") + " 天");
-        r2.setText(getString(R.string.sign_actualtime) + "  " + OACheckUtil.getJson2Text(object, "atime") + " " + getString(R.string.sign_hour_day));
+        r2.setText(getString(R.string.sign_actualtime) + "  " + atimes + " " + 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));
+        r4.setText(getString(R.string.signcard) + "  " + OACheckUtil.getJson2Text(object, "signcard") + " " + getString(R.string.sign_Times));
         l5.setText(getString(R.string.leave) + "  " + OACheckUtil.getJson2Text(object, "qjdaty") + " 天");
-        r5.setText(getString(R.string.overtime) + "  "+ OACheckUtil.getJson2Text(object, "overtime") + " 次/2小时");
-        l6.setText(getString(R.string.outdays) + "  "+ OACheckUtil.getJson2Text(object, "outdays") + " 天");
+        r5.setText(getString(R.string.overtime) + "  " + OACheckUtil.getJson2Text(object, "overtime") + " 次/2小时");
+        l6.setText(getString(R.string.outdays) + "  " + OACheckUtil.getJson2Text(object, "outdays") + " 天");
         r6.setText(getString(R.string.oaoutplan_title) + " " + OACheckUtil.getJson2Text(object, "outcount") + " 天/3次");
-        r4.setText(getString(R.string.signcard) + "  "+ OACheckUtil.getJson2Text(object, "signcard") + " " + getString(R.string.sign_Times));
     }
 
     private void setDate2Adapter(ArrayList<WorkModel> models) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/OACheckUtil.java

@@ -58,7 +58,23 @@ public class OACheckUtil {
         return 0;
     }
 
-
+    public static float getJsonFloat(JSONObject object, String... keys) {
+        if (object == null || keys == null || keys.length <= 0) return 0;
+        for (String key : keys) {
+            if (!object.containsKey(key) || object.get(key) == null)
+                continue;
+            if (object.get(key) instanceof Integer) {
+                return object.getInteger(key);
+            } else if (object.get(key) instanceof String) {
+                try {
+                    return  Float.valueOf(object.getString(key));
+                } catch (Exception e) {
+                    return 0;
+                }
+            }
+        }
+        return 0;
+    }
     /**
      * 获取json数据的int类型，因为接口经常返回一个null
      *
@@ -71,8 +87,16 @@ public class OACheckUtil {
         for (String key : keys) {
             if (!object.containsKey(key) || object.get(key) == null)
                 continue;
-            if (object.get(key) instanceof Integer)
+            if (object.get(key) instanceof Integer) {
                 return object.getInteger(key);
+            } else if (object.get(key) instanceof String) {
+                try {
+                    float mag = Float.valueOf(object.getString(key));
+                    return (int) mag;
+                } catch (Exception e) {
+                    return 0;
+                }
+            }
         }
         return 0;
     }