Browse Source

发布选择页面优化

huyuguo 6 years ago
parent
commit
1f187d933b
32 changed files with 77 additions and 23 deletions
  1. 6 0
      app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java
  2. 11 2
      app/src/main/java/com/electric/chargingpile/activity/TopicDetailActivity.java
  3. 33 0
      app/src/main/java/com/electric/chargingpile/data/PublishItemSerializable.java
  4. 7 1
      app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java
  5. BIN
      app/src/main/res/drawable-hdpi/app_publish_close_icon.png
  6. BIN
      app/src/main/res/drawable-hdpi/app_publish_pic_icon.png
  7. BIN
      app/src/main/res/drawable-hdpi/app_publish_qa_icon.png
  8. BIN
      app/src/main/res/drawable-hdpi/app_publish_video_icon.png
  9. 0 0
      app/src/main/res/drawable-hdpi/app_qa_icon.png
  10. BIN
      app/src/main/res/drawable-mdpi/app_publish_close_icon.png
  11. BIN
      app/src/main/res/drawable-mdpi/app_publish_pic_icon.png
  12. BIN
      app/src/main/res/drawable-mdpi/app_publish_qa_icon.png
  13. BIN
      app/src/main/res/drawable-mdpi/app_publish_video_icon.png
  14. 0 0
      app/src/main/res/drawable-mdpi/app_qa_icon.png
  15. BIN
      app/src/main/res/drawable-xhdpi/app_publish_close_icon.png
  16. BIN
      app/src/main/res/drawable-xhdpi/app_publish_pic_icon.png
  17. BIN
      app/src/main/res/drawable-xhdpi/app_publish_qa_icon.png
  18. BIN
      app/src/main/res/drawable-xhdpi/app_publish_video_icon.png
  19. 0 0
      app/src/main/res/drawable-xhdpi/app_qa_icon.png
  20. 0 0
      app/src/main/res/drawable-xxhdpi/app_publish_close_icon.png
  21. 0 0
      app/src/main/res/drawable-xxhdpi/app_publish_pic_icon.png
  22. BIN
      app/src/main/res/drawable-xxhdpi/app_publish_qa_icon.png
  23. 0 0
      app/src/main/res/drawable-xxhdpi/app_publish_video_icon.png
  24. 0 0
      app/src/main/res/drawable-xxhdpi/app_qa_icon.png
  25. BIN
      app/src/main/res/drawable-xxxhdpi/app_publish_close_icon.png
  26. BIN
      app/src/main/res/drawable-xxxhdpi/app_publish_pic_icon.png
  27. BIN
      app/src/main/res/drawable-xxxhdpi/app_publish_qa_icon.png
  28. BIN
      app/src/main/res/drawable-xxxhdpi/app_publish_video_icon.png
  29. 0 0
      app/src/main/res/drawable-xxxhdpi/app_qa_icon.png
  30. 1 1
      app/src/main/res/layout/activity_fram_qa.xml
  31. 18 18
      app/src/main/res/layout/activity_publish_items.xml
  32. 1 1
      app/src/main/res/layout/activity_talk_tj.xml

+ 6 - 0
app/src/main/java/com/electric/chargingpile/activity/PublishItemsActivity.java

