bug修复

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

@@ -126,10 +126,10 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
                        if (null != qadata.list && qadata.list.size() > 0) {
//                            shareUrl = qadata.list.get(0).shareUrl;
                            chargingShareBean.setIcon(qadata.list.get(0).coverImgUrl);
                            chargingShareBean.setTitle(qadata.list.get(0).topicName);
                            chargingShareBean.setUrl(qadata.list.get(0).shareUrl);
                            chargingShareBean.setText(qadata.list.get(0).title);
                            chargingShareBean.setIcon(qadata.userVo.coverImgUrl);
                            chargingShareBean.setTitle(qadata.userVo.nickName+"的个人主页");
                            chargingShareBean.setUrl(qadata.userVo.shareUrl);
                            chargingShareBean.setText("快来看看"+qadata.userVo.nickName+"都在分享什么吧。");
                        }
                    }
                    if (page == 1)
@@ -154,8 +154,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
    }
    private void initHeaderData(HomePageBean qadata) {
        username_text.setText(qadata.userVo.nickName);
        username_content.setText(qadata.userVo.carName);
        username_text.setText(qadata.userVo.nickName+"");
        username_content.setText(qadata.userVo.carName+"");
        data_info.setText(qadata.userVo.topicNums + "");
        if (!"".equals(qadata.userVo.headImgUrl)) {
            Picasso.with(this)

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

@@ -23,6 +23,7 @@ import android.widget.Toast;
import com.aspsine.irecyclerview.IRecyclerView;
import com.aspsine.irecyclerview.OnLoadMoreListener;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.NetworkUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.adapter.WaterFallAdapter;
import com.electric.chargingpile.application.MainApplication;
@@ -32,6 +33,7 @@ import com.electric.chargingpile.data.TalkRecommendBean;
import com.electric.chargingpile.iview.RecyclerItemTypeClickListener;
import com.electric.chargingpile.util.ImageDisplayUtils;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.NetUtil;
import com.electric.chargingpile.util.ScreenUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.view.PullToZoomScrollView3;
@@ -84,7 +86,14 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
        initListeners();
        initListeners(findViewById(R.id.make_header_lines));
        requestData();
        if(NetUtil.CheckNetwork(this)){
            requestData();
        }else {
findViewById(R.id.no_net_view).setVisibility(View.VISIBLE);
findViewById(R.id.iv_back_nonet).setOnClickListener(this);
findViewById(R.id.request_refresh).setOnClickListener(this);
        }
//        requestShareData();
    }
@@ -106,7 +115,8 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
        scrollview = (PullToZoomScrollView3) findViewById(R.id.scroll_view);
        scrollview.setVerticalScrollBarEnabled(false);
        screenHeight = ScreenUtils.getScreenHeight(this);
        ImageView iv_ask = (ImageView) findViewById(R.id.iv_ask);
        iv_ask.setOnClickListener(this);
    }
    private void initListeners() {
@@ -134,9 +144,14 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
        });
    }
    ChargingShareBean chargingShareBean = new ChargingShareBean();
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.iv_ask:
                startActivity(new Intent(this, PublishItemsActivity.class));
//                Toast.makeText(getActivity(), "分享", Toast.LENGTH_SHORT).show();
                break;
            case R.id.user_content_more:
                topic_content.setText(contentAll);
                user_content_more.setVisibility(View.GONE);
@@ -147,13 +162,19 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
                    ToastUtil.showToast(this.getApplicationContext(),"请先登录", Toast.LENGTH_SHORT);
                    return;
                }
                ChargingShareBean chargingShareBean = new ChargingShareBean();
//                chargingShareBean.setIcon(shareThumbnail);
//                chargingShareBean.setTitle(shareTitle);
//                chargingShareBean.setUrl(shareUrl);
                chargingShareBean.setText("");
                if(null == chargingShareBean.getUrl() || TextUtils.isEmpty(chargingShareBean.getUrl()))
                    return;
                showSimpleBottomSheetGrid(chargingShareBean);
                break;
            case R.id.request_refresh:
                if(NetUtil.CheckNetwork(this)){
                    requestData();
                }
                break;
            case R.id.iv_back_nonet:
                finish();
                break;
            case R.id.iv_back:
                finish();
                break;
