登录

app/src/main/AndroidManifest.xml

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

app/src/main/java/com/electric/chargingpile/activity/PersonalPageActivity.java

@@ -8,7 +8,9 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -24,6 +26,7 @@ import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.NetUtil;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.RoundImageView;
import com.mabeijianxi.smallvideorecord2.Log;
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
import com.squareup.picasso.Picasso;
import com.squareup.picasso.Target;
@@ -47,6 +50,7 @@ import okhttp3.Call;
 */
public class PersonalPageActivity extends Activity implements View.OnClickListener {
    private static final String TAG = "PersonalPageActivity";
    private XRefreshView xRefreshView;
    private StaggeredGridLayoutManager layoutManager;
    private WaterFallAdapter waterFallAdapter;
@@ -56,6 +60,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
    private TextView username_text, username_content, data_info;
    private RoundImageView iconPic;
    private TextView banquan;
    private ImageView user_edit;
    private String targetUserId;
    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -80,7 +86,14 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        map.put("limit", "20");
        if (MainApplication.isLogin()) {
            map.put("userId", MainApplication.userId);
            map.put("targetUserId", MainApplication.userId);
            if(TextUtils.isEmpty(targetUserId)){
                user_edit.setVisibility(View.VISIBLE);
                map.put("targetUserId", MainApplication.userId);//说明是自己
            }
            else{
                user_edit.setVisibility(View.GONE);
                map.put("targetUserId", targetUserId);
            }
        }
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
@@ -94,6 +107,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
            @Override
            public void onResponse(String response) {
                android.util.Log.e(TAG, "response:" + response);
                LogUtils.e(response);
                if (page == 1)
                    xRefreshView.stopRefresh();
                else
@@ -163,6 +178,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
    }
    private void initView() {
        targetUserId = getIntent().getStringExtra("targetUserId");
        user_edit = (ImageView) findViewById(R.id.user_edit);
        banquan = (TextView) findViewById(R.id.banquan);
        iconPic = (RoundImageView) findViewById(R.id.user_avater);
        username_content = (TextView) findViewById(R.id.username_content);
@@ -211,6 +228,11 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
                }
                break;
            case R.id.iv_more:
//                if(null == chargingShareBean){
//                    getShareData();
//                    return;
//                }
                ChargingShareBean chargingShareBean = new ChargingShareBean();
//                chargingShareBean.setIcon(shareThumbnail);
//                chargingShareBean.setTitle(shareTitle);
@@ -225,6 +247,39 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        }
    }
    private void getShareData() {
        String url = MainApplication.urlNew + "/user/homepage.do";
        Map<String, String> map = new HashMap<>();
        map.put("page", targetUserId + "");
        map.put("limit", "20");
        OkHttpUtils.get().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
            @Override
            public void onError(Call call, Exception e) {
                if (page == 1)
                    xRefreshView.stopRefresh();
                else
                    xRefreshView.setLoadComplete(true);
                ToastUtil.showToast(getApplicationContext(), "加载失败，请重试", Toast.LENGTH_SHORT);
            }
            @Override
            public void onResponse(String response) {
                Log.e("demo", response);
                if (page == 1)
                    xRefreshView.stopRefresh();
                else
                    xRefreshView.setLoadComplete(true);
                String rtnCode = JsonUtils.getKeyResult(response, "code");
                if ("1000".equals(rtnCode)) {
                    String rtnMsg = JsonUtils.getKeyResult(response, "data");
                    HomePageBean qadata = (HomePageBean) JsonUtils.parseToObjectBean(rtnMsg, HomePageBean.class);
                }
            }
        });
    }
    private void showSimpleBottomSheetGrid(final ChargingShareBean chargingShareBean) {
        final int TAG_SHARE_WECHAT_FRIEND = 0;
        final int TAG_SHARE_WECHAT_MOMENT = 1;

app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@@ -44,6 +44,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.blankj.utilcode.util.LogUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.AuthSignBean;
@@ -839,6 +840,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
        map.put("content", et_context.getText().toString());
        map.put("urls", urls);
        map.put("topicId", topicId);
        map.put("targetType", "24");
        map.put("coverImgUrl", "");
        if (MainApplication.isLogin()) {
            map.put("userId", MainApplication.userId);
@@ -858,6 +860,7 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            @Override
            public void onResponse(String response) {
                Log.e(TAG, "response:" + response);
                LogUtils.e(response);
                dialog.cancel();
                publishArray.clear();
                publishCount = 0;

app/src/main/java/com/electric/chargingpile/adapter/LayoutAdapter.java

@@ -239,6 +239,14 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
                    }
                }
            });
            user_avater.setOnClickListener(new View.OnClickListener() {
                @Override
                public void onClick(View view) {
                    if (onRecyclerItemClickListener != null) {
                        onRecyclerItemClickListener.onItemClickListener(getLayoutPosition(), 2);
                    }
                }
            });
        }
    }

app/src/main/java/com/electric/chargingpile/data/HomePageBean.java

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

app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java

@@ -15,7 +15,9 @@ import android.widget.Toast;
import com.andview.refreshview.XRefreshView;
import com.andview.refreshview.XRefreshView.SimpleXRefreshListener;
import com.electric.chargingpile.R;
import com.electric.chargingpile.activity.PersonalPageActivity;
import com.electric.chargingpile.activity.PublishItemsActivity;
import com.electric.chargingpile.activity.TopicDetailsActivity;
import com.electric.chargingpile.activity.VideoDetaislActivity;
import com.electric.chargingpile.adapter.LayoutAdapter;
import com.electric.chargingpile.application.MainApplication;
@@ -109,11 +111,21 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
            @Override
            public void onItemClickListener(int position, int type) {
                int pos = position - 1;
                Intent intent = new Intent(getActivity(), VideoDetaislActivity.class);
                ArrayList<TalkRecommendBean> talkRecommendBeans = layoutAdapter.getCurrentData();
                intent.putExtra("list", talkRecommendBeans);
                intent.putExtra("pos", pos);
                startActivity(intent);
                if(type == 2){
                    startActivity(new Intent(getActivity(), PersonalPageActivity.class).putExtra("targetUserId", talkRecommendBeans.get(pos).addUserId+""));
                    return;
                }
                if(talkRecommendBeans.get(pos).targetType == 25){
                    startActivity(new Intent(getActivity(), TopicDetailsActivity.class).putExtra("topicId", talkRecommendBeans.get(pos).topicId+""));
                }else {
                    Intent intent = new Intent(getActivity(), VideoDetaislActivity.class);
                    intent.putExtra("list", talkRecommendBeans);
                    intent.putExtra("pos", pos);
                    startActivity(intent);
                }
            }
        });

app/src/main/res/layout/activity_fram_qa.xml

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

app/src/main/res/layout/activity_personal_page.xml

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

app/src/main/res/layout/activity_talk_tj.xml

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