Skip to content

Commit 7fd42c2

Browse files
TommyLemonTommyLemon
committed
Client: studio版: 优化HttpRequest的key命名；解决User内isFriend拼写错误；优化注释；删除Manifest中多余注册
1 parent c3266e3 commit 7fd42c2

27 files changed

+253
-593
lines changed

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -120,49 +120,6 @@
120120
android:screenOrientation="portrait"
121121
android:windowSoftInputMode="stateAlwaysHidden" />
122122

123-
<!-- Demo <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
124-
125-
<activity
126-
android:name="apijson.demo.client.DEMO.DemoMainActivity"
127-
android:screenOrientation="portrait"
128-
android:windowSoftInputMode="stateAlwaysHidden" />
129-
<activity
130-
android:name="apijson.demo.client.DEMO.DemoActivity"
131-
android:screenOrientation="portrait"
132-
android:windowSoftInputMode="stateAlwaysHidden" />
133-
<activity
134-
android:name="apijson.demo.client.DEMO.DemoListActivity"
135-
android:screenOrientation="portrait"
136-
android:windowSoftInputMode="stateAlwaysHidden" />
137-
<activity
138-
android:name="apijson.demo.client.DEMO.DemoFragmentActivity"
139-
android:launchMode="singleTop"
140-
android:screenOrientation="portrait"
141-
android:windowSoftInputMode="stateAlwaysHidden" />
142-
<activity
143-
android:name="apijson.demo.client.DEMO.DemoTabActivity"
144-
android:screenOrientation="portrait"
145-
android:windowSoftInputMode="stateAlwaysHidden" />
146-
<activity
147-
android:name="apijson.demo.client.DEMO.DemoSQLActivity"
148-
android:screenOrientation="portrait"
149-
android:windowSoftInputMode="stateHidden|adjustResize|adjustUnspecified" />
150-
<activity
151-
android:name="apijson.demo.client.DEMO.DemoTimeRefresherActivity"
152-
android:screenOrientation="portrait"
153-
android:windowSoftInputMode="stateHidden|adjustResize|adjustUnspecified" />
154-
<activity
155-
android:name="apijson.demo.client.DEMO.DemoBroadcastReceiverActivity"
156-
android:screenOrientation="portrait"
157-
android:windowSoftInputMode="stateAlwaysHidden" />
158-
<activity
159-
android:name="apijson.demo.client.DEMO.DemoBottomWindow"
160-
android:screenOrientation="portrait"
161-
android:theme="@style/Window"
162-
android:windowSoftInputMode="stateAlwaysHidden" />
163-
164-
<!-- Demo >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
165-
166123

167124
<!-- ZBLibrary <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
168125

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MomentActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,10 @@ public void onDialogButtonClick(int requestCode, boolean isPositive) {
496496
}
497497
}
498498

