bug修复

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

@@ -155,7 +155,10 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        chargingShareBean.setText("快来看看"+qadata.userVo.nickName+"都在分享什么吧。");
        username_text.setText(qadata.userVo.nickName+"");
        username_content.setText(qadata.userVo.carName+"");
        if(TextUtils.isEmpty(qadata.userVo.carName))
            username_content.setText("");
        else
            username_content.setText(qadata.userVo.carName+"");
        data_info.setText(qadata.userVo.topicNums + "");
        if (!"".equals(qadata.userVo.headImgUrl)) {
            Picasso.with(this)
@@ -227,6 +230,8 @@ public class PersonalPageActivity extends Activity implements View.OnClickListen
        waterFallAdapter.setOnRecyclerItemClickListener(new RecyclerItemTypeClickListener() {
            @Override
            public void onItemClickListener(int position, int index) {
                if(index == 2)
                    return;
                startActivity(new Intent(PersonalPageActivity.this, TopicDetailsActivity.class).putExtra("topicId", waterFallAdapter.getCurrentData().get(position).topicId + ""));
            }
        });

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

@@ -5,7 +5,9 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -21,11 +23,13 @@ import android.os.Handler;
import android.os.Message;
import android.provider.MediaStore;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.AlertDialog;
import android.telephony.TelephonyManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
@@ -308,11 +312,16 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    private ArrayList<String> publishArray = new ArrayList<>();
    private int publishCount = 0;
    final int reqTopic = -100;
    final int reqTopic = 100;
    @Override
    public void onClick(View v) {
        switch (v.getId()) {
            case R.id.publishtopic_choose_topic_de:
                mPublishtopicChooseTopic.setText("# 选择话题");
                mPublishTopicDe.setVisibility(View.GONE);
                talkRecommendBean = null;
                break;
            case R.id.publishtopic_choose_topic:
                startActivityForResult(new Intent(this, TopicActivity.class), reqTopic);
                break;
@@ -323,7 +332,8 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                        imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
                    }
                }
                finish();
                showDialogToExit();
//                finish();
                break;
        }
    }
@@ -472,9 +482,9 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
    }
    @Override
    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
        if (requestCode == -100 && resultCode == -100) {
        if (requestCode == reqTopic && resultCode == -100) {
            talkRecommendBean = (TalkRecommendBean) data.getSerializableExtra("topic");
            if (talkRecommendBean != null) {
                mPublishtopicChooseTopic.setText("# " + talkRecommendBean.topicName);
@@ -881,4 +891,28 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
            }
        });
    }
    private void showDialogToExit(){
        AlertDialog.Builder builder = new AlertDialog.Builder(PublishPicTopicActivity.this);
        builder.setTitle("提示");
        builder.setMessage("确认取消发布？");
        builder.setCancelable(false);
        builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialog, int which) {
                finish();
            }
        });
        builder.setNegativeButton("取消", null);
        builder.create().show();
    }
    @Override
    public boolean onKeyUp(int keyCode, KeyEvent event) {
        if (keyCode == KeyEvent.KEYCODE_BACK) {
            showDialogToExit();
            return true;
        }
        return false;
    }
}

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

@@ -138,8 +138,15 @@ findViewById(R.id.request_refresh).setOnClickListener(this);
        waterFallAdapter.setOnRecyclerItemClickListener(new RecyclerItemTypeClickListener() {
            @Override
            public void onItemClickListener(int position, int index) {
                String topicId = waterFallAdapter.getCurrentData().get(position).topicId+"";
                startActivity(new Intent(TopicDetailsActivity.this, TopicDetailsActivity.class).putExtra("topicId", topicId));
                int pos = position - 1;
                ArrayList<TalkRecommendBean> talkRecommendBeans = waterFallAdapter.getCurrentData();
                Intent intent = new Intent(TopicDetailsActivity.this, VideoDetaislActivity.class);
                intent.putExtra("list", talkRecommendBeans);
                intent.putExtra("pos", pos);
                startActivity(intent);
//                String topicId = waterFallAdapter.getCurrentData().get(position).topicId+"";
//                startActivity(new Intent(TopicDetailsActivity.this, TopicDetailsActivity.class).putExtra("topicId", topicId));
            }
        });
    }

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

@@ -173,6 +173,14 @@ public class WaterFallAdapter 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/fragment/TalkRecommendFragment.java

@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Toast;
import com.andview.refreshview.XRefreshView;
@@ -47,6 +48,7 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
    private View view;
    StaggeredGridLayoutManager layoutManager;
    private ImageView iv_ask;
    private LinearLayout share_info_icon;
    private static final String TAG = "TalkRecommendFragment";
    private int page = 1;
@@ -58,14 +60,17 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
        requestHeaderData();
    }
    boolean isFirst = false;
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        view = inflater.inflate(R.layout.activity_talk_recommend_tj, null);
        initXRefreshView();
        share_info_icon = view.findViewById(R.id.share_info_icon);
        String isFirstComeIn = ProfileManager.getInstance().getIsFirstComeIn(getActivity());
        if(TextUtils.isEmpty(isFirstComeIn)){
            isFirst = true;
            ProfileManager.getInstance().setFirstComeIn(getActivity(), "label");
            view.findViewById(R.id.share_info_icon).setVisibility(View.VISIBLE);
        }
@@ -164,8 +169,12 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
                //当前状态为停止滑动状态SCROLL_STATE_IDLE时
                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
                    iv_ask.setVisibility(View.VISIBLE);
                    if(isFirst)
                        share_info_icon.setVisibility(View.VISIBLE);
                } else if (newState == RecyclerView.SCREEN_STATE_ON) {
                    iv_ask.setVisibility(View.GONE);
                    if(isFirst)
                        share_info_icon.setVisibility(View.GONE);
                }
            }
@@ -291,4 +300,6 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
            }
        });
    }
}

app/src/main/res/drawable/bg_yuan_black.xml

@@ -3,7 +3,7 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
    <item>
        <shape>
            <stroke android:width="0.6dp" android:color="@color/white" /><!--边框颜色-->
            <stroke android:width="0.6dp" android:color="#000000" /><!--边框颜色-->
            <solid android:color="#000000" /><!--填充色-->
            <corners android:radius="10dp" />