同步adt版至studio版

TommyLemon · TommyLemon · commit fe0029b8428d · 2017-01-22T13:35:05.000+08:00
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/ui/QueryActivity.java b/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/java/apijson/demo/ui/QueryActivity.java
@@ -166,6 +166,9 @@ private void query() {
 	/**open request URL String with a browser
 	 */
 	public void openWebSite() {
+		if (type < 10) {
+			Toast.makeText(context, R.string.browser_can_only_receive_get_response, Toast.LENGTH_LONG).show();
+		}
 		setRequest();
 		String webSite = null;
 		try {
@@ -276,7 +279,7 @@ public void onHttpResponse(int requestCode, final String resultJson, final Excep
 			public void run() {
 				if (isAlive) {
 					pbQuery.setVisibility(View.GONE);
-					Toast.makeText(context, "received result!", Toast.LENGTH_SHORT).show();
+					Toast.makeText(context, R.string.received_result, Toast.LENGTH_SHORT).show();
 
 					tvQueryResult.setText(e == null || JSON.isJsonCorrect(resultJson)
 							? StringUtil.getTrimedString(resultJson) : e.getMessage() + "\n\n\n" + error);
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/values-zh/strings.xml b/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/values-zh/strings.xml
@@ -15,6 +15,8 @@
     <string name="complex">复杂结构</string>
     <string name="access_error">没有访问权限</string>
     <string name="access_permitted">允许使用权限</string>
+    <string name="received_result">已获得结果！</string>
+    <string name="browser_can_only_receive_get_response">用浏览器只能获取GET结果</string>
     <string name="query_error">可能出现了一些问题，可以按照以下步骤解决：\n\n1.检查网络连接\n\n2.检查url是否为一个可用的IPV4地址\n\n3.长按[ %1$s ]按钮用浏览器发送请求\n\n4.查看目标服务器上的log\n\n5.再试一次</string>
 
 </resources>
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/values/strings.xml b/APIJSON(Android)/APIJSON(AndroidStudio)/app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
     <string name="complex">Complex</string>
     <string name="access_error">Access Error</string>
     <string name="access_permitted">Access Permitted</string>
+    <string name="received_result">received result!</string>
+    <string name="browser_can_only_receive_get_response">Browsers can only receive GET responses</string>
     <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>
     <string name="demo_post">{\n&#160;&#160;&#160;\"tag\":\"post_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>
     <string name="demo_delete">{\n&#160;&#160;&#160;\"tag\":\"delete_user\",\n&#160;&#160;&#160;\"User\":{\n&#160;&#160;&#160;&#160;&#160;&#160;\"id\":93794\n&#160;&#160;&#160;}\n}</string>
