Browse Source

话题详情页修改

huyuguo 6 years ago
parent
commit
93308acb2b

+ 2 - 0
app/build.gradle

281
    compile project(':ijkplayer-java')
281
    compile project(':ijkplayer-java')
282
    compile 'com.upyun:upyun-android-sdk:+'
282
    compile 'com.upyun:upyun-android-sdk:+'
283
    compile project(':videolibrary:picture_library')
283
    compile project(':videolibrary:picture_library')
284
    // 上下翻页
285
    compile 'com.github.castorflex.verticalviewpager:library:19.0.1'
284
    // sqlite异常结局
286
    // sqlite异常结局
285
    compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
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
    private RecyclerView recyclerView;
45
    private RecyclerView recyclerView;
46
    private LoadingDialog loadingDialog;
46
    private LoadingDialog loadingDialog;
47
47
48
    private int topicId;
48
    private long topicId;
49
    private int sort = 1;
49
    private int sort = 1;
50
    private int page = 1;
50
    private int page = 1;
51
    private TopicDetailAdapter topicDetailAdapter;
51
    private TopicDetailAdapter topicDetailAdapter;
70
    }
70
    }
71
71
72
    private void initView() {
72
    private void initView() {
73
        topicId = getIntent().getIntExtra("topicId", 0);
73
        topicId = getIntent().getLongExtra("topicId", 0);
74
        loadingDialog = new LoadingDialog(TopicDetailActivity.this);
74
        loadingDialog = new LoadingDialog(TopicDetailActivity.this);
75
        loadingDialog.setCanceledOnTouchOutside(false);
75
        loadingDialog.setCanceledOnTouchOutside(false);
76
76

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

138
        ImageDisplayUtils.dispalyImg(context, topicDetailBean.coverImgUrl, headerViewHolder.headImage);
138
        ImageDisplayUtils.dispalyImg(context, topicDetailBean.coverImgUrl, headerViewHolder.headImage);
139
        headerViewHolder.name.setText(topicDetailBean.name);
139
        headerViewHolder.name.setText(topicDetailBean.name);
140
        headerViewHolder.desc.setText(topicDetailBean.desc);
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
        headerViewHolder.sortConstrainLayout.setOnClickListener(new View.OnClickListener() {
144
        headerViewHolder.sortConstrainLayout.setOnClickListener(new View.OnClickListener() {
147
            @Override
145
            @Override
244
        int likeNum = bean.likeNums;
242
        int likeNum = bean.likeNums;
245
        if (likeNum > 0) {
243
        if (likeNum > 0) {
246
            contentViewHolder.likeNum.setVisibility(View.VISIBLE);
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
        } else {
246
        } else {
249
            contentViewHolder.likeNum.setVisibility(View.GONE);
247
            contentViewHolder.likeNum.setVisibility(View.GONE);
250
        }
248
        }

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

15
    public String title;
15
    public String title;
16
    public String name;
16
    public String name;
17
    public long addTime;
17
    public long addTime;
18
    public int topicId;
18
    public long topicId;
19
    public long joinNums;
19
    public long joinNums;
20
    public int visitNums;
20
    public int visitNums;
21
    public String coverImgUrl;
21
    public String coverImgUrl;

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

13
        public String name; // 话题名称
13
        public String name; // 话题名称
14
        public String coverImgUrl; // 话题封面图片
14
        public String coverImgUrl; // 话题封面图片
15
        public String desc; // 话题描述
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
        @Override
19
        @Override
20
        public String toString() {
20
        public String toString() {

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

132
                final ArrayList<ChatRecommendBean> beans = chatRecommendAdapter.getCurrentData();
132
                final ArrayList<ChatRecommendBean> beans = chatRecommendAdapter.getCurrentData();
133
                ChatRecommendBean bean = beans.get(position - 1);
133
                ChatRecommendBean bean = beans.get(position - 1);
134
                if (bean.targetType == ChatRecommendBean.TARGET_TYPE_IMAGE_TOPIC) {
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
                } else {
138
                } else {
137
                    Disposable disposable = Observable
139
                    Disposable disposable = Observable
138
                            .fromIterable(beans)
140
                            .fromIterable(beans)