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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -13,7 +13,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 61;//数据库版本号(每添加一个表要增加版本号)
+    private static final int DATABASE_VERSION = 62;//数据库版本号(每添加一个表要增加版本号)
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
@@ -205,6 +206,13 @@ public class OutofficeFragment extends EasyFragment implements View.OnClickListe
         }
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        ct= (OutofficeActivity) context;
+
+    }
+
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         setHasOptionsMenu(true);

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

@@ -1,11 +1,13 @@
 package com.xzjmyk.pm.activity.ui.erp.util.alarm;
 
+import android.annotation.TargetApi;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
@@ -125,15 +127,22 @@ public class AlarmService extends Service {
 
 
     //初始化数据
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     private void init() {
         //初始化任务线程
         if (alarmTask == null) {
             alarmTask = new AlarmTask();
-            alarmTask.execute();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                alarmTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            else
+                alarmTask.execute();
         } else {
             if (alarmTask.isCancelled()) {
                 alarmTask = new AlarmTask();
-                alarmTask.execute();
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
+                    alarmTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                else
+                    alarmTask.execute();
             }
         }
         if (alarmManage == null) alarmManage = new AlarmManage();

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.util.alarm;
 
+import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
 
@@ -8,8 +9,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.util.MacAndIDUtil;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.HashMap;
@@ -25,6 +28,8 @@ import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferences
 public class SigninPresenter {
     private final int WORK_DATA = 0x11;
     private final int WORK_LOG = 0x12;
+    private final int MAC_VAL = 0x13;
+    private long dayLong;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -32,10 +37,15 @@ public class SigninPresenter {
                 String message = msg.getData().getString("result");
                 JsonValidator validator = new JsonValidator();
                 boolean isJSON = StringUtils.isEmpty(message) ? false : validator.validate(message);
-                if (!isJSON) return;
+                if (!isJSON && msg.what == Constants.APP_SOCKETIMEOUTEXCEPTION) {
+                    //500错误
+                    handlerError(message);
+                    return;
+                }
                 JSONObject object = JSON.parseObject(message);
                 switch (msg.what) {
                     case WORK_DATA:
+                        handlerWork(object);
                         break;
                     case WORK_LOG:
                         break;
@@ -48,17 +58,51 @@ public class SigninPresenter {
         }
     };
 
+    public SigninPresenter(long dayLong) {
+        this.dayLong = dayLong;
+    }
+
+    public SigninPresenter() {
+        this.dayLong = System.currentTimeMillis();
+    }
+
+
+
+
+
+    //处理班次信息
+    private void handlerWork(JSONObject object) {
+
+    }
+
+    //处理错误信息   500
+    private void handlerError(String message) {
+        if (StringUtils.isEmpty(message)) return;
+
+    }
+
 
     //获取 1.获取班次  2.获取打卡列表
     public void loadSigninAndLogs() {
 
     }
 
+    //判断mac地址
+    private void validatorMac() {
+        //获取网络数据
+        MacAndIDUtil util = new MacAndIDUtil();
+        Context ct = MyApplication.getInstance();
+        Map<String, Object> param = new HashMap<>();
+        param.put("macAddress", util.getMac(ct));
+        param.put("emcode", getSharedPreferences(ct, "erp_username"));
+        net("mobile/addMobileMac.action", param, MAC_VAL);
+    }
+
     //获取打卡班次
     private void loadWorkData(long day) {
         Map<String, Object> param = new HashMap<>();
         param.put("date", TimeUtils.int_long_2_str(day));
-        net("mobile/getWorkDate.action", param, 0x11);
+        net("mobile/getWorkDate.action", param, WORK_DATA);
     }
 
     //获取打卡记录
@@ -74,7 +118,7 @@ public class SigninPresenter {
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        net("mobile/oa/workdata.action", param, 0x12);
+        net("mobile/oa/workdata.action", param, WORK_LOG);
     }