Przeglądaj źródła

话题详情页修改

huyuguo 6 lat temu
rodzic
commit
93308acb2b

+ 2 - 0
app/build.gradle

@ -281,6 +281,8 @@ dependencies {
281 281
    compile project(':ijkplayer-java')
282 282
    compile 'com.upyun:upyun-android-sdk:+'
283 283
    compile project(':videolibrary:picture_library')
284
    // 上下翻页
285
    compile 'com.github.castorflex.verticalviewpager:library:19.0.1'
284 286
    // sqlite异常结局
285 287
    compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
286 288
}

+ 2 - 2
app/src/main/java/com/electric/chargingpile/activity/TopicDetailActivity.java

@ -45,7 +45,7 @@ public class TopicDetailActivity extends AppCompatActivity implements View.OnCli
45 45
    private RecyclerView recyclerView;
46 46
    private LoadingDialog loadingDialog;
47 47
48
    private int topicId;
48
    private long topicId;
49 49
    private int sort = 1;
50 50
    private int page = 1;
51 51
    private TopicDetailAdapter topicDetailAdapter;
@ -70,7 +70,7 @@ public class TopicDetailActivity extends AppCompatActivity implements View.OnCli
70 70
    }
71 71
72 72
    private void initView() {
73
        topicId = getIntent().getIntExtra("topicId", 0);
73
        topicId = getIntent().getLongExtra("topicId", 0);
74 74
        loadingDialog = new LoadingDialog(TopicDetailActivity.this);
75 75
        loadingDialog.setCanceledOnTouchOutside(false);
76 76

+ 3 - 5
app/src/main/java/com/electric/chargingpile/adapter/TopicDetailAdapter.java

@ -138,10 +138,8 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
138 138
        ImageDisplayUtils.dispalyImg(context, topicDetailBean.coverImgUrl, headerViewHolder.headImage);
139 139
        headerViewHolder.name.setText(topicDetailBean.name);
140 140
        headerViewHolder.desc.setText(topicDetailBean.desc);
141
        int read = topicDetailBean.visitNums;
142
        headerViewHolder.read.setText(read < 10000 ? read + "" : String.format("%.1fW", read / 10000.0));
143
        int join = topicDetailBean.joinNums;
144
        headerViewHolder.join.setText(join < 10000 ? join + "" : String.format("%.1fW", join / 10000.0));
141
        headerViewHolder.read.setText(topicDetailBean.visitNums);
142
        headerViewHolder.join.setText(topicDetailBean.joinNums);
145 143
146 144
        headerViewHolder.sortConstrainLayout.setOnClickListener(new View.OnClickListener() {
147 145
            @Override
@ -244,7 +242,7 @@ public class TopicDetailAdapter extends RecyclerView.Adapter<IViewHolder> {
244 242
        int likeNum = bean.likeNums;
245 243
        if (likeNum > 0) {
246 244
            contentViewHolder.likeNum.setVisibility(View.VISIBLE);
247
            contentViewHolder.likeNum.setText(likeNum < 10000 ? likeNum + "" : String.format("%.1fW", likeNum / 10000.0));
245
            contentViewHolder.likeNum.setText(likeNum < 999 ? likeNum + "" : "999+");
248 246
        } else {
249 247
            contentViewHolder.likeNum.setVisibility(View.GONE);
250 248
        }

+ 1 - 1
app/src/main/java/com/electric/chargingpile/data/ChatRecommendBean.java

@ -15,7 +15,7 @@ public class ChatRecommendBean implements Serializable {
15 15
    public String title;
16 16
    public String name;
17 17
    public long addTime;
18
    public int topicId;
18
    public long topicId;
19 19
    public long joinNums;
20 20
    public int visitNums;
21 21
    public String coverImgUrl;

+ 2 - 2
app/src/main/java/com/electric/chargingpile/data/HomePageBean.java

@ -13,8 +13,8 @@ public class HomePageBean {
13 13
        public String name; // 话题名称
14 14
        public String coverImgUrl; // 话题封面图片
15 15
        public String desc; // 话题描述
16
        public int joinNums; // 参与该话题的人数(最多显示4位,超过4位,以千进位,显示1.1W,小数点后1位)
17
        public int visitNums; // 访问量
16
        public String joinNums; // 参与该话题的人数
17
        public String visitNums; // 访问量
18 18
19 19
        @Override
20 20
        public String toString() {

+ 3 - 1
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java

@ -132,7 +132,9 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
132 132
                final ArrayList<ChatRecommendBean> beans = chatRecommendAdapter.getCurrentData();
133 133
                ChatRecommendBean bean = beans.get(position - 1);
134 134
                if (bean.targetType == ChatRecommendBean.TARGET_TYPE_IMAGE_TOPIC) {
135
                    startActivity(new Intent(getActivity(), TopicDetailActivity.class).putExtra("topicId", bean.topicId + ""));
135
                    Intent intent = new Intent(getActivity(), TopicDetailActivity.class);
136
                    intent.putExtra("topicId", bean.targetId);
137
                    startActivity(intent);
136 138
                } else {
137 139
                    Disposable disposable = Observable
138 140
                            .fromIterable(beans)