14:17

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

@@ -51,11 +51,13 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 	private int position;
 	private BRestAdapter mAdapter;
 	private String companyid;
+	private String id;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_brest);
+		getSupportActionBar().setTitle(getString(R.string.updata));
 		initView();
 		initData();
 	}
@@ -64,19 +66,19 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 		Intent intent = getIntent();
 		if (intent != null) {
 			String data = intent.getStringExtra("updateData");
-			type = intent.getIntExtra("type", 0);
+			type = intent.getIntExtra("type", -1);
 			if (!StringUtil.isEmpty(data) && JSONUtil.validateJSONObject(data)) {
 				JSONObject object = JSON.parseObject(data);
 				companyid = JSONUtil.getText(object, "sf_companyid", "sc_companyid");
 				String companyname = JSONUtil.getText(object, "sf_companyname", "sc_companyname");
 				String date = JSONUtil.getText(object, "sf_date", "sc_date");
-				String _id = JSONUtil.getText(object, "sf_id", "sc_id");
-				String userid = JSONUtil.getText(object, "sf_userid");
-				String username = JSONUtil.getText(object, "sf_username");
+				id = JSONUtil.getText(object, "sf_id", "sc_id");
+				String userid = JSONUtil.getText(object, "sf_userid","sc_userid");
+				String username = JSONUtil.getText(object, "sf_username","sc_username");
 				BRest model = new BRest(type);
 				model.setCompanyname(companyname);
 				model.setCompanyid(companyid);
-				model.set_id(_id);
+				model.set_id(id);
 				model.setUserId(userid);
 				model.setUsername(username);
 				long time = DateFormatUtil.str2Long(date, DateFormatUtil.YMD_HMS);
@@ -104,16 +106,18 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 				String json = bean.getJson();
 				if (JSONUtil.validateJSONObject(json)) {
 					JSONObject object = JSON.parseObject(json);
+					LogUtil.prinlnLongMsg("fanglh1",JSON.toJSONString(object));
 					if (object != null) {
 						BRest model = new BRest(type);
 						model.setCompanyid(JSONUtil.getText(object, "sm_companyid"));
 						model.setCompanyname(JSONUtil.getText(object, "sm_companyname"));
 						model.setUserId(JSONUtil.getText(object, "sm_userid"));
 						model.setUsername(JSONUtil.getText(object, "sm_username"));
-						model.set_id(JSONUtil.getText(object, "sm_id"));
+						model.set_id(id);
 						if (mAdapter != null) {
 							mAdapter.updateData(position, model);
 						}
+						LogUtil.prinlnLongMsg("fanglh2",JSON.toJSONString(model));
 					}
 				}
 			}
@@ -152,7 +156,7 @@ public class BRestActivity extends BaseActivity implements BRestAdapter.OnItemCl
 		Intent intent = getIntent();
 		String updateData = intent.getStringExtra("updateData");
 		if (StringUtil.isEmpty(updateData)) return;
-		type = intent.getIntExtra("type", 0);
+		type = intent.getIntExtra("type", -1);
 		String keyfield = null;
 		String tablename = null;
 		String id = null;

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

@@ -526,6 +526,7 @@ public class PersonSettingActivity extends BaseActivity implements View.OnClickL
 
         String modeid2 = "fd4ac30e-b176-4410-ac0e-e39c8b71dfe0";
 
+        if (!StringUtil.isEmpty(sm_id)) return; //更新时不发短信
         sendMessages(modeid1,name,phone);
         sendMessages(modeid2,name,phone);
     }