-81"> 847 
//                    intent.putExtra("et_phone", et_phone.getText().toString());
848 
//                    intent.putExtra("fast_num", fast_num.getText().toString());
849 
//                    intent.putExtra("slow_num", slow_num.getText().toString());
850 
//                    intent.putExtra("open_object", open_object.getText().toString());
851 
//                    intent.putExtra("charge_cost", charge_cost.getText().toString());
852 
//                    intent.putExtra("park_cost", park_cost.getText().toString());
853 
//                    intent.putExtra("other_cost", other_cost.getText().toString());
854 
//                    intent.putExtra("charge_style", charge_style.getText().toString());
855 
//                    intent.putExtra("park_style", park_style.getText().toString());
856 
//                    intent.putExtra("other_style", other_style.getText().toString());
857 
//                    intent.putExtra("tv_operation_state", tv_operation_state.getText().toString());
858 
//                    intent.putExtra("tv_suit_detail", tv_suit_detail.getText().toString());
859 
//                    intent.putExtra("tv_belong_detail", tv_belong_detail.getText().toString());
860 
//                    intent.putExtra("open_time", open_time.getText().toString());
861 
//                    intent.putExtra("close_time", close_time.getText().toString());
862 
//                    intent.putExtra("holiday_open", holiday_open.getText().toString());
863 
//                    intent.putExtra("holiday_close", holiday_close.getText().toString());
864
865 
//                    this.finish();
866 
//                }
867 715 
            case R.id.iv_back:
868 716 
                finish();
869 717 
                break;
870 
//            case R.id.rl_suit_car:
871 
//                String[] changeSelect = {"国标充电", "特斯拉", "德系"};
872 
//                new AlertDialog.Builder(AlterOneActivity.this)
873 
//                        .setTitle("请选择")
874 
//                        .setItems(changeSelect, new DialogInterface.OnClickListener() {
875 
//                            @Override
876 
//                            public void onClick(DialogInterface dialog, int which) {
877 
//                                switch (which) {
878 
//                                    case 0:
879 
//                                        tv_suit_detail.setText("国标充电");
880 
//                                        break;
881 
//                                    case 1:
882 
//                                        tv_suit_detail.setText("特斯拉");
883 
//                                        break;
884 
//                                    case 2:
885 
//                                        tv_suit_detail.setText("德系");
886 
//                                        break;
887 
//                                    default:
888 
//                                        break;
889 
//                                }
890 
//                            }
891 
//                        })
892 
//                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
893 
//                            @Override
894 
//                            public void onClick(DialogInterface dialog, int which) {
895 
//                                dialog.cancel();
896 
//                            }
897 
//                        }).show();
898 
//                break;
899 
//            case R.id.rl_state:
900 
//                final String[] operationSelect = {"正常", "故障", "废弃", "调试"};
901 
//                new AlertDialog.Builder(AlterOneActivity.this)
902 
//                        .setTitle("请选择")
903 
//                        .setItems(operationSelect, new DialogInterface.OnClickListener() {
904 
//                            @Override
905 
//                            public void onClick(DialogInterface dialog, int which) {
906 
//                                switch (which) {
907 
//                                    case 0:
908 
//                                        tv_operation_state.setText(operationSelect[0]);
909 
//                                        break;
910 
//                                    case 1:
911 
//                                        tv_operation_state.setText(operationSelect[1]);
912 
//                                        break;
913 
//                                    case 2:
914 
//                                        tv_operation_state.setText(operationSelect[2]);
915 
//                                        break;
916 
//                                    case 3:
917 
//                                        tv_operation_state.setText(operationSelect[3]);
918 
//                                    default:
919 
//                                        break;
920 
//                                }
921 
//                            }
922 
//                        })
923 
//                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
924 
//                            @Override
925 
//                            public void onClick(DialogInterface dialog, int which) {
926 
//                                dialog.cancel();
927 
//                            }
928 
//                        }).show();
929 
//                break;
930 
//            case R.id.rl_belong:
931 
//                final String[] belongSelect = {"企业", "私人"};
932 
//                new AlertDialog.Builder(AlterOneActivity.this)
933 
//                        .setTitle("请选择")
934 
//                        .setItems(belongSelect, new DialogInterface.OnClickListener() {
935 
//                            @Override
936 
//                            public void onClick(DialogInterface dialog, int which) {
937 
//                                switch (which) {
938 
//                                    case 0:
939 
//                                        tv_belong_detail.setText(belongSelect[0]);
940 
//                                        break;
941 
//                                    case 1:
942 
//                                        tv_belong_detail.setText(belongSelect[1]);
943 
////                                        tv_work_style.setText("联系人");
944 
////                                        et_name.setText("王先生");
945 
//                                        break;
946 
//                                    default:
947 
//                                        break;
948 
//                                }
949 
//                            }
950 
//                        })
951 
//                        .setNegativeButton("取消", new DialogInterface.OnClickListener() {
952 
//                            @Override
953 
//                            public void onClick(DialogInterface dialog, int which) {
954 
//                                dialog.cancel();
955 
//                            }
956 
//                        }).show();
957 
//                break;
958
959 
//            case R.id.iv_photo1:
960 
//                LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
961 
//                popupWindowView = inflater.inflate(R.layout.popupwindow_upload, null);
962 
//                popupWindow = new PopupWindow(popupWindowView,
963 
//                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
964 
//                        true);
965 
//                popupWindow.setBackgroundDrawable(new BitmapDrawable());
966 
//                // 设置PopupWindow的弹出和消失效果
967 
//                popupWindow.setAnimationStyle(R.style.popupAnimation);
968 
////                confirmButton = (Button) popupWindowView
969 
////                        .findViewById(R.id.confirmButton);
970 
////                confirmButton.setOnClickListener(new OnClickListener() {
971 
////                    @Override
972 
////                    public void onClick(View view) {
973 
////                        popupWindow.dismiss();
974 
////                    }
975 
////                });
976 
//                cancleButton = (Button) popupWindowView
977 
//                        .findViewById(R.id.cancleButton);
978 
//                cancleButton.setOnClickListener(new View.OnClickListener() {
979 
//                    @Override
980 
//                    public void onClick(View view) {
981 
//                        popupWindow.dismiss();
982 
//                    }
983 
//                });
984 
//                btn_one = (Button) popupWindowView.findViewById(R.id.tvTwo);
985 
//                btn_one.setOnClickListener(new View.OnClickListener() {
986 
//                    @Override
987 
//                    public void onClick(View view) {
988 
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
989 
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
990 
//                                Environment.getExternalStorageDirectory(), "alterandroidapp.jpg")));
991 
//                        ((Activity) mContext).startActivityForResult(intent, 2);
992 
//                        popupWindow.dismiss();
993 
//                    }
994 
//                });
995 
//                btn_two = (Button) popupWindowView.findViewById(R.id.tvThree);
996 
//                btn_two.setOnClickListener(new View.OnClickListener() {
997 
//                    @Override
998 
//                    public void onClick(View view) {
999 
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
1000 
//                        intent.setDataAndType(
1001 
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
1002 
//                                "image/*");
1003 
//                        startActivityForResult(intent, 1);
1004 
//                        popupWindow.dismiss();
1005 
//                    }
1006 
//                });
1007 
//                popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
1008 
//
1009 
//
1010 
//                break;
1011
1012 
//            case R.id.iv_photo2:
1013 
//                LayoutInflater inflater2 = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
1014 
//                popupWindowView = inflater2.inflate(R.layout.popupwindow_upload, null);
1015 
//                popupWindow = new PopupWindow(popupWindowView,
1016 
//                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
1017 
//                        true);
1018 
//                popupWindow.setBackgroundDrawable(new BitmapDrawable());
1019 
//                // 设置PopupWindow的弹出和消失效果
1020 
//                popupWindow.setAnimationStyle(R.style.popupAnimation);
1021 
////                confirmButton = (Button) popupWindowView
1022 
////                        .findViewById(R.id.confirmButton);
1023 
////                confirmButton.setOnClickListener(new OnClickListener() {
1024 
////                    @Override
1025 
////                    public void onClick(View view) {
1026 
////                        popupWindow.dismiss();
1027 
////                    }
1028 
////                });
1029 
//                Button cancleButton2 = (Button) popupWindowView
1030 
//                        .findViewById(R.id.cancleButton);
1031 
//                cancleButton2.setOnClickListener(new View.OnClickListener() {
1032 
//                    @Override
1033 
//                    public void onClick(View view) {
1034 
//                        popupWindow.dismiss();
1035 
//                    }
1036 
//                });
1037 
//                Button btn_one2 = (Button) popupWindowView.findViewById(R.id.tvTwo);
1038 
//                btn_one2.setOnClickListener(new View.OnClickListener() {
1039 
//                    @Override
1040 
//                    public void onClick(View view) {
1041 
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
1042 
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
1043 
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
1044 
//                        ((Activity) mContext).startActivityForResult(intent, 5);
1045 
//                        popupWindow.dismiss();
1046 
//                    }
1047 
//                });
1048 
//                Button btn_two2 = (Button) popupWindowView.findViewById(R.id.tvThree);
1049 
//                btn_two2.setOnClickListener(new View.OnClickListener() {
1050 
//                    @Override
1051 
//                    public void onClick(View view) {
1052 
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
1053 
//                        intent.setDataAndType(
1054 
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
1055 
//                                "image/*");
1056 
//                        startActivityForResult(intent, 4);
1057 
//                        popupWindow.dismiss();
1058 
//                    }
1059 
//                });
1060 
//                popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
1061 
//                break;
1062 
//            case R.id.iv_photo3:
1063 
//                LayoutInflater inflater3 = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
1064 
//                popupWindowView = inflater3.inflate(R.layout.popupwindow_upload, null);
1065 
//                popupWindow = new PopupWindow(popupWindowView,
1066 
//                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
1067 
//                        true);
1068 
//                popupWindow.setBackgroundDrawable(new BitmapDrawable());
1069 
//                // 设置PopupWindow的弹出和消失效果
1070 
//                popupWindow.setAnimationStyle(R.style.popupAnimation);
1071 
////                confirmButton = (Button) popupWindowView
1072 
////                        .findViewById(R.id.confirmButton);
1073 
////                confirmButton.setOnClickListener(new OnClickListener() {
1074 
////                    @Override
1075 
////                    public void onClick(View view) {
1076 
////                        popupWindow.dismiss();
1077 
////                    }
1078 
////                });
1079 
//                Button cancleButton3 = (Button) popupWindowView
1080 
//                        .findViewById(R.id.cancleButton);
1081 
//                cancleButton3.setOnClickListener(new View.OnClickListener() {
1082 
//                    @Override
1083 
//                    public void onClick(View view) {
1084 
//                        popupWindow.dismiss();
1085 
//                    }
1086 
//                });
1087 
//                Button btn_one3 = (Button) popupWindowView.findViewById(R.id.tvTwo);
1088 
//                btn_one3.setOnClickListener(new View.OnClickListener() {
1089 
//                    @Override
1090 
//                    public void onClick(View view) {
1091 
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
1092 
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
1093 
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
1094 
//                        ((Activity) mContext).startActivityForResult(intent, 8);
1095 
//                        popupWindow.dismiss();
1096 
//                    }
1097 
//                });
1098 
//                Button btn_two3 = (Button) popupWindowView.findViewById(R.id.tvThree);
1099 
//                btn_two3.setOnClickListener(new View.OnClickListener() {
1100 
//                    @Override
1101 
//                    public void onClick(View view) {
1102 
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
1103 
//                        intent.setDataAndType(
1104 
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
1105 
//                                "image/*");
1106 
//                        startActivityForResult(intent, 7);
1107 
//                        popupWindow.dismiss();
1108 
//                    }
1109 
//                });
1110 
//                popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
1111 
//                break;
1112 718 
        }
