Commit e1b6657
committed
Android: APIJSONTest解决不保存Auto界面修改后的request，优化默认id
1 parent 5a92a03 commit e1b6657
3 files changed
Lines changed: 24 additions & 22 deletions
File tree
- APIJSON-Android/APIJSONTest/app/src/main/java/apijson/demo
- ui
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -37,8 +37,8 @@ public class RequestUtil { | |||
| 37 | 37 | context = DemoApplication.getInstance(); | |
| 38 | 38 | } | |
| 39 | 39 | ||
| 40 | - private static final long DEFAULT_MOMENT_ID = 15; | ||
| 41 | - private static final long DEFAULT_USER_ID = 82001; | ||
| 40 | + public static final long DEFAULT_MOMENT_ID = 15; | ||
| 41 | + public static final long DEFAULT_USER_ID = 82001; | ||
| 42 | 42 | ||
| 43 | 43 | public static boolean isLogMethod(String method) { | |
| 44 | 44 | return "login".equals(method) || "logout".equals(method); | |
Lines changed: 20 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | 15 | package apijson.demo.ui; | |
| 16 | 16 | ||
| 17 | - import zuo.biao.apijson.JSON; | ||
| 18 | 17 | import android.annotation.SuppressLint; | |
| 19 | 18 | import android.app.Activity; | |
| 20 | 19 | import android.content.Context; | |
@@ -26,8 +25,11 @@ | |||
| 26 | 25 | import android.view.Window; | |
| 27 | 26 | import android.widget.TextView; | |
| 28 | 27 | import android.widget.Toast; | |
| 28 | + | ||
| 29 | 29 | import apijson.demo.R; | |
| 30 | + import apijson.demo.RequestUtil; | ||
| 30 | 31 | import apijson.demo.StringUtil; | |
| 32 | + import zuo.biao.apijson.JSON; | ||
| 31 | 33 | ||
| 32 | 34 | /**自动生成代码 | |
| 33 | 35 | * @author Lemon | |
@@ -37,8 +39,6 @@ public class AutoActivity extends Activity { | |||
| 37 | 39 | ||
| 38 | 40 | public static final String KEY_REQUEST = "KEY_REQUEST"; | |
| 39 | 41 | ||
| 40 | - public static final String RESULT_REQUEST = "RESULT_REQUEST"; | ||
| 41 | - | ||
| 42 | 42 | /** | |
| 43 | 43 | * @param context | |
| 44 | 44 | * @return | |
@@ -51,7 +51,7 @@ public static Intent createIntent(Context context) { | |||
| 51 | 51 | private Activity context; | |
| 52 | 52 | ||
| 53 | 53 | private long id; | |
| 54 | - private String url; | ||
| 54 | + private String url; | ||
| 55 | 55 | private String request; | |
| 56 | 56 | ||
| 57 | 57 | private TextView tvAutoRequest; | |
@@ -66,12 +66,12 @@ protected void onCreate(Bundle savedInstanceState) { | |||
| 66 | 66 | ||
| 67 | 67 | //读取保存的配置 | |
| 68 | 68 | SharedPreferences sp = getSharedPreferences(SelectActivity.CONFIG_PATH, Context.MODE_PRIVATE); | |
| 69 | - id = sp.getLong(SelectActivity.KEY_ID, id); | ||
| 69 | + id = sp.getLong(SelectActivity.KEY_ID, RequestUtil.DEFAULT_MOMENT_ID); | ||
| 70 | 70 | url = sp.getString(SelectActivity.KEY_URL, null); | |
| 71 | 71 | request = sp.getString(KEY_REQUEST, null); | |
| 72 | - | ||
| 72 | + | ||
| 73 | 73 | if (StringUtil.isEmpty(request, true)) { | |
| 74 | - request = "{\"Moment\":{\"id\":551},\"[]\":{\"count\":3,\"page\":1,\"Comment\":{\"momentId@\":\"Moment/id\",\"@column\":\"id,userId,content\"}}}"; | ||
| 74 | + request = "{\"Moment\":{\"id\":" + id + "},\"[]\":{\"count\":3,\"page\":0,\"Comment\":{\"momentId@\":\"Moment/id\",\"@column\":\"id,userId,content\"}}}"; | ||
| 75 | 75 | } | |
| 76 | 76 | ||
| 77 | 77 | ||
@@ -87,11 +87,11 @@ protected void onCreate(Bundle savedInstanceState) { | |||
| 87 | 87 | ||
| 88 | 88 | ||
| 89 | 89 | public void copy(View v) { | |
| 90 | - StringUtil.copyText(context, StringUtil.getString(tvAutoResponse)); | ||
| 90 | + StringUtil.copyText(context, StringUtil.getString(tvAutoResponse)); | ||
| 91 | 91 | } | |
| 92 | 92 | ||
| 93 | 93 | public void auto(View v) { | |
| 94 | - auto(StringUtil.getString(tvAutoRequest)); | ||
| 94 | + auto(StringUtil.getString(tvAutoRequest)); | ||
| 95 | 95 | } | |
| 96 | 96 | ||
| 97 | 97 | public void get(View v) { | |
@@ -135,11 +135,13 @@ public void request(String method) { | |||
| 135 | 135 | } | |
| 136 | 136 | ||
| 137 | 137 | ||
| 138 | - | ||
| 138 | + | ||
| 139 | 139 | ||
| 140 | 140 | ||
| 141 | 141 | ||
| 142 | 142 | private static final int REQUEST_TO_REQUEST = 1; | |
| 143 | + | ||
| 144 | + private Intent result; | ||
| 143 | 145 | @Override | |
| 144 | 146 | protected void onActivityResult(int requestCode, int resultCode, Intent data) { | |
| 145 | 147 | super.onActivityResult(requestCode, resultCode, data); | |
@@ -151,9 +153,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { | |||
| 151 | 153 | if (data == null) { | |
| 152 | 154 | Toast.makeText(context, "onActivityResult data == null !!!", Toast.LENGTH_SHORT).show(); | |
| 153 | 155 | } else { | |
| 154 | - id = data.getLongExtra(RequestActivity.RESULT_ID, id); | ||
| 156 | + result = data; | ||
| 157 | + | ||
| 158 | + id = data.getLongExtra(RequestActivity.RESULT_ID, RequestUtil.DEFAULT_MOMENT_ID); | ||
| 155 | 159 | url = data.getStringExtra(RequestActivity.RESULT_URL); | |
| 156 | - | ||
| 160 | + | ||
| 157 | 161 | tvAutoResponse.setText(StringUtil.getString(JSON.format( | |
| 158 | 162 | data.getStringExtra(RequestActivity.RESULT_RESPONSE)))); | |
| 159 | 163 | } | |
@@ -168,10 +172,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { | |||
| 168 | 172 | public void finish() { | |
| 169 | 173 | //保存配置 | |
| 170 | 174 | getSharedPreferences(SelectActivity.CONFIG_PATH, Context.MODE_PRIVATE) | |
| 171 | - .edit() | ||
| 172 | - .remove(KEY_REQUEST) | ||
| 173 | - .putString(KEY_REQUEST, StringUtil.getTrimedString(tvAutoRequest)) | ||
| 174 | - .commit(); | ||
| 175 | + .edit() | ||
| 176 | + .remove(KEY_REQUEST) | ||
| 177 | + .putString(KEY_REQUEST, StringUtil.getTrimedString(tvAutoRequest)) | ||
| 178 | + .commit(); | ||
| 175 | 179 | ||
| 176 | 180 | //需要在SelectActivity实时更新 | |
| 177 | 181 | setResult(RESULT_OK, new Intent(). | |
Lines changed: 2 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -131,10 +131,8 @@ public void toUpdateLog(View v) { | |||
| 131 | 131 | /** | |
| 132 | 132 | */ | |
| 133 | 133 | public void setRequest() { | |
| 134 | - if (RequestUtil.isLogMethod(method)) { | ||
| 135 | - tvSelectLogin.setText(StringUtil.isEmpty(name, true) | ||
| 136 | - ? getString(R.string.login) : name + getString(R.string.logout)); | ||
| 137 | - } | ||
| 134 | + tvSelectLogin.setText(StringUtil.isEmpty(name, true) | ||
| 135 | + ? getString(R.string.login) : name + getString(R.string.logout)); | ||
| 138 | 136 | ||
| 139 | 137 | for (int i = 0; i < buttons.length; i++) { | |
| 140 | 138 | buttons[i].setText(JSON.format(getRequest(buttons[i]))); | |
0 commit comments