订阅号计算时间问题

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -43,6 +44,7 @@ public class ChangeMobileActivity extends BaseActivity {
         @Override
         public void handleMessage(Message msg) {
             String message = msg.getData().getString("result");
+            submiting = false;
             switch (msg.what) {
                 case 0x11:
                     try {
@@ -55,8 +57,11 @@ public class ChangeMobileActivity extends BaseActivity {
                     break;
                 case 0x12:
                     progressDialog.dismiss();
-                    finish();
                     Toast.makeText(ct, R.string.change_mobile_ok, Toast.LENGTH_SHORT).show();
+                    Intent intent = new Intent();
+                    intent.putExtra("isChange", true);
+                    setResult(0x20, intent);
+                    finish();
                     break;
                 case Constants.APP_SOCKETIMEOUTEXCEPTION:
                     progressDialog.dismiss();
@@ -77,6 +82,8 @@ public class ChangeMobileActivity extends BaseActivity {
         initView();
     }
 
+    private boolean submiting = false;
+
     private void initView() {
         String mac = null;
         if (getIntent() != null)
@@ -94,11 +101,11 @@ public class ChangeMobileActivity extends BaseActivity {
 
             }
         });
-
-
     }
 
     private void validatorMac() {
+        if (submiting) return;
+        submiting = true;
         //获取网络数据
         progressDialog.show();
         String url = CommonUtil.getSharedPreferences(ct, "erp_baseurl") + "common/saveCommon.action";

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

@@ -252,6 +252,10 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             latitude = poi.location.latitude;
             longitude = poi.location.longitude;
             unoffice_mm.setText(setDistance());
+        } else if (requestCode == 0x18 && resultCode == 0x20) {
+            boolean isChange = data.getBooleanExtra("isChange", false);
+            if (isChange)
+                macError = getResources().getString(R.string.mac_changing);
         }
     }
 
@@ -387,7 +391,6 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
                 public void callBack(boolean isOpen) {
                     if (isOpen) {
                         macAddress = util.getMac(ct);
-
                     }
                 }
             });
@@ -592,7 +595,7 @@ public class SigninFragment extends EasyFragment implements View.OnClickListener
             beans.add(b);
         //没有排班情况
         if (ListUtils.isEmpty(beans)) {
-            Crouton.makeText(ct,R.string.not_work_message);
+            Crouton.makeText(ct, R.string.not_work_message);
         }
         setDataForAdapter(beans);
     }

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

@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.widget.Toast;
 
+import com.xzjmyk.pm.activity.AppConfig;
 import com.xzjmyk.pm.activity.bean.oa.SigninBean;
 import com.xzjmyk.pm.activity.db.dao.SigninDao;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
@@ -95,13 +96,14 @@ public class AlarmManage {
     private void setNextAlarm(Context ct, String action, long time) {
         String str = TimeUtils.f_long_2_str(time);
         if (time < System.currentTimeMillis()) return;
-        Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
+        if (AppConfig.DEBUG)
+            Toast.makeText(ct, "提醒时间为:" + str, Toast.LENGTH_SHORT).show();
         Intent intent = new Intent(ct, AlarmReceiver.class);
         intent.setAction(StringUtils.isEmpty(action) ? WORK_ALARM_ACTION : action);
         AlarmManager alarm = (AlarmManager) ct.getSystemService(ALARM_SERVICE);
         Calendar calendar = Calendar.getInstance();
         calendar.setTimeInMillis(time);
-        alarm.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(ct, intent));
+        alarm.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, calendar.getTimeInMillis(), getPendingIntent(ct, intent));
     }
 
     //清空提醒