dxh 6 years ago
parent
commit
5d1353f845

+ 2 - 2
app/src/main/AndroidManifest.xml

@ -1,8 +1,8 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    package="com.electric.chargingpile"
4
    android:versionCode="73"
5
    android:versionName="3.2.1">
4
    android:versionCode="74"
5
    android:versionName="3.2.2beta">
6 6
7 7
    <!-- 极光 -->
8 8
    <permission

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

@ -8,7 +8,9 @@ import android.os.Bundle;
8 8
import android.support.annotation.Nullable;
9 9
import android.support.v7.widget.RecyclerView;
10 10
import android.support.v7.widget.StaggeredGridLayoutManager;
11
import android.text.TextUtils;
11 12
import android.view.View;
13
import android.widget.ImageView;
12 14
import android.widget.TextView;
13 15
import android.widget.Toast;
14 16
@ -24,6 +26,7 @@ import com.electric.chargingpile.util.JsonUtils;
24 26
import com.electric.chargingpile.util.NetUtil;
25 27
import com.electric.chargingpile.util.ToastUtil;
26 28
import com.electric.chargingpile.view.RoundImageView;
29
import com.mabeijianxi.smallvideorecord2.Log;
27 30
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
28 31
import com.squareup.picasso.Picasso;
29 32
import com.squareup.picasso.Target;
@ -47,6 +50,7 @@ import okhttp3.Call;
47 50
 */
48 51
public class PersonalPageActivity extends Activity implements View.OnClickListener {
49 52
53
    private static final String TAG = "PersonalPageActivity";
50 54
    private XRefreshView xRefreshView;
51 55
    private StaggeredGridLayoutManager layoutManager;
52 56
    private WaterFallAdapter waterFallAdapter;
@ -56,6 +60,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
56 60
    private TextView username_text, username_content, data_info;
57 61
    private RoundImageView iconPic;
58 62
    private TextView banquan;
63
    private ImageView user_edit;
64
    private String targetUserId;
59 65
60 66
    @Override
61 67
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@ -80,7 +86,14 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
80 86
        map.put("limit", "20");
81 87
        if (MainApplication.isLogin()) {
82 88
            map.put("userId", MainApplication.userId);
83
            map.put("targetUserId", MainApplication.userId);
89
            if(TextUtils.isEmpty(targetUserId)){
90
                user_edit.setVisibility(View.VISIBLE);
91
                map.put("targetUserId", MainApplication.userId);//说明是自己
92
            }
93
            else{
94
                user_edit.setVisibility(View.GONE);
95
                map.put("targetUserId", targetUserId);
96
            }
84 97
        }
85 98
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
86 99
            @Override
@ -94,6 +107,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
94 107
95 108
            @Override
96 109
            public void onResponse(String response) {
110
                android.util.Log.e(TAG, "response:" + response);
111
                LogUtils.e(response);
97 112
                if (page == 1)
98 113
                    xRefreshView.stopRefresh();
99 114
                else
@ -163,6 +178,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
163 178
    }
164 179
165 180
    private void initView() {
181
        targetUserId = getIntent().getStringExtra("targetUserId");
182
        user_edit = (ImageView) findViewById(R.id.user_edit);
166 183
        banquan = (TextView) findViewById(R.id.banquan);
167 184
        iconPic = (RoundImageView) findViewById(R.id.user_avater);
168 185
        username_content = (TextView) findViewById(R.id.username_content);
@ -211,6 +228,11 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
211 228
                }
212 229
                break;
213 230
            case R.id.iv_more:
231
232
//                if(null == chargingShareBean){
233
//                    getShareData();
234
//                    return;
235
//                }
214 236
                ChargingShareBean chargingShareBean = new ChargingShareBean();
215 237
//                chargingShareBean.setIcon(shareThumbnail);
216 238
//                chargingShareBean.setTitle(shareTitle);
@ -225,6 +247,39 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
225 247
        }
226 248
    }
227 249
250
    private void getShareData() {
251
        String url = MainApplication.urlNew + "/user/homepage.do";
252
        Map<String, String> map = new HashMap<>();
253
        map.put("page", targetUserId + "");
254
        map.put("limit", "20");
255
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
256
            @Override
257
            public void onError(Call call, Exception e) {
258
                if (page == 1)
259
                    xRefreshView.stopRefresh();
260
                else
261
                    xRefreshView.setLoadComplete(true);
262
                ToastUtil.showToast(getApplicationContext(), "加载失败,请重试", Toast.LENGTH_SHORT);
263
            }
264
265
            @Override
266
            public void onResponse(String response) {
267
                Log.e("demo", response);
268
                if (page == 1)
269
                    xRefreshView.stopRefresh();
270
                else
271
                    xRefreshView.setLoadComplete(true);
272
273
                String rtnCode = JsonUtils.getKeyResult(response, "code");
274
                if ("1000".equals(rtnCode)) {
275
                    String rtnMsg = JsonUtils.getKeyResult(response, "data");
276
                    HomePageBean qadata = (HomePageBean) JsonUtils.parseToObjectBean(rtnMsg, HomePageBean.class);
277
278
                }
279
            }
280
        });
281
    }
282
228 283
    private void showSimpleBottomSheetGrid(final ChargingShareBean chargingShareBean) {
229 284
        final int TAG_SHARE_WECHAT_FRIEND = 0;
230 285
        final int TAG_SHARE_WECHAT_MOMENT = 1;

+ 3 - 0
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@ -44,6 +44,7 @@ import android.widget.RelativeLayout;
44 44
import android.widget.TextView;
45 45
import android.widget.Toast;
46 46
47
import com.blankj.utilcode.util.LogUtils;
47 48
import com.electric.chargingpile.R;
48 49
import com.electric.chargingpile.application.MainApplication;
49 50
import com.electric.chargingpile.data.AuthSignBean;
@ -839,6 +840,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
839 840
        map.put("content", et_context.getText().toString());
840 841
        map.put("urls", urls);
841 842
        map.put("topicId", topicId);
843
        map.put("targetType", "24");
842 844
        map.put("coverImgUrl", "");
843 845
        if (MainApplication.isLogin()) {
844 846
            map.put("userId", MainApplication.userId);
@ -858,6 +860,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
858 860
            @Override
859 861
            public void onResponse(String response) {
860 862
                Log.e(TAG, "response:" + response);
863
                LogUtils.e(response);
861 864
                dialog.cancel();
862 865
                publishArray.clear();
863 866
                publishCount = 0;

+ 8 - 0
app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java

@ -239,6 +239,14 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
239 239
                    }
240 240
                }
241 241
            });
242
            user_avater.setOnClickListener(new View.OnClickListener() {
243
                @Override
244
                public void onClick(View view) {
245
                    if (onRecyclerItemClickListener != null) {
246
                        onRecyclerItemClickListener.onItemClickListener(getLayoutPosition(), 2);
247
                    }
248
                }
249
            });
242 250
        }
243 251
    }
244 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>