@@ -181,7 +202,7 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
                                break;
                            case R.id.tv_3:
//                                Log.e(TAG, "onClick: 111" );
                                sort = 1;
                                sort = 3;
                                sortPopWindow.dismiss();
                                sort_text_info.setText("最热");
                                page = 1;
@@ -246,7 +267,7 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
            @Override
            public void onResponse(String response) {
                findViewById(R.id.no_net_view).setVisibility(View.GONE);
                String rtnCode = JsonUtils.getKeyResult(response, "code");
                if ("1000".equals(rtnCode)) {
                    String rtnMsg = JsonUtils.getKeyResult(response, "data");
@@ -254,9 +275,25 @@ public class TopicDetailsActivity extends FragmentActivity implements View.OnCli
                    if (!haveLoadHeaderData) {
                        haveLoadHeaderData = true;
                        initHeaderData(qadata.list);
                        if (null != qadata.list && qadata.list.size() > 0) {
                            chargingShareBean.setIcon(qadata.list.get(0).coverImgUrl);
                            chargingShareBean.setTitle(qadata.list.get(0).topicName);
                            chargingShareBean.setUrl(qadata.list.get(0).shareUrl);
                            chargingShareBean.setText(qadata.list.get(0).title);
                        }
                    }
                    if (page == 1)
                    if (page == 1){
                        waterFallAdapter.setData(qadata.list);
                        if(null == qadata.list || qadata.list.size() == 0){
                            findViewById(R.id.no_content_view).setVisibility(View.VISIBLE);
                            comment_data.setVisibility(View.GONE);
                        }else {
                            findViewById(R.id.no_content_view).setVisibility(View.GONE);
                            comment_data.setVisibility(View.VISIBLE);
                        }
                    }
                    else
                        waterFallAdapter.addData(qadata.list);

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

@@ -142,8 +142,11 @@ public class LayoutAdapter extends RecyclerView.Adapter<IViewHolder> {
        }
        TalkRecommendBean talkRecommendBean = talkRecommendBeans.get(position - 1);
        simpleViewHolder.recycler_view_title.setText(talkRecommendBean.title);
        if(talkRecommendBean.likeNums == 0){
        if (TextUtils.isEmpty(talkRecommendBean.title))
            simpleViewHolder.recycler_view_title.setText("分享内容");
        else
            simpleViewHolder.recycler_view_title.setText(talkRecommendBean.title);
        if (talkRecommendBean.likeNums == 0) {
            simpleViewHolder.recycler_view_zan.setVisibility(View.GONE);
        }else if(talkRecommendBean.likeNums > 999){
            simpleViewHolder.recycler_view_zan.setVisibility(View.VISIBLE);

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

@@ -21,6 +21,7 @@ public class HomePageBean {
        public String carSeriesName;
        public String topicName;
        public String coverImgUrl;
        public String shareUrl;
        public String[] imgUrls;
        public int topicId;
        public int likeNums;

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

@@ -391,7 +391,7 @@ public class SvVideoShowView implements View.OnClickListener {
    }
    public void updateView() {
        ToastUtil.showToast(activity, "updateView", Toast.LENGTH_LONG);
//        ToastUtil.showToast(activity, "updateView", Toast.LENGTH_LONG);
    }
    public void initAndPlay() {

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

@@ -139,7 +139,8 @@
        android:id="@+id/xrefreshview"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="#fff">
        android:background="#fff"
        android:visibility="visible">
        <android.support.v7.widget.RecyclerView
            android:id="@+id/recycler_view_test_rv"
@@ -148,4 +149,21 @@
            android:scrollbars="vertical" />
    </com.andview.refreshview.XRefreshView>
    <LinearLayout
        android:id="@+id/no_content_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center_horizontal"
        android:background="@color/color_white"
        android:orientation="vertical">
        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:text="@string/personal_shar_info_content"
            android:layout_marginTop="147dp"
            android:textSize="14sp"
            android:textColor="#555555"/>
    </LinearLayout>
</LinearLayout>

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

@@ -34,6 +34,7 @@
        </LinearLayout>
    </com.electric.chargingpile.view.PullToZoomScrollView3>
    <RelativeLayout
        android:id="@+id/rl_title"
        android:layout_width="fill_parent"
@@ -79,4 +80,68 @@
    </RelativeLayout>
</RelativeLayout>
    <ImageView
        android:id="@+id/iv_ask"
        android:layout_width="56dp"
        android:layout_height="56dp"
        android:layout_alignParentRight="true"
        android:layout_alignParentBottom="true"
        android:layout_marginRight="15dp"
        android:layout_marginBottom="72dp"
        android:src="@drawable/app_share_talk_icon"/>
    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:background="@color/white"
        android:id="@+id/no_net_view"
        android:visibility="gone">
        <RelativeLayout
            android:id="@+id/rl_title_nonet"
            android:layout_width="fill_parent"
            android:layout_height="44dp"
            android:background="@color/white"
            android:visibility="visible">
            <ImageView
                android:id="@+id/iv_back_nonet"
                android:layout_width="wrap_content"
                android:layout_height="match_parent"
                android:layout_alignParentLeft="true"
                android:layout_centerVertical="true"
                android:contentDescription="@null"
                android:paddingLeft="15dp"
                android:paddingRight="15dp"
                android:src="@drawable/icon_lvback1119" />
        </RelativeLayout>
        <TextView
            android:id="@+id/banquan"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="260dp"
            android:text="小主网络跑掉了，请检查网络~"
            android:gravity="center"
            android:layout_centerHorizontal="true"
            android:textSize="14sp"
            android:textColor="#555555" />
        <TextView
            android:id="@+id/request_refresh"
            android:layout_width="144dp"
            android:layout_height="40dp"
            android:layout_centerHorizontal="true"
            android:layout_marginTop="20dp"
            android:layout_below="@+id/banquan"
            android:text="点击重新尝试"
            android:gravity="center"
            android:textSize="14sp"
            android:textColor="#555555"
            android:background="@drawable/bg_route_line_818181"/>
    </RelativeLayout>
</RelativeLayout>

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

@@ -149,7 +149,26 @@
        app:refreshEnabled="false"
        app:loadMoreFooterLayout="@layout/layout_irecyclerview_load_more_footer"
        android:overScrollMode="never"
        android:visibility="visible"
        />
    <LinearLayout
        android:id="@+id/no_content_view"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center_horizontal"
        android:background="@color/color_white"
        android:orientation="vertical"
        android:visibility="gone">
        <TextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:text="还没有任何内容哦，快来抢沙发~"
            android:layout_marginTop="147dp"
            android:textSize="14sp"
            android:textColor="#555555"/>
    </LinearLayout>
</LinearLayout>

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

@@ -85,7 +85,7 @@
        android:layout_marginTop="150dp"
        android:gravity="center_horizontal"
        android:orientation="vertical"
        android:visibility="gone">
        android:visibility="visible">
        <TextView
            android:layout_width="123dp"
@@ -96,6 +96,16 @@
            android:visibility="gone"
            android:textSize="14sp" />
        <ProgressBar
            android:id="@+id/pull_to_refresh_progress"
            style="?android:attr/progressBarStyleSmall"
            android:gravity="center"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:indeterminateTint="@color/click"
            android:layout_gravity="center"
            android:indeterminate="true" />
        <TextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"

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

@@ -11,7 +11,7 @@
        android:layout_centerHorizontal="true"
        android:contentDescription="@null"
        android:src="@drawable/bg_w_4" />
        android:src="@drawable/bg_w_41" />
    <ImageView
        android:layout_width="200dp"

app/src/main/res/values/strings.xml

@@ -204,4 +204,6 @@
    <string name="refresh_load_succeed">Loading succeeded</string>
    <string name="refresh_load_succeed_nomore">That\'s All!</string>
    <string name="refresh_load_fail">Loading failed</string>
    <string name="personal_shar_info_content">快来分享吧\n
小主大家都很期待你的精彩内容哦</string>
</resources>