l="diff-6b319294a705f21f38c117200499af730fd76b01R252">252

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

@ -18,6 +18,7 @@ public class HomePageBean {
18 18
        public long addUserId;
19 19
        public int targetType;
20 20
        public String title;
21
        public String carSeriesName;
21 22
        public String topicName;
22 23
        public String coverImgUrl;
23 24
        public String[] imgUrls;

+ 16 - 4
app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java

@ -15,7 +15,9 @@ import android.widget.Toast;
15 15
import com.andview.refreshview.XRefreshView;
16 16
import com.andview.refreshview.XRefreshView.SimpleXRefreshListener;
17 17
import com.electric.chargingpile.R;
18
import com.electric.chargingpile.activity.PersonalPageActivity;
18 19
import com.electric.chargingpile.activity.PublishItemsActivity;
20
import com.electric.chargingpile.activity.TopicDetailsActivity;
19 21
import com.electric.chargingpile.activity.VideoDetaislActivity;
20 22
import com.electric.chargingpile.adapter.LayoutAdapter;
21 23
import com.electric.chargingpile.application.MainApplication;
@ -109,11 +111,21 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
109 111
            @Override
110 112
            public void onItemClickListener(int position, int type) {
111 113
                int pos = position - 1;
112
                Intent intent = new Intent(getActivity(), VideoDetaislActivity.class);
113 114
                ArrayList<TalkRecommendBean> talkRecommendBeans = layoutAdapter.getCurrentData();
114
                intent.putExtra("list", talkRecommendBeans);
115
                intent.putExtra("pos", pos);
116
                startActivity(intent);
115
116
                if(type == 2){
117
                    startActivity(new Intent(getActivity(), PersonalPageActivity.class).putExtra("targetUserId", talkRecommendBeans.get(pos).addUserId+""));
118
                    return;
119
                }
120
121
                if(talkRecommendBeans.get(pos).targetType == 25){
122
                    startActivity(new Intent(getActivity(), TopicDetailsActivity.class).putExtra("topicId", talkRecommendBeans.get(pos).topicId+""));
123
                }else {
124
                    Intent intent = new Intent(getActivity(), VideoDetaislActivity.class);
125
                    intent.putExtra("list", talkRecommendBeans);
126
                    intent.putExtra("pos", pos);
127
                    startActivity(intent);
128
                }
117 129
            }
118 130
        });
119 131

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

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

+ 2 - 1
app/src/main/res/layout/activity_personal_page.xml

@ -96,7 +96,8 @@
96 96
                android:layout_height="30dp"
97 97
                android:layout_alignParentRight="true"
98 98
                android:layout_marginRight="15dp"
99
                android:src="@drawable/app_header_edit_icon"/>
99
                android:src="@drawable/app_header_edit_icon"
100
                android:visibility="gone"/>
100 101
101 102
        </RelativeLayout>
102 103
    </LinearLayout>

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

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

Beth Lyttle - Gogs: Go Git Service
online-crypto-casino2100 (Beth Lyttle)

Seguindo