1113 719
1114 720

+ 0 - 6
app/src/main/java/com/electric/chargingpile/activity/AnswerDetailsActivity.java
Целия файл 

@ -91,7 +91,6 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
91 91 
    private void getIntentData() {
92 92 
        id = getIntent().getStringExtra("id");
93 93 
        tag = getIntent().getStringExtra("tag");
94 
//        Log.e(TAG, "getIntentData: id=" + id);
95 94 
    }
96 95
97 96 
    private void initViews() {
 
@ -144,7 +143,6 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
144 143 
        } else {
145 144 
            url = MainApplication.url + "/zhannew/basic/web/index.php/question/answer-detail?id=" + id;
146 145 
        }
147 
//        Log.e(TAG, "getAnswerDetails: url="+url );
148 146 
        OkHttpUtils.get().url(url).build().readTimeOut(10000).connTimeOut(10000).execute(new StringCallback() {
149 147 
            @Override
150 148 
            public void onError(Call call, Exception e) {
 
@ -154,7 +152,6 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
154 152
155 153 
            @Override
156 154 
            public void onResponse(String response) {
157 
//                Log.e(TAG, "onResponse: " + response);
158 155 
                loadingDialog.dismiss();
159 156 
                try {
160 157 
                    String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
 
@ -228,12 +225,10 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
228 225 
            for (int i = 0; i < textList.size(); i++) {
229 226 
                String text = textList.get(i);
230 227 
                if (text.contains("<cdz img") && text.contains("src=") && text.contains("width=") && text.contains("height=")) {
231 
                    Log.e(TAG, "showEditData——text: " + text);
232 228 
                    String imagePath = StringUtils.getImgSrc(text);
233 229 
                    String width = StringUtils.getImgSrcW(text);
234 230 
                    String height = StringUtils.getImgSrcH(text);
235 231 
                    String new_s = imagePath + "&" + width + "&" + height;
236 
                    Log.e(TAG, "showEditData_new_s: " + new_s);
237 232 
                    if (new_s.contains("http") && new_s.contains("//")) {
238 233 
                        subscriber.onNext(new_s);
239 234 
                    }
 
@ -271,7 +266,6 @@ public class AnswerDetailsActivity extends AppCompatActivity implements View.OnC
271 266 
        tv_a_content.post(new Runnable() {
272 267 
            @Override
273 268 
            public void run() {
274 
                //showEditData(myContent);
275 269 
                tv_a_content.clearAllLayout();
276 270 
                showDataSync(answer);
277 271 
            }

+ 27 - 28
app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java
Целия файл 

@ -53,6 +53,7 @@ import com.electric.chargingpile.data.RObject;
53 53 
import com.electric.chargingpile.util.BarColorUtil;
54 54 
import com.electric.chargingpile.util.Bimp;
55 55 
import com.electric.chargingpile.util.DES3;
56 
import com.electric.chargingpile.util.FileUtils;
56 57 
import com.electric.chargingpile.util.ImageItem;
57 58 
import com.electric.chargingpile.util.ImageUtils;
58 59 
import com.electric.chargingpile.util.JsonUtils;
 
@ -68,6 +69,10 @@ import com.electric.chargingpile.view.HongBaoResultDialog;
68 69 
import com.electric.chargingpile.view.REditText;
69 70 
import com.electric.chargingpile.view.RatingBarView;
70 71 
import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet;
72 
import com.zhihu.matisse.Matisse;
73 
import com.zhihu.matisse.MimeType;
74 
import com.zhihu.matisse.engine.impl.GlideEngine;
75 
import com.zhihu.matisse.internal.entity.CaptureStrategy;
71 76 
import com.zhy.http.okhttp.OkHttpUtils;
72 77 
import com.zhy.http.okhttp.callback.StringCallback;
73 78 
import com.zhy.view.flowlayout.FlowLayout;
 
@ -155,6 +160,7 @@ public class ChargingCommentActivity extends Activity implements View.OnClickLis
155 160 
    private String isShow = "0";
156 161 
    private HongBaoDialog hongBaoDialog;
157 162 
    private static final int RC_ALBUM_PERM = 123;
163 
    public static final int REQUEST_CODE_CHOOSE = 335;
158 164 
    //输入表情前EditText中的文本
159 165 
//    private String inputAfterText;
160 166 
    Handler handler = new Handler() {
 
@ -553,14 +559,14 @@ public class ChargingCommentActivity extends Activity implements View.OnClickLis
553 559 
     * 调用图库选择
554 560 
     */
555 561 
    private void callGallery() {
556 
        Log.e(TAG, "callGallery: " + (Bimp.max - Bimp.tempSelectBitmap.size()));
557 
        //调用第三方图库选择
558 
        PhotoPicker.builder()
559 
                .setPhotoCount(PIC_NUM - Bimp.tempSelectBitmap.size())//可选择图片数量
560 
                .setShowCamera(true)//是否显示拍照按钮
561 
                .setShowGif(true)//是否显示动态图
562 
                .setPreviewEnabled(true)//是否可以预览
563 
                .start(this, PhotoPicker.REQUEST_CODE);
562 
        Matisse.from(ChargingCommentActivity.this)
563 
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
564 
                .countable(true)
565 
                .maxSelectable(PIC_NUM - Bimp.tempSelectBitmap.size())
566 
                .capture(true)
567 
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
568 
                .imageEngine(new GlideEngine())
569 
                .forResult(REQUEST_CODE_CHOOSE);
564 570 
    }
565 571
566 572 
    @Override
 
@ -570,7 +576,7 @@ public class ChargingCommentActivity extends Activity implements View.OnClickLis
570 576 
            if (data != null) {
571 577 
                if (requestCode == 1) {
572 578 
                    //处理调用系统图库
573 
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
579 
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
574 580 
                    //异步方式插入图片
575 581 
                    insertImagesSync(data);
576 582 
                }
 
@ -590,22 +596,17 @@ public class ChargingCommentActivity extends Activity implements View.OnClickLis
590 596 
            public void subscribe(ObservableEmitter<String> subscriber) throws Exception {
591 597
592 598 
                try {
593 
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
594 
                    //可以同时插入多张图片
595 
                    for (String imagePath : photos) {
596
597 
                        Log.e(TAG, "call: imagePath " + imagePath);
598 
                        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
599 
                        if (ImageUtils.readPictureDegree(imagePath) != 0) {
600 
                            bitmap = imageZoom(ImageUtils.toturn(bitmap));
601 
                        } else {
602 
                            bitmap = imageZoom(bitmap);
603 
                        }
599 
                    List<Uri> uriList = Matisse.obtainResult(data);
600 
                    for (Uri uri : uriList) {
601 
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
602 
                        File file = FileUtils.from(ChargingCommentActivity.this, uri);
603
604 
                        bitmap = FileUtils.rotateIfRequired(file, bitmap);
605 
                        bitmap = imageZoom(bitmap);
604 606 
                        ImageItem takePhoto = new ImageItem();
605 607 
                        takePhoto.setBitmap(bitmap);
606 
                        takePhoto.setImagePath(imagePath);
607 608 
                        Bimp.tempSelectBitmap.add(takePhoto);
608 
                        subscriber.onNext(imagePath);
609 
                        subscriber.onNext("");
609 610 
                    }
610 611 
                    subscriber.onComplete();
611 612 
                } catch (Exception e) {
 
@ -1044,23 +1045,21 @@ public class ChargingCommentActivity extends Activity implements View.OnClickLis
1044 1045 
    public void permissionTask() {
1045 1046 
        if (isPermissionOK()) {
1046 1047 
            callGallery();
1047 
            // Have permission, do the thing!
1048 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
1049 
//            ifTimeout();
1050 1048 
        } else {
1051 
            // Ask for one permission
1052 1049 
            EasyPermissions.requestPermissions(
1053 1050 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
1054 1051 
                    RC_ALBUM_PERM,
1055 1052 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
1056 
                    Manifest.permission.READ_EXTERNAL_STORAGE);
1053 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
1054 
                    Manifest.permission.CAMERA);
1057 1055 
        }
1058 1056 
    }
1059 1057
1060 1058 
    private boolean isPermissionOK() {
1061 1059 
        return EasyPermissions.hasPermissions(this,
1062 1060 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
1063 
                Manifest.permission.READ_EXTERNAL_STORAGE
1061 
                Manifest.permission.READ_EXTERNAL_STORAGE,
1062 
                Manifest.permission.CAMERA
1064 1063 
        );
1065 1064 
    }
1066 1065

+ 0 - 172
app/src/main/java/com/electric/chargingpile/activity/ClaimDataActivity.java
Целия файл 

@ -581,178 +581,6 @@ public class ClaimDataActivity extends Activity {
581 581 
        }
582 582 
    }
583 583
584 
//    @Override
585 
//    public void onClick(View view) {
586 
//        switch (view.getId()){
587 
//            case R.id.ll_addPhoto:
588 
////                CharSequence[] items = { "手机相册","拍照" };
589 
////                // CharSequence[] items = { "手机相册", "手机拍照" };
590 
////                imageChooseItem(items);
591 
//                LayoutInflater inflater = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
592 
//                popupWindowView = inflater.inflate(R.layout.popupwindow_upload, null);
593 
//                popupWindow = new PopupWindow(popupWindowView,
594 
//                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
595 
//                        true);
596 
//                popupWindow.setBackgroundDrawable(new BitmapDrawable());
597 
//                // 设置PopupWindow的弹出和消失效果
598 
//                popupWindow.setAnimationStyle(R.style.popupAnimation);
599 
////                confirmButton = (Button) popupWindowView
600 
////                        .findViewById(R.id.confirmButton);
601 
////                confirmButton.setOnClickListener(new OnClickListener() {
602 
////                    @Override
603 
////                    public void onClick(View view) {
604 
////                        popupWindow.dismiss();
605 
////                    }
606 
////                });
607 
//                cancleButton = (Button) popupWindowView
608 
//                        .findViewById(R.id.cancleButton);
609 
//                cancleButton.setOnClickListener(new View.OnClickListener() {
610 
//                    @Override
611 
//                    public void onClick(View view) {
612 
//                        popupWindow.dismiss();
613 
//                    }
614 
//                });
615 
//                btn_one = (Button) popupWindowView.findViewById(R.id.tvTwo);
616 
//                btn_one.setOnClickListener(new View.OnClickListener() {
617 
//                    @Override
618 
//                    public void onClick(View view) {
619 
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
620 
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
621 
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
622 
//                        ((Activity) mContext).startActivityForResult(intent, 2);
623 
//                        popupWindow.dismiss();
624 
//                    }
625 
//                });
626 
//                btn_two = (Button) popupWindowView.findViewById(R.id.tvThree);
627 
//                btn_two.setOnClickListener(new View.OnClickListener() {
628 
//                    @Override
629 
//                    public void onClick(View view) {
630 
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
631 
//                        intent.setDataAndType(
632 
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
633 
//                                "image/*");
634 
//                        startActivityForResult(intent, 1);
635 
//                        popupWindow.dismiss();
636 
//                    }
637 
//                });
638 
//                popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
639 
//                break;
640 
//            case R.id.ll_uploadPhoto:
641 
////                CharSequence[] itemss = { "手机相册","拍照" };
642 
////                // CharSequence[] items = { "手机相册", "手机拍照" };
643 
////                imageChooseItems(itemss);
644 
//                LayoutInflater inflater1 = (LayoutInflater) getSystemService(LAYOUT_INFLATER_SERVICE);
645 
//                popupWindowView = inflater1.inflate(R.layout.popupwindow_upload, null);
646 
//                popupWindow = new PopupWindow(popupWindowView,
647 
//                        ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT,
648 
//                        true);
649 
//                popupWindow.setBackgroundDrawable(new BitmapDrawable());
650 
//                // 设置PopupWindow的弹出和消失效果
651 
//                popupWindow.setAnimationStyle(R.style.popupAnimation);
652 
////                confirmButton = (Button) popupWindowView
653 
////                        .findViewById(R.id.confirmButton);
654 
////                confirmButton.setOnClickListener(new OnClickListener() {
655 
////                    @Override
656 
////                    public void onClick(View view) {
657 
////                        popupWindow.dismiss();
658 
////                    }
659 
////                });
660 
//                cancleButton = (Button) popupWindowView
661 
//                        .findViewById(R.id.cancleButton);
662 
//                cancleButton.setOnClickListener(new View.OnClickListener() {
663 
//                    @Override
664 
//                    public void onClick(View view) {
665 
//                        popupWindow.dismiss();
666 
//                    }
667 
//                });
668 
//                btn_one = (Button) popupWindowView.findViewById(R.id.tvTwo);
669 
//                btn_one.setOnClickListener(new View.OnClickListener() {
670 
//                    @Override
671 
//                    public void onClick(View view) {
672 
//                        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
673 
//                        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
674 
//                                Environment.getExternalStorageDirectory(), "androidapp.jpg")));
675 
//                        ((Activity) mContext).startActivityForResult(intent, 2);
676 
//                        popupWindow.dismiss();
677 
//                    }
678 
//                });
679 
//                btn_two = (Button) popupWindowView.findViewById(R.id.tvThree);
680 
//                btn_two.setOnClickListener(new View.OnClickListener() {
681 
//                    @Override
682 
//                    public void onClick(View view) {
683 
//                        Intent intent = new Intent(Intent.ACTION_PICK, null);
684 
//                        intent.setDataAndType(
685 
//                                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
686 
//                                "image/*");
687 
//                        startActivityForResult(intent, 1);
688 
//                        popupWindow.dismiss();
689 
//                    }
690 
//                });
691 
//                popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
692 
//                break;
693 
//        }
694 
//    }
695
696 
    /**
697 
     * 操作选择
698 
     *
699 
     * @param items
700 
     */
701 
//    protected void imageChooseItem(CharSequence[] items) {
702 
//        AlertDialog imageDialog = new AlertDialog.Builder(mContext)
703 
//                .setTitle("请选择")
704 
//                .setItems(items, new DialogInterface.OnClickListener() {
705 
//                    public void onClick(DialogInterface dialog, int item) {
706 
//                        // 手机选图
707 
//                        if (item == 0) {
708 
//
709 
//                            Intent intent = new Intent(Intent.ACTION_PICK, null);
710 
//                            intent.setDataAndType(
711 
//                                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
712 
//                                    "image/*");
713 
//                            startActivityForResult(intent, 1);
714 
//                        }
715 
//                        // 拍照
716 
//                        else if (item == 1) {
717 
//                            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
718 
//                            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
719 
//                                    Environment.getExternalStorageDirectory(), "androidapp.jpg")));
720 
//                            ((Activity) mContext).startActivityForResult(intent, 2);
721 
//                        }
722 
//                    }
723 
//                }).create();
724 
//
725 
//        imageDialog.show();
726 
//    }
727 
//
728 
//    protected void imageChooseItems(CharSequence[] itemss) {
729 
//        AlertDialog imageDialog = new AlertDialog.Builder(mContext)
730 
//                .setTitle("请选择")
731 
//                .setItems(itemss, new DialogInterface.OnClickListener() {
732 
//                    public void onClick(DialogInterface dialog, int item) {
733 
//                        // 手机选图
734 
//                        if (item == 0) {
735 
//
736 
//                            Intent intent = new Intent(Intent.ACTION_PICK, null);
737 
//                            intent.setDataAndType(
738 
//                                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
739 
//                                    "image/*");
740 
//                            startActivityForResult(intent, 1);
741 
//                        }
742 
//                        // 拍照
743 
//                        else if (item == 1) {
744 
//                            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
745 
//                            intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
746 
//                                    Environment.getExternalStorageDirectory(), "androidapp.jpg")));
747 
//                            ((Activity) mContext).startActivityForResult(intent, 2);
748 
//                        }
749 
//                    }
750 
//                }).create();
751 
//
752 
//        imageDialog.show();
753 
//    }
754 
//
755
756 584 
    /**
757 585 
     * 裁剪图片方法实现 @param uri
758 586 
     */

+ 68 - 79
app/src/main/java/com/electric/chargingpile/activity/EditAnswerActivity.java
Целия файл 

@ -7,9 +7,12 @@ import android.content.Intent;
7 7 
import android.graphics.Bitmap;
8 8 
import android.graphics.BitmapFactory;
9 9 
import android.graphics.Matrix;
10 
import android.net.Uri;
10 11 
import android.os.Bundle;
11 12 
import android.os.Handler;
13
12 14 
import androidx.appcompat.app.AppCompatActivity;
15
13 16 
import android.util.DisplayMetrics;
14 17 
import android.util.Log;
15 18 
import android.util.TypedValue;
 
@ -28,6 +31,8 @@ import com.electric.chargingpile.R;
28 31 
import com.electric.chargingpile.application.MainApplication;
29 32 
import com.electric.chargingpile.util.AndroidBug5497Workaround;
30 33 
import com.electric.chargingpile.util.BarColorUtil;
34 
import com.electric.chargingpile.util.FileUtils;
35 
import com.electric.chargingpile.util.ImageItem;
31 36 
import com.electric.chargingpile.util.ImageUitl;
32 37 
import com.electric.chargingpile.util.ImageUtils;
33 38 
import com.electric.chargingpile.util.JsonUtils;
 
@ -37,6 +42,10 @@ import com.electric.chargingpile.util.ToastUtil;
37 42 
import com.electric.chargingpile.view.CarTypeDialog;
38 43 
import com.electric.chargingpile.view.xrichtext.RichTextEditorForA;
39 44 
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
45 
import com.zhihu.matisse.Matisse;
46 
import com.zhihu.matisse.MimeType;
47 
import com.zhihu.matisse.engine.impl.GlideEngine;
48 
import com.zhihu.matisse.internal.entity.CaptureStrategy;
40 49 
import com.zhy.http.okhttp.OkHttpUtils;
41 50 
import com.zhy.http.okhttp.callback.StringCallback;
42 51 
@ -78,8 +87,9 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
78 87 
    private RelativeLayout rl_root, rl_point;
79 88 
    public static android.view.animation.Animation animation;
80 89 
    private LinearLayout ll;
90 
    private Bitmap insertBitmap;
81 91 
    private static final int RC_ALBUM_PERM = 123;
82
92 
    public static final int REQUEST_CODE_CHOOSE = 338;
83 93
84 94 
    @Override
85 95 
    protected void onCreate(Bundle savedInstanceState) {
 
@ -177,7 +187,6 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
177 187 
                    @Override
178 188 
                    public void onError(Throwable e) {
179 189 
                        loadingDialog.dismiss();
180 
//                        ToastUtil.showToast(getApplicationContext(),"解析错误：图片不存在或已损坏",Toast.LENGTH_SHORT);
181 190 
                    }
182 191
183 192 
@ -206,10 +215,8 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
206 215
207 216 
            for (int i = 0; i < textList.size(); i++) {
208 217 
                String text = textList.get(i);
209 
//                Log.e(TAG, "showEditData: "+text );
210 218 
                if (text.contains("<cdz img")) {
211 219 
                    String imagePath = StringUtils.getImgSrc(text);
212 
//                    Log.e(TAG, "showEditData: imagePath= "+imagePath );
213 220 
                    if (new File(imagePath).exists()) {
214 221 
                        subscriber.onNext(imagePath);
215 222 
                    } else {
 
@ -255,16 +262,10 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
255 262 
     */
256 263 
    private String getEditData() {
257 264 
        List<RichTextEditorForA.EditData> editList = et_new_content.buildEditData();
258 
//        for (int i=0;i<editList.size();i++){
259 
////            Log.e(TAG, "getEditData"+i+": "+editList.get(i).imagePath );
260 
//        }
261 265 
        StringBuffer content = new StringBuffer();
262 
//        StringBuffer contentt = new StringBuffer();
263 266 
        for (RichTextEditorForA.EditData itemData : editList) {
264 267 
            if (itemData.inputStr != null) {
265 268 
                content.append(itemData.inputStr);
266 
//                contentt.append(itemData.inputStr);
267 
                //Log.d("RichEditor", "commit inputStr=" + itemData.inputStr);
268 269 
            } else if (itemData.imagePath != null) {
269 270 
                Bitmap bitmap = BitmapFactory.decodeFile(itemData.imagePath);
270 271 
                int width = bitmap.getWidth();
 
@ -274,18 +275,11 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
274 275 
                    String key = (String) keys.next();
275 276 
                    if (itemData.imagePath.equals(key)) {
276 277 
                        content.append("<cdz img src=\"").append(map.get(itemData.imagePath)).append("\" width=" + "\"" + width + "\"" + " height=" + "\"" + height + "\" /cdz>");
277 
//                        contentt.append("<cdz img src=\"").append(itemData.imagePath).append("\" width="+"\""+width+"\""+" height="+"\""+height+"\" /cdz>");
278 278 
                    }
279 279 
                }
280 280
281 
                //Log.d("RichEditor", "commit imgePath=" + itemData.imagePath);
282 
                //imageList.add(itemData.imagePath);
283 281 
            }
284 282 
        }
285 
//        MainApplication.q_content = contentt.toString();
286 
//        MainApplication.q_map.putAll(map);
287 
//        Log.e(TAG, "getEditData_content: "+content.toString() );
288 
//        Log.e(TAG, "getEditData_contentt: "+contentt.toString() );
289 283 
        return content.toString();
290 284 
    }
291 285 
@ -304,8 +298,7 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
304 298 
            double i = mid / maxSize;
305 299 
            // 开始压缩 此处用到平方根 将宽带和高度压缩掉对应的平方根倍
306 300 
            // （1.保持刻度和高度和原bitmap比率一致，压缩后也达到了最大大小占用空间的大小）
307 
            bm = zoomImage(bm, bm.getWidth() / Math.sqrt(i), bm.getHeight()
308 
                    / Math.sqrt(i));
301 
            bm = zoomImage(bm, bm.getWidth() / Math.sqrt(i), bm.getHeight() / Math.sqrt(i));
309 302 
        }
310 303
311 304 
@ -323,10 +316,7 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
323 316 
        float scaleHeight = ((float) newHeight) / height;
324 317 
        // 缩放图片动作
325 318 
        matrix.postScale(scaleWidth, scaleHeight);
326 
        Bitmap bitmap = Bitmap.createBitmap(bgimage, 0, 0, (int) width,
327 
                (int) height, matrix, true);
328 
//        iv_2.setImageBitmap(bitmap);
329 
//        tv_2.setText(bitmap.getRowBytes() * bitmap.getHeight() + "");
319 
        Bitmap bitmap = Bitmap.createBitmap(bgimage, 0, 0, (int) width, (int) height, matrix, true);
330 320 
        return bitmap;
331 321 
    }
332 322 
@ -344,27 +334,18 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
344 334
345 335 
                try {
346 336 
                    et_new_content.measure(0, 0);
347 
                    int width = ScreenUtils.getScreenWidth(EditAnswerActivity.this);
348 
                    int height = ScreenUtils.getScreenHeight(EditAnswerActivity.this);
349 
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
350 
                    //可以同时插入多张图片
351 
                    for (String imagePath : photos) {
352 
                        //Log.i("NewActivity", "###path=" + imagePath);
353 
                        Bitmap bitmap = ImageUitl.getSmallBitmap(imagePath, width, height);//压缩图片
354 
                        if (ImageUtils.readPictureDegree(imagePath) != 0) {
355 
                            bitmap = imageZoom(ImageUtils.toturn(bitmap));
356 
                        } else {
357 
                            bitmap = imageZoom(bitmap);
358 
                        }
359 
//                        Log.e(TAG, "call: "+imagePath );
360 
                        c_path = imagePath;
361 
                        //bitmap = BitmapFactory.decodeFile(imagePath);
362 
                        imagePath = SDCardUtil.saveToSdCard(bitmap);
363 
                        u_path = imagePath;
364 
//                        Log.e(TAG, "call: "+imagePath );
365 
                        //Log.i("NewActivity", "###imagePath="+imagePath);
366 
                        subscriber.onNext(imagePath);
367 
                    }
337 
                    List<Uri> uriList = Matisse.obtainResult(data);
338 
                    Uri uri = uriList.get(0);
339 
                    Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
340 
                    File file = FileUtils.from(EditAnswerActivity.this, uri);
341
342 
                    bitmap = FileUtils.rotateIfRequired(file, bitmap);
343 
                    bitmap = imageZoom(bitmap);
344 
                    insertBitmap = bitmap;
345
346 
                    u_path = SDCardUtil.saveToSdCard(bitmap);
347
348 
                    subscriber.onNext(u_path);
368 349 
                    subscriber.onComplete();
369 350 
                } catch (Exception e) {
370 351 
                    e.printStackTrace();
 
@ -378,13 +359,13 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
378 359 
                    @Override
379 360 
                    public void onComplete() {
380 361 
                        insertDialog.dismiss();
381 
                        compressAndUpload(c_path, u_path);
362 
                        //compressAndUpload(c_path, u_path);
363 
                        uploadPic(insertBitmap, u_path);
382 364 
                    }
383 365
384 366 
                    @Override
385 367 
                    public void onError(Throwable e) {
386 368 
                        insertDialog.dismiss();
387 
//                        Log.e(TAG, "onError: "+ "图片插入失败:"+e.getMessage());
388 369 
                        ToastUtil.showToast(getApplicationContext(), "图片插入失败", Toast.LENGTH_SHORT);
389 370 
                    }
390 371 
@ -402,19 +383,14 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
402 383
403 384 
    private void compressAndUpload(String path, final String u_path) {
404 385 
        loadingDialog.show();
405 
//        Log.e(TAG, "compressAndUpload: path= "+path );
406 386 
        File file = new File(path);
407 
//        Log.e(TAG, "compressAndUpload: length= "+file.length()/1024+"kb" );
408 387 
        Luban.with(EditAnswerActivity.this).load(file).setCompressListener(new OnCompressListener() {
409 388 
            @Override
410 389 
            public void onStart() {
411
412 390 
            }
413 391
414 392 
            @Override
415 393 
            public void onSuccess(File file) {
416 
//                Log.e(TAG, "onSuccess: path= "+file.getPath() );
417 
//                Log.e(TAG, "onSuccess: length= "+file.length()/1024+"kb" );
418 394 
                uploadPic(file.getPath(), u_path);
419 395 
            }
420 396 
@ -426,11 +402,7 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
426 402 
    }
427 403
428 404 
    private void uploadPic(String picPath, final String path) {
429 
//        Log.e(TAG, "uploadPic: path= "+picPath );
430 
//        Log.e(TAG, "uploadPic: length= "+new File(picPath).length()/1024+"kb" );
431 405 
        Bitmap bitmap = BitmapFactory.decodeFile(picPath);
432 
//        Log.e(TAG, "uploadPic: bit= "+bitmap.ge()/1024+"kb" );
433
434 406 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/fileupload/uploadone";
435 407 
        OkHttpUtils.post().url(url).
436 408 
                addParams("file", ImageUitl.bitmapToString(picPath)).
 
@ -439,26 +411,51 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
439 411 
                .build().execute(new StringCallback() {
440 412 
            @Override
441 413 
            public void onError(Call call, Exception e) {
442
414 
                e.printStackTrace();
443 415 
            }
444 416
445 417 
            @Override
446 418 
            public void onResponse(String response) {
447 419 
                loadingDialog.dismiss();
448 
//                Log.e(TAG, "onResponse: "+response );
449 420 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
450 421 
                if ("01".equals(rtnCode)) {
451 422 
                    String fileUrl = JsonUtils.getKeyResult(response, "fileUrl");
452 423 
                    map.put(path, fileUrl);
453 424 
                    et_new_content.addEditTextAtIndex(et_new_content.getLastIndex(), " ");
454 425 
                    ToastUtil.showToast(getApplicationContext(), "图片插入成功", Toast.LENGTH_SHORT);
455 
//                    Log.e(TAG, "onResponse: map的key="+path+"的value="+map.get(path) );
456 426 
                } else {
457 427 
                    ToastUtil.showToast(getApplicationContext(), "图片插入失败", Toast.LENGTH_SHORT);
458 428 
                }
459 429 
            }
460 430 
        });
431 
    }
432
433 
    private void uploadPic(Bitmap bitmap, final String path) {
434 
        String url = MainApplication.url + "/zhannew/basic/web/index.php/fileupload/uploadone";
435 
        OkHttpUtils.post().url(url).
436 
                addParams("file", FileUtils.bitmapToString(bitmap)).
437 
                addParams("filename", "android.jpg").
438 
                addParams("id", creat_id)
439 
                .build().execute(new StringCallback() {
440 
            @Override
441 
            public void onError(Call call, Exception e) {
442 
                e.printStackTrace();
443 
            }
461 444
445 
            @Override
446 
            public void onResponse(String response) {
447 
                loadingDialog.dismiss();
448 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
449 
                if ("01".equals(rtnCode)) {
450 
                    String fileUrl = JsonUtils.getKeyResult(response, "fileUrl");
451 
                    map.put(path, fileUrl);
452 
                    et_new_content.addEditTextAtIndex(et_new_content.getLastIndex(), " ");
453 
                    ToastUtil.showToast(getApplicationContext(), "图片插入成功", Toast.LENGTH_SHORT);
454 
                } else {
455 
                    ToastUtil.showToast(getApplicationContext(), "图片插入失败", Toast.LENGTH_SHORT);
456 
                }
457 
            }
458 
        });
462 459 
    }
463 460
464 461 
    @Override
 
@ -506,13 +503,14 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
506 503 
     * 调用图库选择
507 504 
     */
508 505 
    private void callGallery() {
509 
        //调用第三方图库选择
510 
        PhotoPicker.builder()
511 
                .setPhotoCount(1)//可选择图片数量
512 
                .setShowCamera(true)//是否显示拍照按钮
513 
                .setShowGif(true)//是否显示动态图
514 
                .setPreviewEnabled(true)//是否可以预览
515 
                .start(this, PhotoPicker.REQUEST_CODE);
506 
        Matisse.from(EditAnswerActivity.this)
507 
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
508 
                .countable(true)
509 
                .maxSelectable(1)
510 
                .capture(true)
511 
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
512 
                .imageEngine(new GlideEngine())
513 
                .forResult(REQUEST_CODE_CHOOSE);
516 514 
    }
517 515
518 516 
    @Override
 
@ -522,7 +520,7 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
522 520 
            if (data != null) {
523 521 
                if (requestCode == 1) {
524 522 
                    //处理调用系统图库
525 
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
523 
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
526 524 
                    //异步方式插入图片
527 525 
                    insertImagesSync(data);
528 526 
                }
 
@ -543,7 +541,6 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
543 541
544 542 
            @Override
545 543 
            public void onResponse(String response) {
546 
//                Log.e(TAG, "onResponse: id"+response );
547 544 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
548 545 
                if ("01".equals(rtnCode)) {
549 546 
                    String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
 
@ -577,7 +574,6 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
577 574 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
578 575 
                String rtnMsg = JsonUtils.getKeyResult(response, "rtnMsg");
579 576 
                if ("01".equals(rtnCode)) {
580 
//                    QaActivity.isRefresh = true;
581 577 
                    QuestionActivity.isRefresh = true;
582 578
583 579 
                    String plusScore = JsonUtils.getKeyResult(rtnMsg, "plusScore");
 
@ -622,10 +618,7 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
622 618 
                                }
623 619 
                            }
624 620 
                        }, 1500);
625
626 621 
                    }
627
628
629 622 
                } else {
630 623 
                    ToastUtil.showToast(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT);
631 624 
                }
 
@ -645,35 +638,31 @@ public class EditAnswerActivity extends AppCompatActivity implements View.OnClic
645 638
646 639 
    @Override
647 640 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
648
649 641 
    }
650 642
651 643 
    @Override
652 644 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
653
654 645 
    }
655 646
656 647 
    @AfterPermissionGranted(RC_ALBUM_PERM)
657 648 
    public void permissionTask() {
658 649 
        if (isPermissionOK()) {
659 650 
            callGallery();
660 
            // Have permission, do the thing!
661 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
662 
//            ifTimeout();
663 651 
        } else {
664 
            // Ask for one permission
665 652 
            EasyPermissions.requestPermissions(
666 653 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
667 654 
                    RC_ALBUM_PERM,
668 655 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
669 
                    Manifest.permission.READ_EXTERNAL_STORAGE);
656 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
657 
                    Manifest.permission.CAMERA);
670 658 
        }
671 659 
    }
672 660
673 661 
    private boolean isPermissionOK() {
674 662 
        return EasyPermissions.hasPermissions(this,
675 663 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
676 
                Manifest.permission.READ_EXTERNAL_STORAGE
664 
                Manifest.permission.READ_EXTERNAL_STORAGE,
665 
                Manifest.permission.CAMERA
677 666 
        );
678 667 
    }
679 668 
}

+ 1 - 1
app/src/main/java/com/electric/chargingpile/activity/FeedbackActivity.java
Целия файл 

@ -115,7 +115,7 @@ public class FeedbackActivity extends Activity implements OnClickListener, EasyP
115 115 
    LoadingDialog dialog;
116 116 
    private ProgressDialog insertDialog;
117 117 
    private static final int RC_ALBUM_PERM = 123;
118 
    public static final int REQUEST_CODE_CHOOSE = 333;
118 
    public static final int REQUEST_CODE_CHOOSE = 337;
119 119 
    private Handler handler = new Handler() {
120 120 
        // 主线程通过这个方法处理消息
121 121 
        @Override

+ 0 - 2
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java
Целия файл 

@ -1928,7 +1928,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1928 1928
1929 1929 
            @Override
1930 1930 
            public void onResponse(String response) {
1931 
//                LogUtils.e(response);
1932 1931 
                String rtnCode = JsonUtils.getKeyResult(response, "rtnCode");
1933 1932 
                if ("0".equals(rtnCode)) {
1934 1933 
                    String data = JsonUtils.getKeyResult(response, "data");
 
@ -1949,7 +1948,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1949 1948 
    }
1950 1949
1951 1950 
    private void dealUpdateData(List<UpdateZhanDataBean> list) {
1952 
//        LogUtils.e(list.size());
1953 1951 
        String dbPath = "/data/user/0/com.electric.chargingpile/databases/zhan_list";
1954 1952 
        try {
1955 1953 
            SQLiteDatabase db = SQLiteDatabase.openDatabase(dbPath, null, SQLiteDatabase.OPEN_READWRITE);

+ 4 - 2
app/src/main/java/com/electric/chargingpile/activity/ShareTwoEditActivity.java
Целия файл 

@ -971,14 +971,16 @@ public class ShareTwoEditActivity extends Activity implements View.OnClickListen
971 971 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
972 972 
                    RC_ALBUM_PERM,
973 973 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
974 
                    Manifest.permission.READ_EXTERNAL_STORAGE);
974 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
975 
                    Manifest.permission.CAMERA);
975 976 
        }
976 977 
    }
977 978
978 979 
    private boolean isPermissionOK() {
979 980 
        return EasyPermissions.hasPermissions(this,
980 981 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
981 
                Manifest.permission.READ_EXTERNAL_STORAGE
982 
                Manifest.permission.READ_EXTERNAL_STORAGE,
983 
                Manifest.permission.CAMERA
982 984 
        );
983 985 
    }
984 986

+ 0 - 18
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java
Целия файл 

@ -553,7 +553,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
553 553 
     * 调用图库选择
554 554 
     */
555 555 
    private void callGallery() {
556 
//        Log.e(TAG, "callGallery: "+ (Bimp.max - Bimp.tempSelectBitmap.size() ));
557 556 
        //调用第三方图库选择
558 557 
        PhotoPicker.builder()
559 558 
                .setPhotoCount(1)//可选择图片数量
 
@ -635,14 +634,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
635 634 
        });
636 635 
        // 设置PopupWindow的弹出和消失效果
637 636 
        popupWindow.setAnimationStyle(R.style.popupAnimation);
638 
//                confirmButton = (Button) popupWindowView
639 
//                        .findViewById(R.id.confirmButton);
640 
//                confirmButton.setOnClickListener(new OnClickListener() {
641 
//                    @Override
642 
//                    public void onClick(View view) {
643 
//                        popupWindow.dismiss();
644 
//                    }
645 
//                });
646 637 
        cancleButton = (Button) popupWindowView
647 638 
                .findViewById(R.id.cancleButton);
648 639 
        cancleButton.setOnClickListener(new View.OnClickListener() {
 
@ -702,10 +693,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
702 693 
                Bitmap bm = imageZoom(photo);
703 694 
                ss = bitmapToBase64(bm);
704 695 
            }
705 
//            else{
706 
//                ss =bitmapToBase64(selectbm);
707 
//            }
708
709 696 
            par.put("file", ss);
710 697 
            par.put("filename", "androidapp.jpg");
711 698 
        } catch (Exception e) {
 
@ -762,8 +749,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
762 749 
    @AfterPermissionGranted(RC_CAMERA_PERM)
763 750 
    public void cameraTask() {
764 751 
        if (hasCameraPermission()) {
765 
            // Have permission, do the thing!
766 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
767 752 
            showWindow();
768 753 
        } else {
769 754 
            // Ask for one permission
 
@ -804,9 +789,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
804 789 
         */
805 790 
        Intent intent = new Intent("com.android.camera.action.CROP");
806 791 
        intent.setDataAndType(uri, "image/*");
807 
//        Uri cropUri = Uri.fromFile(new File(
808 
//                Environment.getExternalStorageDirectory() + "cdz_icon.png"));
809 
//        intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
810 792 
        intent.putExtra("crop", "true");
811 793 
        // aspectX aspectY 是宽高的比例
812 794 
        intent.putExtra("aspectX", 1);

+ 29 - 32
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java
Целия файл 

@ -51,6 +51,7 @@ import com.electric.chargingpile.data.RObject;
51 51 
import com.electric.chargingpile.util.BarColorUtil;
52 52 
import com.electric.chargingpile.util.Bimp;
53 53 
import com.electric.chargingpile.util.DES3;
54 
import com.electric.chargingpile.util.FileUtils;
54 55 
import com.electric.chargingpile.util.ImageItem;
55 56 
import com.electric.chargingpile.util.ImageUtils;
56 57 
import com.electric.chargingpile.util.JsonUtils;
 
@ -64,6 +65,10 @@ import com.electric.chargingpile.util.ToastUtil;
64 65 
import com.electric.chargingpile.util.UploadUtil;
65 66 
import com.electric.chargingpile.view.REditText;
66 67 
import com.electric.chargingpile.view.RatingBarView;
68 
import com.zhihu.matisse.Matisse;
69 
import com.zhihu.matisse.MimeType;
70 
import com.zhihu.matisse.engine.impl.GlideEngine;
71 
import com.zhihu.matisse.internal.entity.CaptureStrategy;
67 72 
import com.zhy.http.okhttp.OkHttpUtils;
68 73 
import com.zhy.http.okhttp.callback.StringCallback;
69 74 
import com.zhy.view.flowlayout.FlowLayout;
 
@ -138,6 +143,7 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
138 143 
    public static ImageView point;
139 144 
    private InputMethodManager imm = null;
140 145 
    private static final int RC_ALBUM_PERM = 123;
146 
    public static final int REQUEST_CODE_CHOOSE = 336;
141 147 
    Handler handler = new Handler() {
142 148 
        public void handleMessage(Message msg) {
143 149 
            switch (msg.what) {
 
@ -543,16 +549,14 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
543 549 
     * 调用图库选择
544 550 
     */
545 551 
    private void callGallery() {
546 
        Log.e(TAG, "callGallery: " + (Bimp.max - Bimp.tempSelectBitmap.size()));
547 
        //调用第三方图库选择
548 
        PhotoPicker.builder()
549 
                .setPhotoCount(PIC_NUM - Bimp.tempSelectBitmap.size())//可选择图片数量
550 
                .setShowCamera(true)//是否显示拍照按钮
551 
                .setShowGif(true)//是否显示动态图
552 
                .setPreviewEnabled(true)//是否可以预览
553 
                .start(this, PhotoPicker.REQUEST_CODE);
554
555
552 
        Matisse.from(ZhanCommentActivity.this)
553 
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
554 
                .countable(true)
555 
                .maxSelectable(PIC_NUM - Bimp.tempSelectBitmap.size())
556 
                .capture(true)
557 
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
558 
                .imageEngine(new GlideEngine())
559 
                .forResult(REQUEST_CODE_CHOOSE);
556 560 
    }
557 561
558 562 
    @Override
 
@ -562,7 +566,7 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
562 566 
            if (data != null) {
563 567 
                if (requestCode == 1) {
564 568 
                    //处理调用系统图库
565 
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
569 
                } else if (requestCode == REQUEST_CODE_CHOOSE) {
566 570 
                    //异步方式插入图片
567 571 
                    insertImagesSync(data);
568 572 
                }
 
@ -581,24 +585,17 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
581 585 
            @Override
582 586 
            public void subscribe(ObservableEmitter<String> subscriber) throws Exception {
583 587 
                try {
584 
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
585 
                    //可以同时插入多张图片
586 
                    for (String imagePath : photos) {
587
588 
                        Log.e(TAG, "call: imagePath " + imagePath);
589 
                        Bitmap bitmap = BitmapFactory.decodeFile(imagePath);//压缩图片
590 
                        if (ImageUtils.readPictureDegree(imagePath) != 0) {
591 
                            bitmap = imageZoom(ImageUtils.toturn(bitmap));
592 
                        } else {
593 
                            bitmap = imageZoom(bitmap);
594 
                        }
588 
                    List<Uri> uriList = Matisse.obtainResult(data);
589 
                    for (Uri uri : uriList) {
590 
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
591 
                        File file = FileUtils.from(ZhanCommentActivity.this, uri);
592
593 
                        bitmap = FileUtils.rotateIfRequired(file, bitmap);
594 
                        bitmap = imageZoom(bitmap);
595 595 
                        ImageItem takePhoto = new ImageItem();
596 596 
                        takePhoto.setBitmap(bitmap);
597 
                        takePhoto.setImagePath(imagePath);
598 597 
                        Bimp.tempSelectBitmap.add(takePhoto);
599 
//
600 
//                        Log.e(TAG, "call: "+imagePath );
601 
                        subscriber.onNext(imagePath);
598 
                        subscriber.onNext("");
602 599 
                    }
603 600 
                    subscriber.onComplete();
604 601 
                } catch (Exception e) {
 
@ -629,7 +626,8 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
629 626 
                    }
630 627
631 628 
                    @Override
632 
                    public void onComplete() {   Log.e(TAG, "onCompleted: -------------");
629 
                    public void onComplete() {
630 
                        Log.e(TAG, "onCompleted: -------------");
633 631 
                        insertDialog.dismiss();
634 632 
                        adapter.update();
635 633 
@ -950,23 +948,22 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
950 948 
    public void permissionTask() {
951 949 
        if (isPermissionOK()) {
952 950 
            callGallery();
953 
            // Have permission, do the thing!
954 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
955 
//            ifTimeout();
956 951 
        } else {
957 952 
            // Ask for one permission
958 953 
            EasyPermissions.requestPermissions(
959 954 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
960 955 
                    RC_ALBUM_PERM,
961 956 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
962 
                    Manifest.permission.READ_EXTERNAL_STORAGE);
957 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
958 
                    Manifest.permission.CAMERA);
963 959 
        }
964 960 
    }
965 961
966 962 
    private boolean isPermissionOK() {
967 963 
        return EasyPermissions.hasPermissions(this,
968 964 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
969 
                Manifest.permission.READ_EXTERNAL_STORAGE
965 
                Manifest.permission.READ_EXTERNAL_STORAGE,
966 
                Manifest.permission.CAMERA
970 967 
        );
971 968 
    }
972 969

+ 0 - 2
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java
Целия файл 

@ -140,9 +140,7 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
140 140 
    public void onActivityResult(int requestCode, int resultCode, Intent data) {
141 141 
        if (requestCode == ChatContentListActivity.REQUEST_CODE_CHAT_HOME) {
142 142 
            Log.d(TAG, "onActivityResult: ");
143 
//            ToastUtil.showToast(getContext(), "come on ", Toast.LENGTH_SHORT);
144 143 
        }
145 
//        ToastUtil.showToast(getContext(), "come on 2", Toast.LENGTH_SHORT);
146 144 
    }
147 145
148 146 
    private void initListener() {

+ 11 - 0
app/src/main/java/com/electric/chargingpile/util/FileUtils.java
Целия файл 

@ -9,10 +9,12 @@ import android.net.Uri;
9 9 
import android.os.Environment;
10 10 
import android.provider.MediaStore;
11 11 
import android.provider.OpenableColumns;
12 
import android.util.Base64;
12 13 
import android.util.Log;
13 14
14 15 
import androidx.exifinterface.media.ExifInterface;
15 16
17 
import java.io.ByteArrayOutputStream;
16 18 
import java.io.File;
17 19 
import java.io.FileNotFoundException;
18 20 
import java.io.FileOutputStream;

@ -209,4 +211,13 @@ public class FileUtils {
209 211 
        return count;
210 212 
    }
211 213
214 
    public static String bitmapToString(Bitmap bitmap) {
215 
        String str = null;
216 
        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
217 
        bitmap.compress(Bitmap.CompressFormat.JPEG, 100, outputStream);
218 
        byte[] bytes = outputStream.toByteArray();
219 
        str = Base64.encodeToString(bytes, Base64.DEFAULT);
220 
        return str;
221 
    }
222
212 223 
}

+ 1 - 1
app/src/main/java/com/electric/chargingpile/view/xrichtext/RichTextView.java
Целия файл 

@ -136,7 +136,7 @@ public class RichTextView extends ScrollView {
136 136 
        final RelativeLayout imageLayout = createImageLayout();
137 137 
        DataImageView imageView = (DataImageView) imageLayout.findViewById(R.id.edit_imageView);
138 138 
        RequestOptions options = new RequestOptions().centerCrop();
139 
        Glide.with(getContext()).load(imagePath).apply(options).into(imageView);
139 
        Glide.with(getContext()).load(path).apply(options).into(imageView);
140 140 
        //imageView.setImageBitmap(bmp);//这里改用Glide加载图片
141 141 
        //imageView.setBitmap(bmp);//这句去掉，保留下面的图片地址即可，优化图片占用
142 142 
//        imageView.setAbsolutePath(imagePath);//保留这句，后面保存数据会用

更新版本 · 6b9e47955f - Gogs: Go Git Service
Начало Каталог Помощ
Регистрация Вход
dudu
/
cdzApp
Наблюдаван 2
Харесван 1
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Ревизии 328 Версии 18 Уики
Преглед на файлове

更新版本

huyuguo преди 5 години
родител
bffced235f
ревизия
6b9e47955f
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
Разделен изглед Покажи статистика за разликите
  1. 2 2
      app/src/main/AndroidManifest.xml

+ 2 - 2
app/src/main/AndroidManifest.xml
Целия файл 

@ -2,8 +2,8 @@
2 2 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3 
    xmlns:tools="http://schemas.android.com/tools"
4 4 
    package="com.electric.chargingpile"
5 
    android:versionCode="90"
6 
    android:versionName="3.5.2">
5 
    android:versionCode="91"
6 
    android:versionName="3.5.3">
7 7 
    <!-- 往SDCard写入数据权限 -->
8 8 
    <permission
9 9 
        android:name="${applicationId}.permission.JPUSH_MESSAGE"