20:18 监控日志保存2

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/SignAutoLogDao.java

@@ -69,10 +69,13 @@ public class SignAutoLogDao {
     public void updateCurData(List<SignAutoLogEntity> signAutoLogEntity) {
         SQLiteDatabase stepDb = DatabaseManager.getInstance().openDatabase();
         ContentValues values = new ContentValues();
+        stepDb.beginTransaction();
         for (int i = 0; i < signAutoLogEntity.size(); i++) {
-            values.put("_id", signAutoLogEntity.get(i).getId());
-            stepDb.update("SignAutoLog", values, "sendstatus=?", new String[]{"1"});
+            values.put("sendstatus",1);
+            stepDb.update("SignAutoLog", values, "_id=?", new String[]{signAutoLogEntity.get(i).getId() + ""});
         }
+        stepDb.setTransactionSuccessful();
+        stepDb.endTransaction();
         DatabaseManager.getInstance().closeDatabase();
     }
 }

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

@@ -1507,7 +1507,7 @@ public class CommonUtil {
      * aa_telephone; // 手机
      */
 
-    public static void SaveAutoLogtoLocal(String aa_type,String aa_remark){
+    public static void saveAutoLogtoLocal(String aa_type,String aa_remark){
         String aa_date = TimeUtils.f_long_2_str(System.currentTimeMillis());
         String aa_location = MyApplication.getInstance().getBdLocationHelper().getAddress();
         String aa_telephone = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "user_phone");

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("自动打卡", "距离太远或时间不符合");
                                 }
                             } 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("APP监控", getString(R.string.oaoutplan_title));
                             missionIter = 0;
                             List<MissionModel> plans = MissionDao.getInstance().queryByEnCode();
                             if (ListUtils.isEmpty(plans)) {
-                                CommonUtil.SaveAutoLogtoLocal("外勤签到", "未获取到外勤计划");
+                                CommonUtil.saveAutoLogtoLocal("自动外勤", "未获取到外勤计划");
                                 return;
                             }
                             //符合外勤判断
@@ -324,7 +324,7 @@ public class AutoErpService extends Service {
                                     message.setData(bundle);
                                     handler.sendMessage(message);
                                 } else {
-                                    CommonUtil.SaveAutoLogtoLocal("外勤签到", "距离太远");
+                                    CommonUtil.saveAutoLogtoLocal("自动外勤", "距离太远");
                                 }
                             }
                         }

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("自动打卡", "网络未连接");
             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("自动外勤", "网络未连接");
             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("APP监控", e.getMessage());
             }
         }
     }
@@ -515,12 +515,12 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                     intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
                     MsgBroadcast.sendLocalBroadcast(intent);
                     if (!StringUtils.isEmpty(message))
-                        CommonUtil.SaveAutoLogtoLocal("外勤签到", message);
+                        CommonUtil.saveAutoLogtoLocal("自动外勤", message);
                 } catch (Exception e) {
                 }
             }
             if (!StringUtils.isEmpty(msg))
-                CommonUtil.SaveAutoLogtoLocal("APP监控", msg);
+                CommonUtil.saveAutoLogtoLocal("APP监控", msg);
             if (!isErrorMac && !StringUtils.isEmpty(msg)) {
                 isErrorMac = true;
                 notificationManage.sendNotification(MyApplication.getInstance(), msg, WorkActivity.class);
@@ -819,7 +819,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
 
                         }
                         if (saveOk) {
-                            CommonUtil.SaveAutoLogtoLocal("APP启动", "APP外勤任务开启");
+                            CommonUtil.saveAutoLogtoLocal("APP启动", "APP外勤任务开启");
                             //TODO 保存异常数据库
                             OAHttpHelper.getInstance().post(new Runnable() {
                                 @Override