Skip to content

Commit e1b6657

Browse files
TommyLemonTommyLemon
committed
Android: APIJSONTest解决不保存Auto界面修改后的request，优化默认id
1 parent 5a92a03 commit e1b6657

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public class RequestUtil {
3737
context = DemoApplication.getInstance();
3838
}
3939

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;
4242

4343
public static boolean isLogMethod(String method) {
4444
return "login".equals(method) || "logout".equals(method);

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
package apijson.demo.ui;
1616

17-
import zuo.biao.apijson.JSON;
1817
import android.annotation.SuppressLint;
1918
import android.app.Activity;
2019
import android.content.Context;
@@ -26,8 +25,11 @@
2625
import android.view.Window;
2726
import android.widget.TextView;
2827
import android.widget.Toast;
28+
2929
import apijson.demo.R;
30+
import apijson.demo.RequestUtil;
3031
import apijson.demo.StringUtil;
32+
import zuo.biao.apijson.JSON;
3133

3234
/**自动生成代码
3335
* @author Lemon
@@ -37,8 +39,6 @@ public class AutoActivity extends Activity {
3739

3840
public static final String KEY_REQUEST = "KEY_REQUEST";
3941

40-
public static final String RESULT_REQUEST = "RESULT_REQUEST";
41-
4242
/**
4343
* @param context
4444
* @return
@@ -51,7 +51,7 @@ public static Intent createIntent(Context context) {
5151
private Activity context;
5252

5353
private long id;
54-
private String url;
54+
private String url;
5555
private String request;
5656

5757
private TextView tvAutoRequest;
@@ -66,12 +66,12 @@ protected void onCreate(Bundle savedInstanceState) {
6666

6767
//读取保存的配置
6868
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);
7070
url = sp.getString(SelectActivity.KEY_URL, null);
7171
request = sp.getString(KEY_REQUEST, null);
72-
72+
7373
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\"}}}";
7575
}
7676

7777

@@ -87,11 +87,11 @@ protected void onCreate(Bundle savedInstanceState) {
8787

8888

8989
public void copy(View v) {
90-
StringUtil.copyText(context, StringUtil.getString(tvAutoResponse));
90+
StringUtil.copyText(context, StringUtil.getString(tvAutoResponse));
9191
}
9292

9393
public void auto(View v) {
94-
auto(StringUtil.getString(tvAutoRequest));
94+
auto(StringUtil.getString(tvAutoRequest));
9595
}
9696

9797
public void get(View v) {
@@ -135,11 +135,13 @@ public void request(String method) {
135135
}
136136

137137

138-
138+
139139

140140

141141

142142
private static final int REQUEST_TO_REQUEST = 1;
143+
144+
private Intent result;
143145
@Override
144146
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
145147
super.onActivityResult(requestCode, resultCode, data);
@@ -151,9 +153,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
151153
if (data == null) {
152154
Toast.makeText(context, "onActivityResult data == null !!!", Toast.LENGTH_SHORT).show();
153155
} else {
154-
id = data.getLongExtra(RequestActivity.RESULT_ID, id);
156+
result = data;
157+
158+
id = data.getLongExtra(RequestActivity.RESULT_ID, RequestUtil.DEFAULT_MOMENT_ID);
155159
url = data.getStringExtra(RequestActivity.RESULT_URL);
156-
160+
157161
tvAutoResponse.setText(StringUtil.getString(JSON.format(
158162
data.getStringExtra(RequestActivity.RESULT_RESPONSE))));
159163
}
@@ -168,10 +172,10 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
168172
public void finish() {
169173
//保存配置
170174
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();
175179

176180
//需要在SelectActivity实时更新
177181
setResult(RESULT_OK, new Intent().

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,8 @@ public void toUpdateLog(View v) {
131131
/**
132132
*/
133133
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));
138136

139137
for (int i = 0; i < buttons.length; i++) {
140138
buttons[i].setText(JSON.format(getRequest(buttons[i])));

0 commit comments

Comments
 (0)