18
18
19
import com.electric.chargingpile.R;
19
import com.electric.chargingpile.R;
20
import com.electric.chargingpile.application.MainApplication;
20
import com.electric.chargingpile.application.MainApplication;
21
import com.electric.chargingpile.data.PublishItemSerializable;
21
import com.electric.chargingpile.fragment.ChatRecommendFragment;
22
import com.electric.chargingpile.fragment.ChatRecommendFragment;
22
import com.electric.chargingpile.fragment.TalkRecommendFragment;
23
import com.electric.chargingpile.fragment.TalkRecommendFragment;
23
import com.electric.chargingpile.manager.ProfileManager;
24
import com.electric.chargingpile.manager.ProfileManager;
34
public class PublishItemsActivity extends AppCompatActivity implements View.OnClickListener {
35
public class PublishItemsActivity extends AppCompatActivity implements View.OnClickListener {
35
    private static final String TAG = "PublishItemsActivity";
36
    private static final String TAG = "PublishItemsActivity";
36
37
38
    public static final String FROM_CHAT_HOME = "from_chat_home";
39
    public static final String FROM_TOPIC_DETAIL = "from_topic_detail";
40
37
    private RelativeLayout mBottomView;
41
    private RelativeLayout mBottomView;
38
    private TextView mRulePublish;
42
    private TextView mRulePublish;
39
    private ImageView mSharePublishClose;
43
    private ImageView mSharePublishClose;
44
    private TextView mShareScanIconInfo;
48
    private TextView mShareScanIconInfo;
45
    private ImageView publish_radio;
49
    private ImageView publish_radio;
46
    private boolean publishRadioSelected = false;
50
    private boolean publishRadioSelected = false;
51
    private PublishItemSerializable intentData;
47
52
48
    @Override
53
    @Override
49
    protected void onCreate(Bundle savedInstanceState) {
54
    protected void onCreate(Bundle savedInstanceState) {
54
    }
59
    }
55
60
56
    private void initView() {
61
    private void initView() {
62
        intentData = (PublishItemSerializable)getIntent().getSerializableExtra("intent_data");
57
63
58
        mBottomView = (RelativeLayout) findViewById(R.id.bottom_view);
64
        mBottomView = (RelativeLayout) findViewById(R.id.bottom_view);
59
        mRulePublish = (TextView) findViewById(R.id.rule_publish);
65
        mRulePublish = (TextView) findViewById(R.id.rule_publish);

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

19
import com.electric.chargingpile.adapter.TopicDetailAdapter;
19
import com.electric.chargingpile.adapter.TopicDetailAdapter;
20
import com.electric.chargingpile.application.MainApplication;
20
import com.electric.chargingpile.application.MainApplication;
21
import com.electric.chargingpile.data.ChatRecommendBean;
21
import com.electric.chargingpile.data.ChatRecommendBean;
22
import com.electric.chargingpile.data.PublishItemSerializable;
22
import com.electric.chargingpile.data.TopicHomePageBean;
23
import com.electric.chargingpile.data.TopicHomePageBean;
23
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
24
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
24
import com.electric.chargingpile.manager.ProfileManager;
25
import com.electric.chargingpile.manager.ProfileManager;
57
    private ImageView chatPublishIcon;
58
    private ImageView chatPublishIcon;
58
    private ConstraintLayout noNetView;
59
    private ConstraintLayout noNetView;
59
    private ConstraintLayout topicOfflineView;
60
    private ConstraintLayout topicOfflineView;
61
    private TopicHomePageBean homePageBean;
60
62
61
    @Override
63
    @Override
62
    protected void onCreate(@Nullable Bundle savedInstanceState) {
64
    protected void onCreate(@Nullable Bundle savedInstanceState) {
230
                    chatPublishTips.setVisibility(View.GONE);
232
                    chatPublishTips.setVisibility(View.GONE);
231
                    ProfileManager.getInstance().setClickedUserPublishTopic(getApplicationContext(), "label");
233
                    ProfileManager.getInstance().setClickedUserPublishTopic(getApplicationContext(), "label");
232
                    isFirst = false;
234
                    isFirst = false;
233
                    startActivityForResult(new Intent(getApplicationContext(), PublishItemsActivity.class), CLICK_PUBLISH_BTN_TOPIC);
235
236
                    Intent intent = new Intent(getApplicationContext(), PublishItemsActivity.class);
237
                    PublishItemSerializable intentData = new PublishItemSerializable();
238
                    intentData.setFrom(PublishItemsActivity.FROM_TOPIC_DETAIL);
239
                    intentData.setTopicId(homePageBean.topicVo.topicId);
240
                    intentData.setName(homePageBean.topicVo.name);
241
                    intent.putExtra("intent_data", intentData);
242
                    startActivityForResult(intent, CLICK_PUBLISH_BTN_TOPIC);
234
                } else if ("8010".equals(code)) {
243
                } else if ("8010".equals(code)) {
235
                    startActivity(new Intent(getApplicationContext(), LoginActivity.class));
244
                    startActivity(new Intent(getApplicationContext(), LoginActivity.class));
236
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_LONG);
245
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_LONG);
276
                        topicOfflineView.setVisibility(View.VISIBLE);
285
                        topicOfflineView.setVisibility(View.VISIBLE);
277
                        return;
286
                        return;
278
                    }
287
                    }
279
                    TopicHomePageBean homePageBean = (TopicHomePageBean) JsonUtils.parseToObjectBean(data, TopicHomePageBean.class);
288
                    homePageBean = (TopicHomePageBean) JsonUtils.parseToObjectBean(data, TopicHomePageBean.class);
280
                    if (page == 1) {
289
                    if (page == 1) {
281
                        xRefreshView.stopRefresh();
290
                        xRefreshView.stopRefresh();
282
                        xRefreshView.setLoadComplete(false);
291
                        xRefreshView.setLoadComplete(false);

+ 33 - 0
app/src/main/java/com/electric/chargingpile/data/PublishItemSerializable.java

1
package com.electric.chargingpile.data;
2
3
import java.io.Serializable;
4
5
public class PublishItemSerializable implements Serializable {
6
    private String from;  // home:聊聊首页 topicDe
7
    private String topicId; // 话题ID
8
    private String name; // 话题名字
9
10
    public String getFrom() {
11
        return from;
12
    }
13
14
    public void setFrom(String from) {
15
        this.from = from;
16
    }
17
18
    public String getTopicId() {
19
        return topicId;
20
    }
21
22
    public void setTopicId(String topicId) {
23
        this.topicId = topicId;
24
    }
25
26
    public String getName() {
27
        return name;
28
    }
29
30
    public void setName(String name) {
31
        this.name = name;
32
    }
33
}

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

25
import com.electric.chargingpile.application.MainApplication;
25
import com.electric.chargingpile.application.MainApplication;
26
import com.electric.chargingpile.data.ChatBeanLab;
26
import com.electric.chargingpile.data.ChatBeanLab;
27
import com.electric.chargingpile.data.ChatRecommendBean;
27
import com.electric.chargingpile.data.ChatRecommendBean;
28
import com.electric.chargingpile.data.PublishItemSerializable;
28
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
29
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
29
import com.electric.chargingpile.manager.ProfileManager;
30
import com.electric.chargingpile.manager.ProfileManager;
30
import com.electric.chargingpile.util.CommonParams;
31
import com.electric.chargingpile.util.CommonParams;
248
                if ("1000".equals(code)) {
249
                if ("1000".equals(code)) {
249
                    chat_share_info_remind.setVisibility(View.GONE);
250
                    chat_share_info_remind.setVisibility(View.GONE);
250
                    ProfileManager.getInstance().setFirstComeIn(getActivity(), "label");
251
                    ProfileManager.getInstance().setFirstComeIn(getActivity(), "label");
251
                    startActivityForResult(new Intent(getActivity(), PublishItemsActivity.class), CLICK_PUBLISH_BTN);
252
                    Intent intent = new Intent(getActivity(), PublishItemsActivity.class);
253
                    PublishItemSerializable intentData = new PublishItemSerializable();
254
                    intentData.setFrom(PublishItemsActivity.FROM_CHAT_HOME);
255
                    intent.putExtra("intent_data", intentData);
256
257
                    startActivityForResult(intent, CLICK_PUBLISH_BTN);
252
                } else if ("8010".equals(code)) {
258
                } else if ("8010".equals(code)) {
253
                    startActivity(new Intent(getContext(), LoginActivity.class));
259
                    startActivity(new Intent(getContext(), LoginActivity.class));
254
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);
260
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);

BIN
app/src/main/res/drawable-hdpi/app_publish_close_icon.png


BIN
app/src/main/res/drawable-hdpi/app_publish_pic_icon.png


BIN
app/src/main/res/drawable-hdpi/app_publish_qa_icon.png


BIN
app/src/main/res/drawable-hdpi/app_publish_video_icon.png


app/src/main/res/drawable-hdpi/app_publish_item_qa.png → app/src/main/res/drawable-hdpi/app_qa_icon.png


BIN
app/src/main/res/drawable-mdpi/app_publish_close_icon.png


BIN
app/src/main/res/drawable-mdpi/app_publish_pic_icon.png


BIN
app/src/main/res/drawable-mdpi/app_publish_qa_icon.png


BIN
app/src/main/res/drawable-mdpi/app_publish_video_icon.png


app/src/main/res/drawable-mdpi/app_publish_item_qa.png → app/src/main/res/drawable-mdpi/app_qa_icon.png


BIN
app/src/main/res/drawable-xhdpi/app_publish_close_icon.png


BIN
app/src/main/res/drawable-xhdpi/app_publish_pic_icon.png


BIN
app/src/main/res/drawable-xhdpi/app_publish_qa_icon.png


BIN
app/src/main/res/drawable-xhdpi/app_publish_video_icon.png


app/src/main/res/drawable-xhdpi/app_publish_item_qa.png → app/src/main/res/drawable-xhdpi/app_qa_icon.png


app/src/main/res/drawable-hdpi/app_publish_item_cancel.png → app/src/main/res/drawable-xxhdpi/app_publish_close_icon.png


app/src/main/res/drawable-hdpi/app_publish_item_pic.png → app/src/main/res/drawable-xxhdpi/app_publish_pic_icon.png


BIN
app/src/main/res/drawable-xxhdpi/app_publish_qa_icon.png


app/src/main/res/drawable-hdpi/app_publish_item_video.png → app/src/main/res/drawable-xxhdpi/app_publish_video_icon.png


app/src/main/res/drawable-xxhdpi/app_publish_item_qa.png → app/src/main/res/drawable-xxhdpi/app_qa_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/app_publish_close_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/app_publish_pic_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/app_publish_qa_icon.png


BIN
app/src/main/res/drawable-xxxhdpi/app_publish_video_icon.png


app/src/main/res/drawable-xxxhdpi/app_publish_item_qa.png → app/src/main/res/drawable-xxxhdpi/app_qa_icon.png


+ 1 - 1
app/src/main/res/layout/activity_fram_qa.xml

24
        android:layout_alignParentBottom="true"
24
        android:layout_alignParentBottom="true"
25
        android:layout_marginRight="15dp"
25
        android:layout_marginRight="15dp"
26
        android:layout_marginBottom="22dp"
26
        android:layout_marginBottom="22dp"
27
        android:src="@drawable/app_publish_item_qa"/>
27
        android:src="@drawable/app_qa_icon"/>
28
28
29
</RelativeLayout>
29
</RelativeLayout>

+ 18 - 18
app/src/main/res/layout/activity_publish_items.xml

36

36

37
        <ImageView
37
        <ImageView
38
            android:id="@+id/share_publish_close"
38
            android:id="@+id/share_publish_close"
39
            android:layout_width="28dp"
40
            android:layout_height="28dp"
39
            android:layout_width="wrap_content"
40
            android:layout_height="wrap_content"
41
            android:layout_above="@+id/rule_publish"
41
            android:layout_above="@+id/rule_publish"
42
            android:layout_centerHorizontal="true"
42
            android:layout_centerHorizontal="true"
43
            android:layout_margin="10dp"
44
            android:background="@drawable/app_publish_item_cancel" />
43
            android:padding="10dp"
44
            android:background="@drawable/app_publish_close_icon" />
45

45

46
        <LinearLayout
46
        <LinearLayout
47
            android:id="@+id/publish_picture"
47
            android:id="@+id/publish_picture"
48
            android:layout_width="50dp"
48
            android:layout_width="wrap_content"
49
            android:layout_height="wrap_content"
49
            android:layout_height="wrap_content"
50
            android:layout_above="@+id/share_publish_close"
50
            android:layout_above="@+id/share_publish_close"
51
            android:layout_centerHorizontal="true"
51
            android:layout_centerHorizontal="true"
56
            android:orientation="vertical">
56
            android:orientation="vertical">
57

57

58
            <ImageView
58
            <ImageView
59
                android:layout_width="50dp"
60
                android:layout_height="50dp"
61
                android:background="@drawable/app_publish_item_pic" />
59
                android:layout_width="wrap_content"
60
                android:layout_height="wrap_content"
61
                android:background="@drawable/app_publish_pic_icon" />
62

62

63
            <TextView
63
            <TextView
64
                android:layout_width="wrap_content"
64
                android:layout_width="wrap_content"
71

71

72
        <LinearLayout
72
        <LinearLayout
73
            android:id="@+id/publish_video"
73
            android:id="@+id/publish_video"
74
            android:layout_width="50dp"
74
            android:layout_width="wrap_content"
75
            android:layout_height="wrap_content"
75
            android:layout_height="wrap_content"
76
            android:layout_above="@+id/share_publish_close"
76
            android:layout_above="@+id/share_publish_close"
77
            android:layout_marginTop="40dp"
77
            android:layout_marginTop="40dp"
78
            android:layout_marginRight="30dp"
78
            android:layout_marginRight="40dp"
79
            android:layout_marginBottom="40dp"
79
            android:layout_marginBottom="40dp"
80
            android:layout_toLeftOf="@+id/publish_picture"
80
            android:layout_toLeftOf="@+id/publish_picture"
81
            android:gravity="center"
81
            android:gravity="center"
83
            android:orientation="vertical">
83
            android:orientation="vertical">
84

84

85
            <ImageView
85
            <ImageView
86
                android:layout_width="50dp"
87
                android:layout_height="50dp"
88
                android:background="@drawable/app_publish_item_video" />
86
                android:layout_width="wrap_content"
87
                android:layout_height="wrap_content"
88
                android:background="@drawable/app_publish_video_icon" />
89

89

90
            <TextView
90
            <TextView
91
                android:layout_width="wrap_content"
91
                android:layout_width="wrap_content"
98

98

99
        <LinearLayout
99
        <LinearLayout
100
            android:id="@+id/publish_qa"
100
            android:id="@+id/publish_qa"
101
            android:layout_width="50dp"
101
            android:layout_width="wrap_content"
102
            android:layout_height="wrap_content"
102
            android:layout_height="wrap_content"
103
            android:layout_above="@+id/share_publish_close"
103
            android:layout_above="@+id/share_publish_close"
104
            android:layout_marginLeft="30dp"
104
            android:layout_marginLeft="40dp"
105
            android:layout_marginTop="40dp"
105
            android:layout_marginTop="40dp"
106
            android:layout_marginBottom="40dp"
106
            android:layout_marginBottom="40dp"
107
            android:layout_toRightOf="@+id/publish_picture"
107
            android:layout_toRightOf="@+id/publish_picture"
110
            android:orientation="vertical">
110
            android:orientation="vertical">
111

111

112
            <ImageView
112
            <ImageView
113
                android:layout_width="50dp"
114
                android:layout_height="50dp"
115
                android:background="@drawable/app_publish_item_qa" />
113
                android:layout_width="wrap_content"
114
                android:layout_height="wrap_content"
115
                android:background="@drawable/app_publish_qa_icon" />
116

116

117
            <TextView
117
            <TextView
118
                android:layout_width="wrap_content"
118
                android:layout_width="wrap_content"

+ 1 - 1
app/src/main/res/layout/activity_talk_tj.xml

22
        android:layout_alignParentBottom="true"
22
        android:layout_alignParentBottom="true"
23
        android:layout_marginRight="15dp"
23
        android:layout_marginRight="15dp"
24
        android:layout_marginBottom="71dp"
24
        android:layout_marginBottom="71dp"
25
        android:src="@drawable/app_publish_item_qa"/>
25
        android:src="@drawable/app_qa_icon"/>
26
26
27
</RelativeLayout>
27
</RelativeLayout>