dxh 5 年 前
コミット
59bd8c2d79

+ 8 - 8
app/src/main/java/com/electric/chargingpile/activity/PersonalPageActivity.java

@ -123,14 +123,6 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
123 123
                    if (!haveLoadHeaderData) {
124 124
                        haveLoadHeaderData = true;
125 125
                        initHeaderData(qadata);
126
127
                        if (null != qadata.list && qadata.list.size() > 0) {
128
//                            shareUrl = qadata.list.get(0).shareUrl;
129
                            chargingShareBean.setIcon(qadata.userVo.coverImgUrl);
130
                            chargingShareBean.setTitle(qadata.userVo.nickName+"的个人主页");
131
                            chargingShareBean.setUrl(qadata.userVo.shareUrl);
132
                            chargingShareBean.setText("快来看看"+qadata.userVo.nickName+"都在分享什么吧。");
133
                        }
134 126
                    }
135 127
                    if (page == 1)
136 128
                        waterFallAdapter.setData(qadata.list);
@ -154,6 +146,14 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
154 146
    }
155 147
156 148
    private void initHeaderData(HomePageBean qadata) {
149
        if(qadata == null || qadata.userVo == null)
150
            return;
151
152
        chargingShareBean.setIcon(qadata.userVo.coverImgUrl);
153
        chargingShareBean.setTitle(qadata.userVo.nickName+"的个人主页");
154
        chargingShareBean.setUrl(qadata.userVo.shareUrl);
155
        chargingShareBean.setText("快来看看"+qadata.userVo.nickName+"都在分享什么吧。");
156
157 157
        username_text.setText(qadata.userVo.nickName+"");
158 158
        username_content.setText(qadata.userVo.carName+"");
159 159
        data_info.setText(qadata.userVo.topicNums + "");

+ 1 - 1
app/src/main/java/com/electric/chargingpile/adapter/WaterFallAdapter.java

@ -103,7 +103,7 @@ public class WaterFallAdapter extends RecyclerView.Adapter<IViewHolder> {
103 103
        if (talkRecommendBean.isTop == 0)
104 104
            simpleViewHolder.is_top_view.setVisibility(View.GONE);
105 105
        else
106
            simpleViewHolder.is_top_view.setVisibility(View.VISIBLE);
106
            simpleViewHolder.is_top_view.setVisibility(View.GONE);
107 107
108 108
        if (talkRecommendBean.targetType == 23)
109 109
            simpleViewHolder.info_id_video_icon.setVisibility(View.VISIBLE);

+ 1 - 0
app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java

@ -51,6 +51,7 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
51 51
    public void refreshList(){
52 52
        if(view == null)
53 53
            return;
54
        xRefreshView.startRefresh();
54 55
        page = 1;
55 56
        requestHeaderData();
56 57
    }

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


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

@ -133,7 +133,7 @@
133 133
                android:layout_height="wrap_content"
134 134
                android:layout_gravity="center_horizontal"
135 135
                android:layout_marginTop="8dp"
136
                android:src="@drawable/app_tab_chat_icon" />
136
                android:src="@drawable/app_tab_chat_icon1" />
137 137
                <!--android:src="@drawable/icon_main_qa_selected" />-->
138 138
139 139
            <TextView

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

@ -54,7 +54,7 @@
54 54
            android:layout_width="wrap_content"
55 55
            android:layout_height="wrap_content"
56 56
            android:layout_below="@+id/topic_content"
57
            android:layout_marginLeft="15dp"
57
            android:layout_marginRight="15dp"
58 58
            android:src="@drawable/app_show_more_content"
59 59
            android:layout_alignParentRight="true"
60 60
            android:visibility="gone"