20:18 监控日志保存3,测试多语言

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

@@ -1471,6 +1471,7 @@ public class CommonUtil {
     }
 
     /**
+     * Created by FANGlh on 2017/5/2.
      * 针对月份，日期 返回xx格式 eg：1-1，需要两次取1 返回01
      * @return
      */
@@ -1498,7 +1499,7 @@ public class CommonUtil {
     }
 
     /**
-     * Created by FANGlh on 2017/5/5.
+     * Created by FANGlh on 2017/5/9.
      * function:日志保存本地通用方法
      * aa_type; //操作类型 打卡签到or外勤签到
      * aa_location; // 当前位置

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

@@ -244,7 +244,7 @@ public class AutoErpService extends Service {
                                     message.setData(bundle);
                                     handler.sendMessage(message);
                                 }else{
-                                    CommonUtil.saveAutoLogtoLocal("自动打卡", "距离太远或时间不符合");
+//                                    CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), "距离太远或时间不符合");
                                 }
                             } else if (CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), AppConfig.ALARMA_CLICK, false)) {//提醒  1.离开办公室 2.上班提醒   3.下班提醒
                                 int type = getReckonAutoUtil().reckonAlarm(INTERVAL);
@@ -299,11 +299,11 @@ public class AutoErpService extends Service {
                             MyApplication.getInstance().getBdLocationHelper().requestLocation();
                         }
                         if (missionIter == 0 || missionIter == MISSION_ITER) {
-                            CommonUtil.saveAutoLogtoLocal("APP监控", getString(R.string.oaoutplan_title));
+                            CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), getString(R.string.oaoutplan_title));
                             missionIter = 0;
                             List<MissionModel> plans = MissionDao.getInstance().queryByEnCode();
                             if (ListUtils.isEmpty(plans)) {
-                                CommonUtil.saveAutoLogtoLocal("自动外勤", "未获取到外勤计划");
+                                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), "未获取到外勤计划");
                                 return;
                             }
                             //符合外勤判断
@@ -324,7 +324,7 @@ public class AutoErpService extends Service {
                                     message.setData(bundle);
                                     handler.sendMessage(message);
                                 } else {
-                                    CommonUtil.saveAutoLogtoLocal("自动外勤", "距离太远");
+                                    CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), "距离太远");
                                 }
                             }
                         }

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

@@ -85,7 +85,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
     public void signinWork(WorkModel model) {
         //1.判读mac地址是否符合     3.签到
         if (!MyApplication.getInstance().isNetworkActive()) {
-            CommonUtil.saveAutoLogtoLocal("自动打卡", "网络未连接");
+            CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), getString(R.string.common_notlinknet));
             return;
         }
         MacAndIDUtil util = new MacAndIDUtil();
@@ -111,7 +111,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         if (model == null) return;
         if (!MyApplication.getInstance().isNetworkActive()) {
             notificationManage.sendNotification(ct, R.string.out_net_signin, MissionActivity.class);
-            CommonUtil.saveAutoLogtoLocal("自动外勤", "网络未连接");
+            CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), getString(R.string.common_notlinknet));
             return;
         }
         Map<String, Object> param = new HashMap<>();
@@ -491,7 +491,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
         } catch (Exception e) {
             if (e != null) {
                 LogUtil.i("result=" + e.getMessage());
-                CommonUtil.saveAutoLogtoLocal("APP监控", e.getMessage());
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), e.getMessage());
             }
         }
     }
@@ -504,10 +504,13 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             String msg = null;
             if (StringUtils.isInclude(message, MyApplication.getInstance().getString(R.string.is_not_common_device))) {
                 msg = MyApplication.getInstance().getString(R.string.is_not_common_device_not_signin);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
             } else if (StringUtils.isInclude(message, "设备正处于申请变更绑定阶段")) {
                 msg = MyApplication.getInstance().getString(R.string.is_changeing_not_signin);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
             } else if (StringUtils.isInclude(message, "该设备已被他人绑定")) {
                 msg = MyApplication.getInstance().getString(R.string.is_binded_other_not_signin);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed),msg);
             } else if (what == SIGNIN_MISSION) {
                 try {
                     Intent intent = new Intent();
@@ -515,12 +518,12 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                     intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
                     MsgBroadcast.sendLocalBroadcast(intent);
                     if (!StringUtils.isEmpty(message))
-                        CommonUtil.saveAutoLogtoLocal("自动外勤", message);
+                        CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), message);
                 } catch (Exception e) {
                 }
             }
             if (!StringUtils.isEmpty(msg))
-                CommonUtil.saveAutoLogtoLocal("APP监控", msg);
+                CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), msg);
             if (!isErrorMac && !StringUtils.isEmpty(msg)) {
                 isErrorMac = true;
                 notificationManage.sendNotification(MyApplication.getInstance(), msg, WorkActivity.class);
@@ -819,7 +822,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
 
                         }
                         if (saveOk) {
-                            CommonUtil.saveAutoLogtoLocal("APP启动", "APP外勤任务开启");
+                            CommonUtil.saveAutoLogtoLocal(getString(R.string.app_start_log), getString(R.string.app_outplan_running));
                             //TODO 保存异常数据库
                             OAHttpHelper.getInstance().post(new Runnable() {
                                 @Override

WeiChat/src/main/res/values/strings.xml

@@ -1532,4 +1532,9 @@
     <string name="sign_calendar">日历</string>
     <string name="sign_Average_hours">平均工时</string>
     <string name="work_business_me">我的商务</string>
+    <string name="auto_sign_failed">自动打卡失败</string>
+    <string name="auto_outplan_failed">自动外勤签到失败</string>
+    <string name="app_start_log">APP启动</string>
+    <string name="app_monitor_log">APP监控</string>
+    <string name="app_outplan_running">APP外勤任务开启中</string>
 </resources>