499-
public static final int HTTP_GET_MOMENT = 1;
500-
private final int HTTP_COMMENT = 2;
501-
private final int HTTP_REPLY = 3;
502-
private final int HTTP_DELETE = 4;
499+
private static final int HTTP_GET_MOMENT = 1;
500+
private static final int HTTP_COMMENT = 2;
501+
private static final int HTTP_REPLY = 3;
502+
private static final int HTTP_DELETE = 4;
503503
@Override
504504
public void onHttpResponse(int requestCode, String resultJson, Exception e) {
505505
JSONResponse response = new JSONResponse(resultJson);

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MomentListFragment.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,6 @@
1414

1515
package apijson.demo.client.activity_fragment;
1616

17-
import java.util.List;
18-
19-
import zuo.biao.apijson.JSON;
20-
import zuo.biao.apijson.JSONRequest;
21-
import zuo.biao.apijson.JSONResponse;
22-
import zuo.biao.apijson.SQL;
23-
import zuo.biao.apijson.StringUtil;
24-
import zuo.biao.library.base.BaseView.OnDataChangedListener;
25-
import zuo.biao.library.interfaces.AdapterCallBack;
26-
import zuo.biao.library.interfaces.CacheCallBack;
27-
import zuo.biao.library.interfaces.OnBottomDragListener;
28-
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
29-
import zuo.biao.library.ui.EditTextInfoWindow;
3017
import android.annotation.SuppressLint;
3118
import android.app.Activity;
3219
import android.content.Intent;
@@ -40,6 +27,11 @@
4027
import android.widget.AdapterView.OnItemClickListener;
4128
import android.widget.ImageView;
4229
import android.widget.TextView;
30+
31+
import com.alibaba.fastjson.JSONObject;
32+
33+
import java.util.List;
34+
4335
import apijson.demo.client.R;
4436
import apijson.demo.client.adapter.MomentAdapter;
4537
import apijson.demo.client.application.APIJSONApplication;
@@ -48,8 +40,17 @@
4840
import apijson.demo.client.model.MomentItem;
4941
import apijson.demo.client.util.CommentUtil;
5042
import apijson.demo.client.util.HttpRequest;
51-
52-
import com.alibaba.fastjson.JSONObject;
43+
import zuo.biao.apijson.JSON;
44+
import zuo.biao.apijson.JSONRequest;
45+
import zuo.biao.apijson.JSONResponse;
46+
import zuo.biao.apijson.SQL;
47+
import zuo.biao.apijson.StringUtil;
48+
import zuo.biao.library.base.BaseView.OnDataChangedListener;
49+
import zuo.biao.library.interfaces.AdapterCallBack;
50+
import zuo.biao.library.interfaces.CacheCallBack;
51+
import zuo.biao.library.interfaces.OnBottomDragListener;
52+
import zuo.biao.library.manager.HttpManager.OnHttpResponseListener;
53+
import zuo.biao.library.ui.EditTextInfoWindow;
5354

5455
/**用户列表界面fragment
5556
* @author Lemon
@@ -330,7 +331,6 @@ public void onDragBottom(boolean rightToLeft) {
330331
}
331332
}
332333

333-
334334
@Override
335335
public void onDataChanged() {
336336
if (range == RANGE_USER_CIRCLE) {
@@ -359,7 +359,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
359359
JSONRequest search = new JSONRequest();
360360
if (StringUtil.isNotEmpty(value, true)) {
361361
split = ":";
362-
search.putSearch("content", value, SQL.SEARCH_TYPE_CONTAIN_ORDER);
362+
search.putSearch(HttpRequest.CONTENT, value, SQL.SEARCH_TYPE_CONTAIN_ORDER);
363363
}
364364
toActivity(MomentListActivity.createIntent(context, range, id, search, false)
365365
.putExtra(INTENT_TITLE, "搜索" + split + value));

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/UserActivity.java‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,30 @@
1414

1515
package apijson.demo.client.activity_fragment;
1616

17+
import android.annotation.SuppressLint;
18+
import android.app.Activity;
19+
import android.content.Context;
20+
import android.content.Intent;
21+
import android.os.Bundle;
22+
import android.view.MotionEvent;
23+
import android.view.View;
24+
import android.view.View.OnClickListener;
25+
import android.view.View.OnTouchListener;
26+
import android.view.ViewGroup;
27+
import android.widget.GridView;
28+
import android.widget.TextView;
29+
1730
import java.util.ArrayList;
1831
import java.util.List;
1932

33+
import apijson.demo.client.R;
34+
import apijson.demo.client.base.BaseActivity;
35+
import apijson.demo.client.model.Moment;
36+
import apijson.demo.client.model.User;
37+
import apijson.demo.client.util.ActionUtil;
38+
import apijson.demo.client.util.HttpRequest;
39+
import apijson.demo.client.util.MenuUtil;
40+
import apijson.demo.client.view.UserView;
2041
import zuo.biao.apijson.JSONRequest;
2142
import zuo.biao.apijson.JSONResponse;
2243
import zuo.biao.library.base.BaseView.OnDataChangedListener;
@@ -40,26 +61,6 @@
4061
import zuo.biao.library.util.JSON;
4162
import zuo.biao.library.util.Log;
4263
import zuo.biao.library.util.StringUtil;
43-
import android.annotation.SuppressLint;
44-
import android.app.Activity;
45-
import android.content.Context;
46-
import android.content.Intent;
47-
import android.os.Bundle;
48-
import android.view.MotionEvent;
49-
import android.view.View;
50-
import android.view.View.OnClickListener;
51-
import android.view.View.OnTouchListener;
52-
import android.view.ViewGroup;
53-
import android.widget.GridView;
54-
import android.widget.TextView;
55-
import apijson.demo.client.R;
56-
import apijson.demo.client.base.BaseActivity;
57-
import apijson.demo.client.model.Moment;
58-
import apijson.demo.client.model.User;
59-
import apijson.demo.client.util.ActionUtil;
60-
import apijson.demo.client.util.HttpRequest;
61-
import apijson.demo.client.util.MenuUtil;
62-
import apijson.demo.client.view.UserView;
6364

6465
/**联系人资料界面
6566
* @author Lemon
@@ -93,7 +94,7 @@ protected void onCreate(Bundle savedInstanceState) {
9394
setContentView(R.layout.user_activity, this);
9495

9596
registerObserver(this);
96-
97+
9798
intent = getIntent();
9899
id = intent.getLongExtra(INTENT_ID, id);
99100
isOnEditMode = intent.getBooleanExtra(INTENT_IS_ON_EDIT_MODE, isOnEditMode);
@@ -141,7 +142,7 @@ public void initView() {//必须调用
141142
// //方式一
142143
// bvlUser = (BaseViewLayout<User>) findViewById(R.id.bvlUser);
143144
// bvlUser.createView(new UserView(context, getResources()));
144-
//
145+
//
145146
// //方式二
146147
// uvlUser = (UserViewLayout) findViewById(R.id.uvlUser);
147148

@@ -184,7 +185,7 @@ private void setUser(User user_) {
184185
}
185186
/**显示用户
186187
* @param user_
187-
* @param momentList_
188+
* @param momentList_
188189
*/
189190
private void setUser(User user_, List<Moment> momentList_) {
190191
this.user = user_;
@@ -266,7 +267,7 @@ public void onDataChanged() {
266267
tvBaseTitle.setText(isOnEditMode ? "编辑资料" : (isCurrentUser(id) ? "我的资料" : "详细资料"));
267268

268269
if (bottomMenuView != null) {
269-
bottomMenuView.bindView(MenuUtil.getMenuList(MenuUtil.USER, id, ! User.isFirend(currentUser, id)));
270+
bottomMenuView.bindView(MenuUtil.getMenuList(MenuUtil.USER, id, ! User.isFriend(currentUser, id)));
270271
}
271272

272273
runThread(TAG + "run", new Runnable() {
@@ -286,7 +287,7 @@ public void run() {
286287
}
287288
});
288289

289-
HttpRequest.getUser(id, ! isOnEditMode, HTTP_GET, UserActivity.this);
290+
HttpRequest.getUser(id, ! isOnEditMode, HTTP_GET, UserActivity.this);
290291
}
291292
});
292293

@@ -343,7 +344,7 @@ public boolean onTouch(View v, MotionEvent event) {
343344
if (isOnEditMode) {
344345
findViewById(R.id.llUserRemark).setOnClickListener(this);
345346
findViewById(R.id.llUserTag).setOnClickListener(this);
346-
347+
347348
userView.setOnDataChangedListener(new OnDataChangedListener() {
348349

349350
@Override
@@ -399,7 +400,7 @@ public void onClick(View v) {
399400
isDataChanged = true;
400401
}
401402
break;
402-
}
403+
}
403404
}
404405
});
405406

‎APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/UserListFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
378378
if (StringUtil.isNotEmpty(value, true)) {
379379
split = ":";
380380
if (isSearch) {
381-
search.putSearch(HttpRequest.KEY_NAME, value);
381+
search.putSearch(HttpRequest.NAME, value);
382382
} else {
383-
search.put(HttpRequest.KEY_PHONE, value);
383+
search.put(HttpRequest.PHONE, value);
384384
}
385385
}
386386
intent = isSearch

0 commit comments

Comments
 (0)