个人消息首页部分显示服务预约内容

修改手机的判断
修复手动外勤bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -41,6 +41,7 @@ import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.common.LogUtil;
+import com.common.config.BaseConfig;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -77,6 +78,7 @@ import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.AuthStateListener;
 import com.core.xmpp.model.SignAutoLogEntity;
 import com.modular.appmessages.presenter.MessagePresenter;
+import com.modular.apptasks.presenter.AutoPresenter;
 import com.modular.login.activity.LoginActivity;
 import com.uas.appcontact.listener.ImStatusListener;
 import com.uas.appcontact.ui.fragment.ContactsFragment;

app_core/common/src/main/java/com/common/data/StringUtil.java

@@ -39,8 +39,9 @@ public class StringUtil {
 
 	/* 是否是手机号 */
 	public static boolean isMobileNumber(String mobiles) {
-		Matcher mat = Pattern.compile("^[1][3,5,7,8][0-9]\\\\d{8}$").matcher(mobiles);
-		return mat.matches();
+//		Matcher mat = Pattern.compile("^[1][3,5,7,8][0-9]\\\\d{8}$").matcher(mobiles);
+//		return mat.matches();
+		return true;
 	}
 
 	public static boolean isEmpty(String input) {

app_core/common/src/main/java/com/core/net/http/http/OAHttpHelper.java

@@ -129,8 +129,7 @@ public class OAHttpHelper extends Handler {
     private void loadERP(Request request, OnHttpResultListener listener) throws Exception {
         LinkedHashMap<String, Object> headers = getHeaders(request);
         headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(BaseConfig.getContext(), "sessionId"));
-        String url = CommonUtil.getSharedPreferences(BaseConfig.getContext(), "erp_baseurl") + request.getUrl();
-//        String url = "http://192.168.253.65:8080/ERP//" + request.getUrl();
+        String url = CommonUtil.getAppBaseUrl(BaseConfig.getContext()) + request.getUrl();
         Bundle bundle = getBundle(request);
         if (listener != null)
             bundle.putSerializable("listener", listener);
@@ -143,7 +142,7 @@ public class OAHttpHelper extends Handler {
     private void loadB2B(Request request, OnHttpResultListener listener) throws Exception {
         Map<String, Object> param = getParam(request);
         param.put("enuu", CommonUtil.getSharedPreferences(BaseConfig.getContext(), "companyEnUu"));
-        param.put("emcode", CommonUtil.getSharedPreferences(BaseConfig.getContext(), "b2b_uu"));
+        param.put("emcode", CommonUtil.getEmcode( ));
         LinkedHashMap<String, Object> headers = getHeaders(request);
         headers.put("Cookie", "JSESSIONID=" + ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getCookie());
         Bundle bundle = getBundle(request);

app_core/message/src/main/java/com/me/message/imp/ToastCustomizedImpl.java

@@ -20,8 +20,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.me.message.interfacepack.CustomizedToast;
+import com.me.message.supertoasts.R;
 import com.me.message.utils.Utils;
-import com.umano.message.supertoasts.R;
 
 import java.util.Timer;
 import java.util.TimerTask;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -116,12 +116,15 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 		if (isSubmiting) return;
 		List<MissionModel> plans = new ArrayList<>();
 		for (MissionModel e : models) {
+			LogUtil.i("==" + JSON.toJSONString(e));
 			if (e.getStatus() != 0) {
 				plans.add(e);
 			}
 		}
 		MissionModel mission = reckonMission(plans);//判断
-		if (mission != null) {
+		if (mission == null) {
+			iMission.showToast("无可签到签退的计划", R.color.load_error);
+		} else {
 			LogUtil.i(JSON.toJSONString(mission));
 			signinMission(mission);
 		}
@@ -360,8 +363,11 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 		if (!ListUtils.isEmpty(models)) {
 			if (iMission != null) {
 				iMission.dimssLoading();
-				for (int i = 0; i < models.size(); i++)
-					models.get(i).setStatus(1);
+				for (int i = 0; i < models.size(); i++) {
+					if (models.get(i).getStatus() == 0) {
+						models.get(i).setStatus(1);
+					}
+				}
 				if (modelIntent != null) {
 					modelIntent.setStatus(0);
 					models.add(modelIntent);
@@ -466,20 +472,23 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 	/**
 	 * 更新外勤计划状态
 	 *
-	 * @param id     外勤id
-	 * @param isDone 是否已完成，否则未签退
+	 * @param mission 外勤id
+	 * @param isDone  是否已完成，否则未签退
 	 */
-	public void endMission(int id, boolean isDone) {
-		if (id == 0) return;
+	public void endMission(MissionModel mission, boolean isDone) {
+		if (mission == null) return;
 		boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
 		Map<String, Object> param = new HashMap<>();
-		param.put("id", id);
+		param.put("id", mission.getId());
 		String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().updateOutplanStatus : "mobile/mobileplanUpdate.action";
 		if (isB2b)
 			param.put("statuscode", isDone ? "done" : "CHECKOUT");
+		Bundle bundle = new Bundle();
+		bundle.putParcelable("data", mission);
 		Request request = new Request.Bulider()
 				.setWhat(END_MISSION)
 				.setUrl(url)
+				.setBundle(bundle)
 				.setParam(param)
 				.setMode(Request.Mode.POST)
 				.bulid();
@@ -551,15 +560,16 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 						}
 						break;
 					case SIGNIN_MISSION:
-						if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
+						if (JSONUtil.getBoolean(message, "success")) {
 							//成功  更新数据库
 							if (bundle != null) {
 								MissionModel mission = bundle.getParcelable("data");
-								if (mission == null) {
+								if (mission != null) {
 									if (mission.getStatus() == 2) {//签退
 										iMission.showToast("手动签退成功", R.color.load_error);
-										endMission(mission.getId(), false);
+										endMission(mission, false);
 									} else {
+										iMission.showToast("手动签到成功", R.color.load_error);
 										loadMissionPlan();
 									}
 								}
@@ -567,6 +577,13 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 						}
 						break;
 					case END_MISSION:
+						if (bundle != null) {
+							MissionModel mission = bundle.getParcelable("data");
+							if (mission != null) {
+								mission.setStatus(2);
+								MissionDao.getInstance().updata(mission);
+							}
+						}
 						loadMissionPlan();
 						break;
 					case FIND_LIKER:
@@ -584,7 +601,6 @@ public class MissionPresenter implements IMissionPresenter, OnHttpResultListener
 								}
 							}
 						}
-
 						break;
 				}
 			}

app_modular/appworks/src/main/java/com/uas/appworks/dao/MissionDao.java

@@ -198,6 +198,7 @@ public class MissionDao {
             if (StringUtil.isEmpty(master) || StringUtil.isEmpty(emcode)) return false;
             db = DatabaseManager.getInstance().openDatabase();
             db.beginTransaction();//开启事务
+            
             ContentValues values = null;
             for (MissionModel mission : entities) {
                 show("MissionPlanEntity");