Skip to content

Commit 629d95b

Browse files
TommyLemonTommyLemon
committed
Client：同步adt版至studio版
1 parent 3c4b1e7 commit 629d95b

File tree

6 files changed

+56
-43
lines changed

6 files changed

+56
-43
lines changed

‎APIJSON(Android)/APIJSON(AndroidStudio)/.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/ui/SelectActivity.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
package apijson.demo.ui;
1616

17+
import zuo.biao.apijson.StringUtil;
1718
import android.app.Activity;
18-
import android.content.Context;
1919
import android.content.Intent;
20+
import android.net.Uri;
2021
import android.os.Bundle;
2122
import android.view.View;
2223
import android.widget.Toast;
@@ -29,10 +30,6 @@ public class SelectActivity extends Activity {
2930

3031
public static final String RESULT_JSON = "RESULT_JSON";
3132

32-
public static Intent createIntent(Context context) {
33-
return new Intent(context, SelectActivity.class);
34-
}
35-
3633

3734
private Activity context;
3835
@Override
@@ -43,6 +40,8 @@ protected void onCreate(Bundle savedInstanceState) {
4340
context = this;
4441
}
4542

43+
44+
4645
//click event,called form layout android:onClick <<<<<<<<<<<<<<<<
4746
public void selectPost(View v) {
4847
select(QueryActivity.TYPE_POST);
@@ -85,6 +84,12 @@ public void selectAccessPermitted(View v) {
8584
select(QueryActivity.TYPE_ACCESS_PERMITTED);
8685
}
8786
//get >>>>>>>>>>>>>>>>>>>>>>>>>>>
87+
88+
89+
public void toUpdateLog(View v) {
90+
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(
91+
StringUtil.getCorrectUrl("github.com/TommyLemon/Android-ZBLibrary/commits/master"))));
92+
}
8893

8994
//click event,called form layout android:onClick >>>>>>>>>>>>>>>>
9095

@@ -93,6 +98,8 @@ private void select(int type) {
9398
startActivityForResult(QueryActivity.createIntent(context, type, url), REQUEST_TO_QUERY);
9499
}
95100

101+
102+
96103
private static final int REQUEST_TO_QUERY = 1;
97104
@Override
98105
protected void onActivityResult(int requestCode, int resultCode, Intent data) {

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@
104104
style="@style/select_json"
105105
android:onClick="selectAccessPermitted"
106106
android:text="@string/demo_wallet_with_access" />
107+
108+
<Button
109+
style="@style/match_wrap"
110+
android:layout_marginTop="30dp"
111+
android:onClick="toUpdateLog"
112+
android:text="@string/update_log" />
107113
</LinearLayout>
108114
</ScrollView>
109115

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<string name="query">Query</string>
5+
<string name="post">POST</string>
6+
<string name="delete">DELETE</string>
7+
<string name="put">PUT</string>
8+
<string name="get">GET</string>
9+
<string name="single">Single</string>
10+
<string name="columns">Columns</string>
11+
<string name="rely">Rely</string>
12+
<string name="array">Array</string>
13+
<string name="complex">Complex</string>
14+
<string name="access_error">Access Error</string>
15+
<string name="access_permitted">Access Permitted</string>
16+
<string name="update_log">Update Log</string>
17+
<string name="received_result">received result!</string>
18+
<string name="browser_can_only_receive_get_response">Browsers can only receive GET responses</string>
19+
<string name="query_error">There may be something wrong,you can follow by the steps:\n\n1.Check your net connection\n\n2.Check the url whether it\'s an available ipv4 address\n\n3.Long click the [ %1$s ] button to open the request by web browser\n\n4.Check logs outputed on the target server\n\n5.Try again</string>
20+
21+
</resources>

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@
33

44
<string name="app_name">APIJSON</string>
55
<string name="app_version">1.0</string>
6-
<string name="query">Query</string>
7-
<string name="post">POST</string>
8-
<string name="delete">DELETE</string>
9-
<string name="put">PUT</string>
10-
<string name="get">GET</string>
11-
<string name="single">Single</string>
12-
<string name="columns">Columns</string>
13-
<string name="rely">Rely</string>
14-
<string name="array">Array</string>
15-
<string name="complex">Complex</string>
16-
<string name="access_error">Access Error</string>
17-
<string name="access_permitted">Access Permitted</string>
18-
<string name="received_result">received result!</string>
19-
<string name="browser_can_only_receive_get_response">Browsers can only receive GET responses</string>
20-
<string name="query_error">There may be something wrong,you can follow by the steps:\n\n1.Check your net connection\n\n2.Check the url whether it\'s an available ipv4 address\n\n3.Long click the [ %1$s ] button to open the request by web browser\n\n4.Check logs outputed on the target server\n\n5.Try again</string>
216
<string name="demo_post">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"name\":\"Tommy\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"sex\":0,\n&#160;&#160;&#160;&#160;&#160;&#160;\"phone\":\"1234567890\"\n&#160;&#160;&#160;}\n}</string>
227
<string name="demo_delete">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":10000\n&#160;&#160;&#160;}\n}</string>
238
<string name="demo_put">{\n&#160;&#160;&#160;\"tag\":\"User\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":38710,\n&#160;&#160;&#160;&#160;&#160;&#160;\"name\":\"Lemon\",\n&#160;&#160;&#160;&#160;&#160;&#160;\"picture\":\"[\"http://static.oschina.net/uploads/user/1218/2437072_100.jpg?t=1461076033000\", \"http://common.cnblogs.com/images/icon_weibo_24.png\", \"http://static.oschina.net/uploads/user/585/1170143_50.jpg?t=1390226446000\"]\"\n&#160;&#160;&#160;}\n}</string>
@@ -29,5 +14,21 @@
2914
<string name="demo_wallet">{\n&#160;&#160;&#160;\"Wallet\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"userId\":38710\n&#160;&#160;&#160;}\n}</string>
3015
<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>
3116
<string name="demo_complex_post">{\n&#160;&#160;&#160;\"tag\":"add_work",\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>
17+
<string name="query">请求</string>
18+
<string name="post">增</string>
19+
<string name="delete">删</string>
20+
<string name="put">改</string>
21+
<string name="get">查</string>
22+
<string name="single">单个Object</string>
23+
<string name="columns">指定字段</string>
24+
<string name="rely">向上依赖</string>
25+
<string name="array">Object数组</string>
26+
<string name="complex">复杂结构</string>
27+
<string name="access_error">没有访问权限</string>
28+
<string name="access_permitted">允许使用权限</string>
29+
<string name="update_log">更新日志</string>
30+
<string name="received_result">已获得结果！</string>
31+
<string name="browser_can_only_receive_get_response">用浏览器只能获取GET结果</string>
32+
<string name="query_error">可能出现了一些问题，可以按照以下步骤解决：\n\n1.检查网络连接\n\n2.检查url是否为一个可用的IPV4地址\n\n3.长按[ %1$s ]按钮用浏览器发送请求\n\n4.查看目标服务器上的log\n\n5.再试一次</string>
3233

3334
</resources>

0 commit comments

Comments
 (0)