更新商家和人员休息

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -120,7 +120,7 @@ public class HttpClient {
         public Builder() {
             this.method = Method.GET;
             this.params.put("client","Android Client");
-            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
+//            this.headers.put("Content-Type", "application/x-www-form-urlencoded;charset=UTF-8");
         }
 
         public Builder(String url) {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BRestActivity.java

@@ -80,7 +80,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 				model.setUsername(username);
 				long time = DateFormatUtil.str2Long(date, DateFormatUtil.YMD_HMS);
 				if (time > 0) {
-					model.setDate(DateFormatUtil.long2Str(time, DateFormatUtil.YMD_HMS));
+					model.setDate(DateFormatUtil.long2Str(time, DateFormatUtil.YMD));
 				}
 				List<BRest> models = new ArrayList<>();
 				models.add(model);
@@ -222,7 +222,8 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 						if (JSONUtil.validateJSONObject(o.toString())) {
 							ToastMessage(o.toString());
 							if (JSONUtil.getBoolean(o.toString(), "result")) {
-								//TODO 保存成功
+								setResult(20);
+								finish();
 							}
 						}
 						isSubmit = false;
@@ -252,7 +253,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 			ToastUtil.showToast(ct, "请选择日期");
 			return null;
 		} else {
-			date = model.getDate() + " 00:00:00";
+			date = model.getDate();
 		}
 		if (StringUtil.isEmpty(model.getCompanyname())) {
 			ToastUtil.showToast(ct, "公司名称无效");

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSetComRestListActivity.java

@@ -65,15 +65,15 @@ public class BSetComRestListActivity extends BaseActivity {
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 				switch (type) {
 					case "eomployee":
-						startActivity(new Intent(ct, BRestActivity.class)
+						startActivityForResult(new Intent(ct, BRestActivity.class)
 								.putExtra("updateData", JSON.toJSONString(mListe.getResult().get(position)))
-								.putExtra("type", 1));
+								.putExtra("type", 1), 20);
 						LogUtil.prinlnLongMsg("updateData", JSON.toJSONString(mListe.getResult().get(position)));
 						break;
 					case "company":
-						startActivity(new Intent(ct, BRestActivity.class)
+						startActivityForResult(new Intent(ct, BRestActivity.class)
 								.putExtra("updateData", JSON.toJSONString(mListc.getResult().get(position)))
-								.putExtra("type", 0));
+								.putExtra("type", 0), 20);
 						LogUtil.prinlnLongMsg("updateData", JSON.toJSONString(mListc.getResult().get(position)));
 						break;
 					case "place":
@@ -372,4 +372,13 @@ public class BSetComRestListActivity extends BaseActivity {
 			View line;
 		}
 	}
+
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		if (requestCode == 20 && resultCode == 20) {
+			//TODO 重更新
+			initData();
+		}
+	}
 }