Client：优化注释，全中文；Query改为Request

TommyLemon · TommyLemon · commit 6c0e571fa4ef · 2017-03-12T15:21:30.000+08:00
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/AndroidManifest.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/AndroidManifest.xml
@@ -28,8 +28,8 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="apijson.demo.ui.QueryActivity"
-            android:label="@string/query" >
+            android:name="apijson.demo.ui.RequestActivity"
+            android:label="@string/request" >
         </activity>
     </application>
 
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/gen/apijson/demo/R.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/gen/apijson/demo/R.java
@@ -20,7 +20,7 @@ public static final class drawable {
         public static final int ic_launcher=0x7f020000;
     }
     public static final class id {
-        public static final int btnQueryQuery=0x7f070003;
+        public static final int btnRequestRequest=0x7f070003;
         public static final int btnSelectAccessError=0x7f07000c;
         public static final int btnSelectAccessPermitted=0x7f07000d;
         public static final int btnSelectArray=0x7f07000a;
@@ -32,12 +32,12 @@ public static final class id {
         public static final int btnSelectRely=0x7f070009;
         public static final int btnSelectSingle=0x7f070007;
         public static final int btnSelectUpdateLog=0x7f07000e;
-        public static final int etQueryUrl=0x7f070002;
-        public static final int pbQuery=0x7f070001;
-        public static final int tvQueryResult=0x7f070000;
+        public static final int etRequestUrl=0x7f070002;
+        public static final int pbRequest=0x7f070001;
+        public static final int tvRequestResult=0x7f070000;
     }
     public static final class layout {
-        public static final int query_activity=0x7f030000;
+        public static final int request_activity=0x7f030000;
         public static final int select_activity=0x7f030001;
     }
     public static final class string {
@@ -55,10 +55,10 @@ public static final class string {
         public static final int get=0x7f050006;
         public static final int post=0x7f050003;
         public static final int put=0x7f050005;
-        public static final int query=0x7f050002;
-        public static final int query_error=0x7f050011;
         public static final int received_result=0x7f05000f;
         public static final int rely=0x7f050009;
+        public static final int request=0x7f050002;
+        public static final int request_error=0x7f050011;
         public static final int single=0x7f050007;
         public static final int update_log=0x7f05000e;
     }
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/layout/request_activity.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/layout/request_activity.xml
@@ -12,7 +12,7 @@
             android:orientation="vertical" >
 
             <TextView
-                android:id="@+id/tvQueryResult"
+                android:id="@+id/tvRequestResult"
                 style="@style/select_json"
                 android:hint="result"
                 android:padding="@dimen/activity_horizontal_margin"
@@ -27,12 +27,12 @@
         android:orientation="horizontal" >
 
         <ProgressBar
-            android:id="@+id/pbQuery"
+            android:id="@+id/pbRequest"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
 
         <EditText
-            android:id="@+id/etQueryUrl"
+            android:id="@+id/etRequestUrl"
             style="@style/select_name"
             android:layout_height="match_parent"
             android:layout_gravity="bottom"
@@ -42,10 +42,10 @@
             android:text="uri" />
 
         <Button
-            android:id="@+id/btnQueryQuery"
+            android:id="@+id/btnRequestRequest"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:text="Query" />
+            android:text="Request" />
     </LinearLayout>
 
 </LinearLayout>
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values-en/strings.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values-en/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="query">Query</string>
+    <string name="request">Request</string>
     <string name="post">POST</string>
     <string name="delete">DELETE</string>
     <string name="put">PUT</string>
@@ -16,7 +16,7 @@
     <string name="update_log">Update Log</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="request_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="apijson_slogan">APIJSON,&#160;let&#160;interfaces&#160;go&#160;to&#160;hell!</string>
     <string name="apijson_info">APIJSON&#160;is&#160;a&#160;JSON&#160;Transmission&#160;Structure&#160;Protocol&#8230;</string>
 </resources>
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values/strings.xml b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <string name="app_name">APIJSON</string>
     <string name="app_version">2.0</string>
-    <string name="query">请求</string>
+    <string name="request">请求</string>
     <string name="post">增</string>
     <string name="delete">删</string>
     <string name="put">改</string>
@@ -18,7 +18,8 @@
     <string name="update_log">更新日志</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>
+    <string name="request_error">可能出现了一些问题，可以按照以下步骤解决：\n\n1.检查网络连接\n\n2.检查url是否为一个可用的IPV4地址\n\n3.长按[ %1$s ]按钮用浏览器发送请求\n\n4.查看目标服务器上的log\n\n5.再试一次</string>
     <string name="apijson_slogan">APIJSON,&#160;let&#160;interfaces&#160;go&#160;to&#160;hell!</string>
     <string name="apijson_info">APIJSON&#160;is&#160;a&#160;JSON&#160;Transmission&#160;Structure&#160;Protocol&#8230;</string>
+
 </resources>
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/RequestUtil.java
@@ -26,7 +26,8 @@
 import apijson.demo.model.User;
 import apijson.demo.model.Wallet;
 
-/**create request JSONObjects
+/**请求工具类
+ * 设置encode参数只为方便展示，实际使用时并不需要
  * @author Lemon
  */
 public class RequestUtil {
@@ -54,12 +55,12 @@ public static JSONObject newPostRequest(boolean encode) {
 
 	public static JSONObject newPutRequest(long id, boolean encode) {
 		Moment data = new Moment(id <= 0 ? DEFAULT_MOMENT_ID : id);
-		//		data.setContent(context.getString(R.string.apijson_info));
-				List<Long> list = new ArrayList<>();
-				list.add((long) 10000);
-				list.add((long) 10001);
+		//		data.setContent(context.getString(R.string.apijson_info));//一般可用这种方式，encode是为了展示方便
+		List<Long> list = new ArrayList<>();
+		list.add((long) 10000);
+		list.add((long) 10001);
 		JSONObject momentObject = new JSONObject(data, encode);
-				momentObject.put("praiseUserIdList+", list, encode);//测试 +和- 通过
+		momentObject.put("praiseUserIdList+", list, encode);//测试 +和- 通过
 		momentObject.put("content", context.getString(R.string.apijson_info), encode);//测试 +和- 通过
 		return new JSONRequest(Moment.class.getSimpleName(), momentObject, encode).setTag(Moment.class.getSimpleName());
 	}
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/StringUtil.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/StringUtil.java
@@ -2,7 +2,9 @@
 
 import android.widget.TextView;
 
-
+/**String工具类
+ * @author Lemon
+ */
 public class StringUtil extends zuo.biao.apijson.StringUtil {
 
 	public static String getString(TextView tv) {
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/application/DemoApplication.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/application/DemoApplication.java
@@ -20,7 +20,6 @@
 
 /**Application
  * @author Lemon
- * @see #init
  */
 public class DemoApplication extends Application {
 	private static final String TAG = "DemoApplication";
@@ -34,23 +33,11 @@ public static Application getInstance() {
 	@Override
 	public void onCreate() {
 		super.onCreate();
+		instance = this;
 		Log.d(TAG, "项目启动 >>>>>>>>>>>>>>>>>>>> \n\n");
 		
-		init(this);
 	}
 
-	/**初始化方法
-	 * @param application
-	 * @must 调用init方法且只能调用一次，如果extends BaseApplication会自动调用
-	 */
-	public static void init(Application application) {
-		instance = application;
-		if (instance == null) {
-			Log.e(TAG, "\n\n\n\n\n !!!!!! 调用BaseApplication中的init方法，instance不能为null !!!" +
-					"\n <<<<<< init  instance == null ！！！ >>>>>>>> \n\n\n\n");
-		}
-		
-	}
 
 	/**获取应用名
 	 * @return
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/application/package-info.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/application/package-info.java
@@ -13,7 +13,7 @@
 limitations under the License.*/
 
 /**
- * application package
+ * application所在包
  */
 /**
  * @author Lemon
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/BaseModel.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/BaseModel.java
@@ -16,7 +16,7 @@
 
 import java.io.Serializable;
 
-/**base model for reduce model codes
+/**基础model，继承它可减少部分代码
  * @author Lemon
  * @use extends BaseModel
  */
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/Comment.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/Comment.java
@@ -20,7 +20,6 @@
 public class Comment extends BaseModel {
 	private static final long serialVersionUID = -1011007127735372824L;
 	
-	
 	public Long workId;
 	public Long parentId;
 	public Long userId;
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/Wallet.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/Wallet.java
@@ -22,9 +22,8 @@
 public class Wallet extends BaseModel {
 	private static final long serialVersionUID = 4298571449155754300L;
 	
-	public BigDecimal balance;
-	
 	public Long userId;
+	public BigDecimal balance;
 	
 	/**默认构造方法，JSON等解析时必须要有
 	 */
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/package-info.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/model/package-info.java
@@ -12,11 +12,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.*/
 
-/**
- * the names of classes equal the names of tables in Server database one by one, so do the variables and columns
- * (name) : model <=> table
- * (name, type) : variable <=> column
- * @warn don't use any base type like int or char in models, use Integer and String instead
+/**model类所在包
+ * model对应服务器数据库里table，用于封装请求和解析结果
+ * 类名称 : model == table
+ * 变量(名称, 类型) : variable == column
+ * @warn 在model内不用对变量使用int,boolean,char等基本类型, 用Integer,Boolean,String等对应的对象类型替代
  */
 /**
  * @author Lemon
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/package-info.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/package-info.java
@@ -13,7 +13,7 @@
 limitations under the License.*/
 
 /**
- * manager or util files package, you can put them to different packages if they are too many to scan
+ * 管理类或工具类所在包，如果类很多的话可以把它们单独分到一个或多个包
  */
 /**
  * @author Lemon
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/RequestActivity.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/RequestActivity.java
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/SelectActivity.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/SelectActivity.java
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/package-info.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONDemoApp/src/apijson/demo/ui/package-info.java
