Skip to content

Commit c3266e3

Browse files
TommyLemonTommyLemon
committed
Client:adt与studio同步；删除不必要的代码文件；部分代码文件重命名
1 parent 311dc84 commit c3266e3

36 files changed

+93
-393
lines changed

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_container_view.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
android:gravity="left|center_vertical"
1616
android:paddingBottom="4dp"
1717
android:paddingTop="4dp"
18-
android:text="查看所有" />
18+
android:text="查看全部" />
1919

2020
</LinearLayout>

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_down_item.xml‎

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

APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/res/layout/moment_view_comment_item.xml renamed to APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_item.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
android:gravity="left|center_vertical"
88
android:paddingBottom="2dp"
99
android:paddingTop="2dp"
10-
android:text="This is a comment..." />
10+
android:text="This is a comment..." />

APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_main_item.xml renamed to APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_view.xml

File renamed without changes.

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/comment_view_comment_more_item.xml‎

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

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/picture_item.xml‎

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

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/res/layout/user_item.xml‎

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

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/MomentActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import apijson.demo.client.model.User;
3939
import apijson.demo.client.util.CommentUtil;
4040
import apijson.demo.client.util.HttpRequest;
41-
import apijson.demo.client.view.CommentItemView.OnCommentClickListener;
41+
import apijson.demo.client.view.CommentView.OnCommentClickListener;
4242
import apijson.demo.client.view.MomentView;
4343
import zuo.biao.apijson.JSON;
4444
import zuo.biao.apijson.JSONResponse;

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/MomentListFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static MomentListFragment createInstance(long userId) {
8585
}
8686
/**
8787
* @param range
88-
* @param userId
88+
* @param id
8989
* @return
9090
*/
9191
public static MomentListFragment createInstance(int range, long id) {
@@ -196,7 +196,7 @@ public MomentAdapter createAdapter() {
196196
public void refreshAdapter() {
197197
adapter.refresh(list);
198198
}
199-
});
199+
});
200200
}
201201
});
202202
}
@@ -279,7 +279,7 @@ public String getCacheId(MomentItem data) {
279279
}
280280
@Override
281281
public int getCacheCount() {
282-
return 3;
282+
return 4;
283283
}
284284

285285

@@ -325,7 +325,7 @@ public void onDragBottom(boolean rightToLeft) {
325325

326326
showShortToast("输入为空则查看全部");
327327
toActivity(EditTextInfoWindow.createIntent(context
328-
, EditTextInfoWindow.TYPE_NAME, "关键词", null),
328+
, EditTextInfoWindow.TYPE_NAME, "关键词", null),
329329
REQUEST_TO_EDIT_TEXT_INFO, false);
330330
}
331331
}

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/adapter/CommentAdapter.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
import java.util.Map;
2323

2424
import apijson.demo.client.model.CommentItem;
25-
import apijson.demo.client.view.CommentItemView;
26-
import apijson.demo.client.view.CommentItemView.OnCommentClickListener;
27-
import apijson.demo.client.view.CommentItemView.OnShowAllListener;
25+
import apijson.demo.client.view.CommentView;
26+
import apijson.demo.client.view.CommentView.OnCommentClickListener;
27+
import apijson.demo.client.view.CommentView.OnShowAllListener;
2828
import zuo.biao.library.base.BaseViewAdapter;
2929

3030
/**评论列表
3131
* @author Lemon
3232
*/
33-
public class CommentAdapter extends BaseViewAdapter<CommentItem, CommentItemView> {
33+
public class CommentAdapter extends BaseViewAdapter<CommentItem, CommentView> {
3434

3535

3636
private OnCommentClickListener onCommentClickListener;
@@ -58,12 +58,12 @@ public synchronized void refresh(List<CommentItem> list) {
5858
}
5959

6060
@Override
61-
public CommentItemView createView(int position, ViewGroup parent) {
62-
return new CommentItemView(context, resources)
61+
public CommentView createView(int position, ViewGroup parent) {
62+
return new CommentView(context, resources)
6363
.setOnCommentClickListener(onCommentClickListener)
6464
.setOnShowAllListener(new OnShowAllListener() {
6565
@Override
66-
public void onShowAll(int position, CommentItemView bv, boolean show) {
66+
public void onShowAll(int position, CommentView bv, boolean show) {
6767
showAllMap.put(position, show);
6868
bindView(position, bv);
6969
}
@@ -73,7 +73,7 @@ public void onShowAll(int position, CommentItemView bv, boolean show) {
7373
private Map<Integer, Boolean> showAllMap = new HashMap<>();
7474

7575
@Override
76-
public void bindView(int position, CommentItemView bv) {
76+
public void bindView(int position, CommentView bv) {
7777
//true : showAllMap.get(position)怎么搞都崩溃
7878
bv.setShowAll(showAll ? Boolean.valueOf(true) : showAllMap.get(position));
7979
super.bindView(position, bv);

0 commit comments

Comments
 (0)