Skip to content

Commit 4b0cd78

Browse files
committed
同步adt版至studio版
1 parent 339444e commit 4b0cd78

6 files changed

Lines changed: 86 additions & 1 deletion

File tree

APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/zuo/biao/apijson/client/RequestUtil.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import zuo.biao.apijson.client.model.Comment;
1818
import zuo.biao.apijson.client.model.User;
19+
import zuo.biao.apijson.client.model.Wallet;
1920
import zuo.biao.apijson.client.model.Work;
2021

2122
/**create request JSONObjects
@@ -50,4 +51,16 @@ public static JSONObject newComplexRequest() {
5051
return request.toArray(2, 1);
5152
}
5253

54+
public static JSONObject newAccessErrorRequest() {
55+
return new JSONRequest(new Wallet((long) 38710));
56+
}
57+
58+
public static JSONObject newAccessPermittedRequest() {
59+
JSONRequest request = new JSONRequest();
60+
request.put(new Wallet().setUserId((long) 38710));
61+
request.put("currentUserId", 38710);
62+
request.put("payPassword", "123456");
63+
return request;
64+
}
65+
5366
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package zuo.biao.apijson.client.model;
2+
3+
public class Wallet extends BaseModel {
4+
private static final long serialVersionUID = 4298571449155754300L;
5+
6+
public Double balance;
7+
8+
public Long userId;
9+
10+
/**默认构造方法,JSON等解析时必须要有
11+
*/
12+
public Wallet() {
13+
super();
14+
}
15+
public Wallet(Long id) {
16+
this();
17+
this.id = id;
18+
}
19+
20+
public Wallet setUserId(Long userId) {
21+
this.userId = userId;
22+
return this;
23+
}
24+
public Long getUserId() {
25+
return userId;
26+
}
27+
28+
public Double getBalance() {
29+
return balance;
30+
}
31+
public void setBalance(Double balance) {
32+
this.balance = balance;
33+
}
34+
35+
}

APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/zuo/biao/apijson/client/ui/QueryActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ public static Intent createIntent(Context context, int type, String url) {
7575
public static final int TYPE_RELY = 1;
7676
public static final int TYPE_ARRAY = 2;
7777
public static final int TYPE_COMPLEX = 3;
78+
public static final int TYPE_ACCESS_ERROR = 4;
79+
public static final int TYPE_ACCESS_PERMITTED = 5;
7880

7981

8082
private int type = TYPE_SINGLE;
@@ -147,6 +149,12 @@ public void setRequest() {
147149
case TYPE_ARRAY:
148150
request = JSON.toJSONString(RequestUtil.newArrayRequest());
149151
break;
152+
case TYPE_ACCESS_ERROR:
153+
request = JSON.toJSONString(RequestUtil.newAccessErrorRequest());
154+
break;
155+
case TYPE_ACCESS_PERMITTED:
156+
request = JSON.toJSONString(RequestUtil.newAccessPermittedRequest());
157+
break;
150158
default:
151159
request = JSON.toJSONString(RequestUtil.newComplexRequest());
152160
break;

APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/zuo/biao/apijson/client/ui/SelectActivity.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414

1515
package zuo.biao.apijson.client.ui;
1616

17-
import zuo.biao.apijson.client.R;
1817
import android.app.Activity;
1918
import android.content.Context;
2019
import android.content.Intent;
2120
import android.os.Bundle;
2221
import android.view.View;
2322
import android.widget.Toast;
2423

24+
import zuo.biao.apijson.client.R;
25+
2526
/**activity for selecting a request
2627
* @author Lemon
2728
*/
@@ -59,6 +60,14 @@ public void selectArray(View v) {
5960
public void selectComplex(View v) {
6061
select(QueryActivity.TYPE_COMPLEX);
6162
}
63+
64+
public void selectAccessError(View v) {
65+
select(QueryActivity.TYPE_ACCESS_ERROR);
66+
}
67+
68+
public void selectAccessPermitted(View v) {
69+
select(QueryActivity.TYPE_ACCESS_PERMITTED);
70+
}
6271
//click event,called form layout android:onClick >>>>>>>>>>>>>>>>
6372

6473
private String url;

APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/layout/select_activity.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,24 @@
4343
style="@style/select_json"
4444
android:onClick="selectComplex"
4545
android:text="@string/demo_complex" />
46+
47+
<TextView
48+
style="@style/select_name"
49+
android:text="Access Error" />
50+
51+
<Button
52+
style="@style/select_json"
53+
android:onClick="selectAccessError"
54+
android:text="@string/demo_wallet" />
55+
56+
<TextView
57+
style="@style/select_name"
58+
android:text="Access Permitted" />
59+
60+
<Button
61+
style="@style/select_json"
62+
android:onClick="selectAccessPermitted"
63+
android:text="@string/demo_wallet_with_access" />
4664
</LinearLayout>
4765
</ScrollView>
4866

APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
<string name="demo_rely">{\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":70793\n&#160;&#160;&#160;},\n&#160;&#160;&#160;\"Work\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"userId\":\"User/id\"\n&#160;&#160;&#160;}\n}</string>
1111
<string name="demo_array">{\n&#160;&#160;&#160;\"User[]\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"count\":10,\n&#160;&#160;&#160;&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"sex\":0\n&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;}\n}</string>
1212
<string name="demo_complex">{\n&#160;&#160;&#160;\"[]\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"count\":2,\n&#160;&#160;&#160;&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"sex\":0\n&#160;&#160;&#160;&#160;&#160;&#160;},\n&#160;&#160;&#160;&#160;&#160;&#160;\"Work\":{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"userId\":\"/User/id\"\n&#160;&#160;&#160;&#160;&#160;&#160;},\n&#160;&#160;&#160;&#160;&#160;&#160;\"Comment[]\":{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"count\":3,\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"Comment\":{\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;\"workId\":\"[]/Work/id\"\n&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;&#160;&#160;&#160;}\n&#160;&#160;&#160;}\n}</string>
13+
<string name="demo_wallet">{\n&#160;&#160;&#160;\"Wallet\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"userId\":38710\n&#160;&#160;&#160;}\n}</string>
14+
<string name="demo_wallet_with_access">{\n&#160;&#160;&#160;\"Wallet\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"userId\":38710\n&#160;&#160;&#160;},\n&#160;&#160;&#160;\"currentUserId\":38710,\n&#160;&#160;&#160;\"payPassword\":\"123456\"\n}</string>
1315

1416
</resources>

0 commit comments

Comments
 (0)