Android: APIJSONTest解决不保存Auto界面修改后的request，优化默认id

Author: TommyLemon

APIJSON-Android/APIJSONTest/app/src/main/java/apijson/demo/RequestUtil.java

@@ -37,8 +37,8 @@ public class RequestUtil {
 		context = DemoApplication.getInstance();
 	}
 
-	private static final long DEFAULT_MOMENT_ID = 15;
-	private static final long DEFAULT_USER_ID = 82001;
+	public static final long DEFAULT_MOMENT_ID = 15;
+	public static final long DEFAULT_USER_ID = 82001;
 
 	public static boolean isLogMethod(String method) {
 		return "login".equals(method) || "logout".equals(method);

APIJSON-Android/APIJSONTest/app/src/main/java/apijson/demo/ui/AutoActivity.java

@@ -14,7 +14,6 @@
 
 package apijson.demo.ui;
 
-import zuo.biao.apijson.JSON;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -26,8 +25,11 @@
 import android.view.Window;
 import android.widget.TextView;
 import android.widget.Toast;
+
 import apijson.demo.R;
+import apijson.demo.RequestUtil;
 import apijson.demo.StringUtil;
+import zuo.biao.apijson.JSON;
 
 /**自动生成代码
  * @author Lemon
@@ -37,8 +39,6 @@ public class AutoActivity extends Activity {
 
 	public static final String KEY_REQUEST = "KEY_REQUEST";
 
-	public static final String RESULT_REQUEST = "RESULT_REQUEST";
-
 	/**
 	 * @param context
 	 * @return
@@ -51,7 +51,7 @@ public static Intent createIntent(Context context) {
 	private Activity context;
 
 	private long id;
-	private String url; 
+	private String url;
 	private String request;
 
 	private TextView tvAutoRequest;
@@ -66,12 +66,12 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		//读取保存的配置
 		SharedPreferences sp = getSharedPreferences(SelectActivity.CONFIG_PATH, Context.MODE_PRIVATE);
-		id = sp.getLong(SelectActivity.KEY_ID, id);
+		id = sp.getLong(SelectActivity.KEY_ID, RequestUtil.DEFAULT_MOMENT_ID);
 		url = sp.getString(SelectActivity.KEY_URL, null);
 		request = sp.getString(KEY_REQUEST, null);
-		
+
 		if (StringUtil.isEmpty(request, true)) {
-			request = "{\"Moment\":{\"id\":551},\"[]\":{\"count\":3,\"page\":1,\"Comment\":{\"momentId@\":\"Moment/id\",\"@column\":\"id,userId,content\"}}}";
+			request = "{\"Moment\":{\"id\":" + id + "},\"[]\":{\"count\":3,\"page\":0,\"Comment\":{\"momentId@\":\"Moment/id\",\"@column\":\"id,userId,content\"}}}";
 		}
 
 
@@ -87,11 +87,11 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
 	public void copy(View v) {
-		StringUtil.copyText(context, StringUtil.getString(tvAutoResponse));	
+		StringUtil.copyText(context, StringUtil.getString(tvAutoResponse));
 	}
 
 	public void auto(View v) {
-		auto(StringUtil.getString(tvAutoRequest));		
+		auto(StringUtil.getString(tvAutoRequest));
 	}
 
 	public void get(View v) {
@@ -135,11 +135,13 @@ public void request(String method) {
 	}
 
 
-	
+
 
 
 
 	private static final int REQUEST_TO_REQUEST = 1;
+
+	private Intent result;
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
@@ -151,9 +153,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 			if (data == null) {
 				Toast.makeText(context, "onActivityResult  data == null !!!", Toast.LENGTH_SHORT).show();
 			} else {
-				id = data.getLongExtra(RequestActivity.RESULT_ID, id);
+				result = data;
+
+				id = data.getLongExtra(RequestActivity.RESULT_ID, RequestUtil.DEFAULT_MOMENT_ID);
 				url = data.getStringExtra(RequestActivity.RESULT_URL);
-				
+
 				tvAutoResponse.setText(StringUtil.getString(JSON.format(
 						data.getStringExtra(RequestActivity.RESULT_RESPONSE))));
 			}
@@ -168,10 +172,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 	public void finish() {
 		//保存配置
 		getSharedPreferences(SelectActivity.CONFIG_PATH, Context.MODE_PRIVATE)
-		.edit()
-		.remove(KEY_REQUEST)
-		.putString(KEY_REQUEST, StringUtil.getTrimedString(tvAutoRequest))
-		.commit();
+				.edit()
+				.remove(KEY_REQUEST)
+				.putString(KEY_REQUEST, StringUtil.getTrimedString(tvAutoRequest))
+				.commit();
 
 		//需要在SelectActivity实时更新
 		setResult(RESULT_OK, new Intent().

APIJSON-Android/APIJSONTest/app/src/main/java/apijson/demo/ui/SelectActivity.java

@@ -131,10 +131,8 @@ public void toUpdateLog(View v) {
 	/**
 	 */
 	public void setRequest() {
-		if (RequestUtil.isLogMethod(method)) {
-			tvSelectLogin.setText(StringUtil.isEmpty(name, true)
-					? getString(R.string.login) : name + getString(R.string.logout));
-		}
+		tvSelectLogin.setText(StringUtil.isEmpty(name, true)
+				? getString(R.string.login) : name + getString(R.string.logout));
 
 		for (int i = 0; i < buttons.length; i++) {
 			buttons[i].setText(JSON.format(getRequest(buttons[i])));