合并代码

WeiChat/src/main/java/com/xzjmyk/pm/activity/AppConfig.java

@@ -9,10 +9,9 @@ import android.util.Log;
 import com.xzjmyk.pm.activity.bean.ConfigBean;
 
 public class AppConfig {
-    public static final boolean COMPANY = false;//不可以乱动，调试接口
+    public static final boolean COMPANY = true;//不可以乱动，调试接口
     public static final String TAG = "roamer";
     public static final boolean DEBUG = true;
-
     public final static String AUTO_SIGNIN_ACTION = "AUTO_SIGNIN_ACTION";//自动打卡action
     public final static String WORK_ALARM_ACTION = "WORK_ALARM_ACTION";//上班提醒action
     public final static String OFFWORK_ALARM_ACTION = "OFFWORK_ALARM_ACTION";//下班提醒action
@@ -25,7 +24,7 @@ public class AppConfig {
 
     public final static String ALARM_MISSION_TIME = "ALARM_MISSION_TIME";//提醒时间
     public final static String ALARM_MISSION_DISTANCE = "ALARM_MISSION_DISTANCE";//有效距离
-    public final static String AUTO_MISSION_TIME= "AUTO_MISSION_TIME";//预留时间
+    public final static String AUTO_MISSION_TIME = "AUTO_MISSION_TIME";//预留时间
 
     public final static String IS_ADMIN = "IS_ADMIN";//管理员状态  1.管理员  2.非管理员
 

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

@@ -3,9 +3,13 @@ package com.xzjmyk.pm.activity.ui.erp.util.alarm;
 import android.os.Handler;
 import android.os.Message;
 
+import com.alibaba.fastjson.JSON;
+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.JsonValidator;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
 import java.util.HashMap;
@@ -19,23 +23,47 @@ import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferences
  * Created by Bitliker on 2016/11/18.
  */
 public class SigninPresenter {
-
+    private final int WORK_DATA = 0x11;
+    private final int WORK_LOG = 0x12;
     private Handler handler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
+            try {
+                String message = msg.getData().getString("result");
+                JsonValidator validator = new JsonValidator();
+                boolean isJSON = StringUtils.isEmpty(message) ? false : validator.validate(message);
+                if (!isJSON) return;
+                JSONObject object = JSON.parseObject(message);
+                switch (msg.what) {
+                    case WORK_DATA:
+                        break;
+                    case WORK_LOG:
+                        break;
+                    default:
+                        break;
+                }
+            } catch (Exception e) {
 
+            }
         }
     };
 
 
-    //获取
+    //获取 1.获取班次  2.获取打卡列表
     public void loadSigninAndLogs() {
 
     }
 
+    //获取打卡班次
+    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);
+    }
+
     //获取打卡记录
-    private void loadLog() {
-        String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
+    private void loadLog(long day) {
+        String date = TimeUtils.s_long_2_str(day);
         //获取网络数据
         Map<String, Object> param = new HashMap<>();
         String code = getSharedPreferences(MyApplication.getInstance(), "erp_username");

WeiChat/src/main/res/layout/fragment_me.xml

@@ -493,6 +493,7 @@
             android:id="@+id/test_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
+            android:visibility="gone"
             android:background="@drawable/selector_me_menu_item_bg"
             >