代码更新

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -73,10 +73,10 @@ public class MainApplication extends MultiDexApplication {
    public static String firstPoint = "";
    public static Boolean firstSsyd;
    public static String password = "";
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
//    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String url = "http://59.110.68.162";// 充电桩测试环境
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
    public static String urlNew = "http://123.56.67.7:83/api/0200";// 一电测试环境
//    public static String urlNew = "https://api.touchev.com:83/api/0200";// 一电正式环境
    public static String pic_url = "http:/s/cdz.evcharge.cc/zhannew/uploadfile/";
    //	public static String url = "https://cdz.d1ev.com";
    public static String build_flag = "0";

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

@@ -64,6 +64,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
    private ConstraintLayout loadingView;
    private CommentAdapter commentAdapter;
    private ConstraintLayout noDataView;
    public String type;
    public static ChatContentCommentListDialogFragment newInstance(ChatRecommendBean bean) {
        Bundle args = new Bundle();
@@ -159,9 +160,8 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
    public void onClick(View view) {
        switch (view.getId()) {
            case R.id.bWriteComment: // 写评论
                CommonDialogFragment commonDialogFragment = CommonDialogFragment.newInstance(bCommentContent.getText().toString(), CommonDialogFragment.DialogTypeComment);
                CommonDialogFragment commonDialogFragment = CommonDialogFragment.newInstance(bCommentContent.getText().toString(), "优质评论会被优先展示", CommonDialogFragment.DialogTypeComment);
                commonDialogFragment.show(getChildFragmentManager(), "CommonDialogFragment");
                commonDialogFragment.setOnCommonDialogFragmentListener(new CommonDialogFragment.OnCommonDialogFragmentListener() {
                    @Override
                    public void updateComment(String comment) {
@@ -223,6 +223,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
            @Override
            public void onResponse(String response) {
                Log.d(TAG, "onResponse: " + response);
                String code = JsonUtils.getKeyResult(response, "code");
                String desc = JsonUtils.getKeyResult(response, "desc");
                if ("1000".equals(code)) {
@@ -233,6 +234,9 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
                    if (chatContentCommentListDialogFragmentListener != null) {
                        chatContentCommentListDialogFragmentListener.updateCommentNum(chatRecommendBean.commentNums);
                    }
                } else if ("8010".equals(code)) {
                    startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                } else {
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                }
@@ -328,6 +332,7 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
        private TextView replyLabel;
        private ConstraintLayout replyAndDeleteView;
        private TextView deleteComment;
        private ConstraintLayout listItemView;
        public CommentHolder(LayoutInflater layoutInflater, ViewGroup parent) {
            super(layoutInflater.inflate(R.layout.list_item_comment, parent, false));
@@ -348,13 +353,14 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
            replyInfo = itemView.findViewById(R.id.replyInfo);
            replyLabel = itemView.findViewById(R.id.replyLabel);
            deleteComment = itemView.findViewById(R.id.deleteComment);
            listItemView = itemView.findViewById(R.id.listItemView);
        }
        private void initListener() {
            likeView.setOnClickListener(this);
            replyInfo.setOnClickListener(this);
            deleteComment.setOnClickListener(this);
            listItemView.setOnClickListener(this);
        }
        @Override
@@ -366,12 +372,10 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
                case R.id.replyInfo: //  点击查看回复列表
                    break;
                case R.id.deleteComment: // 删除评论操作
                    if (MainApplication.isLogin()) {
                        loginSign();
                    } else {
                        startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
                        ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
                    }
                    deleteComment();
                    break;
                case R.id.listItemView: // 回复
                    break;
            }
        }
@@ -463,44 +467,19 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
            });
        }
        // 服务器签名验证
        private void loginSign() {
            String url = MainApplication.urlNew + "/topic/sign.do";
            final Map<String, String> map = new HashMap<>();
            map.put("fileNames", "android");
            map.put("targetType", ChatRecommendBean.TARGET_TYPE_IMAGE_TEXT + "");
            CommonParams.addCommonParams(map);
            OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
                @Override
                public void onError(Call call, Exception e) {
                    ToastUtil.showToast(getContext(), e.getMessage(), Toast.LENGTH_SHORT);
                }
                @Override
                public void onResponse(String response) {
                    String code = JsonUtils.getKeyResult(response, "code");
                    String desc = JsonUtils.getKeyResult(response, "desc");
                    if ("1000".equals(code)) {
                        deleteComment();
                    } else if ("8010".equals(code)) {
                        startActivity(new Intent(getContext(), LoginActivity.class));
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);
                    } else {
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                    }
                }
            });
        }
        private void deleteComment() {
            if (!MainApplication.isLogin()) {
                startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
                ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
                return;
            }
            String url = MainApplication.urlNew + "/topic/del.do";
            final Map<String, String> map = new HashMap<>();
            map.put("targetId", bean.id + "");
            map.put("targetType", "25");
            map.put("userId", bean.userId + "");
            CommonParams.addCommonParams(map);
            OkHttpUtils.post().params(map).url(url).build().connTimeOut(6000).readTimeOut(6000).execute(new StringCallback() {
                @Override
                public void onError(Call call, Exception e) {
@@ -521,6 +500,9 @@ public class ChatContentCommentListDialogFragment extends DialogFragment impleme
                        if (chatContentCommentListDialogFragmentListener != null) {
                            chatContentCommentListDialogFragmentListener.updateCommentNum(chatRecommendBean.commentNums);
                        }
                    } else if ("8010".equals(code)) {
                        startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                    } else {
                        ToastUtil.showToast(getContext(), desc, Toast.LENGTH_SHORT);
                    }

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

@@ -7,7 +7,6 @@ import android.support.constraint.ConstraintLayout;
import android.support.v4.app.DialogFragment;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
@@ -27,6 +26,7 @@ public class CommonDialogFragment extends DialogFragment {
    private static final String TAG = "CommonDialogFragment";
    private static final String ARG_COMMENT = "comment";
    private static final String ARG_HINT = "hint";
    private static final String ARG_TYPE = "type";
    private Dialog dialogFragment;
    private String type;
@@ -37,10 +37,11 @@ public class CommonDialogFragment extends DialogFragment {
    private ConstraintLayout countInfo;
    private TextView count;
    public static CommonDialogFragment newInstance(String comment, String type) {
    public static CommonDialogFragment newInstance(String comment,String hint, String type) {
        CommonDialogFragment dialogFragment = new CommonDialogFragment();
        Bundle args = new Bundle();
        args.putString(ARG_COMMENT, comment);
        args.putString(ARG_HINT, hint);
        args.putString(ARG_TYPE, type);
        dialogFragment.setArguments(args);
        return dialogFragment;
@@ -49,6 +50,9 @@ public class CommonDialogFragment extends DialogFragment {
    @Override
    public Dialog onCreateDialog(Bundle savedInstanceState) {
        final String comment = getArguments().getString(ARG_COMMENT);
        final String hint = getArguments().getString(ARG_HINT);
        type = getArguments().getString(ARG_TYPE);
        dialogFragment = new Dialog(getActivity(), R.style.BottomDialog);
        // 外部点击设置为可取消
        dialogFragment.setCancelable(true);
@@ -73,7 +77,7 @@ public class CommonDialogFragment extends DialogFragment {
        editText.setText(comment);
        editText.setSelection(comment.length());
        editText.setHint(hint);
        updateView(comment);
        send.setOnClickListener(new View.OnClickListener() {

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

@@ -2,6 +2,7 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/listItemView"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    tools:background="#424242">
@@ -98,8 +99,8 @@
        android:layout_width="wrap_content"
        android:layout_height="42dp"
        android:paddingLeft="29dp"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/content"
        tools:background="#06648f">