拍照权限修改

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

@@ -43,6 +43,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.Zhan;
@@ -940,6 +942,12 @@ public class AlterOneActivity extends Activity implements View.OnClickListener,
    }
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
    }

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

@@ -3118,6 +3118,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
    private boolean isPermissionOK() {
        return EasyPermissions.hasPermissions(this,
                Manifest.permission.CAMERA,
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
                Manifest.permission.READ_EXTERNAL_STORAGE
        );

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

@@ -47,6 +47,7 @@ import android.widget.TimePicker;
import android.widget.Toast;
import android.widget.ToggleButton;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
@@ -395,7 +396,7 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
                .showSingleMediaType(true)
                .countable(true)
                .maxSelectable(PIC_NUM - Bimp.tempSelectBitmap.size())
                .maxSelectable(1)
                .capture(true)
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
                .imageEngine(new GlideEngine())
@@ -1049,6 +1050,12 @@ public class PrivateZhuangInfoActivity extends Activity implements View.OnClickL
    }
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
    }

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

@@ -42,6 +42,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import com.blankj.utilcode.util.CacheUtils;
import com.electric.chargingpile.R;
import com.electric.chargingpile.application.MainApplication;
@@ -216,24 +218,11 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
        relativeLayout.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
//                Toast.makeText(getContext(),"!!!",Toast.LENGTH_SHORT).show();
//                ((NewZhanDetailsActivity) getApplicationContext()).hideKeyboard(ZhanCommentActivity.et_commet);
            }
        });
//        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(
//                ViewGroup.LayoutParams.WRAP_CONTENT,
//                ViewGroup.LayoutParams.WRAP_CONTENT);// 设置布局管理器参数
//        params.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);//
//        params.addRule(RelativeLayout.CENTER_HORIZONTAL);
//        params.setMargins(0, 0, 0, 230);
//        tv_point.setGravity(Gravity.CENTER);
//        tv_point.setVisibility(View.GONE);
//        // 设置放置规则
//        relativeLayout.addView(tv_point, params);
//        tv_point.startAnimation(animation);
        rl_huodong = (RelativeLayout) findViewById(R.id.rl_huodong);
        tv_grade = (TextView) findViewById(R.id.tv_grade);
        tv_huodong = (TextView) findViewById(R.id.tv_huodong);
@@ -259,13 +248,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
            @Override
            public void onTextChanged(CharSequence s, int start, int before, int count) {
//                if (et_pinglun.getText().toString().equals("")){
//                    tv_make_sure.setBackgroundResource(R.color.huise);
//                    tv_make_sure.setEnabled(false);
//                }else {
//                    tv_make_sure.setBackgroundResource(R.color.lvse);
//                    tv_make_sure.setEnabled(true);
//                }
            }
            @Override
@@ -281,8 +263,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                } else {
                    Log.e("edit===", et_pinglun.getText().toString());
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
//                        tv_make_sure.setBackgroundResource(R.color.huise);
//                        tv_make_sure.setEnabled(false);
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
@@ -332,8 +312,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                    }
                } else {
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
//                        tv_make_sure.setBackgroundResource(R.color.huise);
//                        tv_make_sure.setEnabled(false);
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
@@ -476,12 +454,9 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
        final RelativeLayout parent = (RelativeLayout) view.findViewById(R.id.parent);
        Button bt1 = (Button) view
                .findViewById(R.id.item_popupwindows_camera);
        Button bt2 = (Button) view
                .findViewById(R.id.item_popupwindows_Photo);
        Button bt3 = (Button) view
                .findViewById(R.id.item_popupwindows_cancel);
        Button bt1 = (Button) view.findViewById(R.id.item_popupwindows_camera);
        Button bt2 = (Button) view.findViewById(R.id.item_popupwindows_Photo);
        Button bt3 = (Button) view.findViewById(R.id.item_popupwindows_cancel);
        parent.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -494,20 +469,15 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
        bt1.setOnClickListener(new View.OnClickListener() {
            public void onClick(View v) {
                photo();
//                saveFullImage();
                pop.dismiss();
//                Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
//                ((Activity) mContext).startActivityForResult(intent, 2);
                ll_popup.clearAnimation();
            }
        });
        bt2.setOnClickListener(new View.OnClickListener() {
            public void onClick(View v) {
                Intent intent = new Intent(ZhanCommentActivity.this,
                        AlbumActivityComment.class);
                Intent intent = new Intent(ZhanCommentActivity.this, AlbumActivityComment.class);
                startActivity(intent);
                overridePendingTransition(R.anim.activity_translate_in, R.anim.activity_translate_out);
//                startActivityForResult(intent, 1);
                pop.dismiss();
                ll_popup.clearAnimation();
            }
@@ -643,8 +613,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
        long updatetime = appTime1 - MainMapActivity.cha - 1;
        Log.i("updatetime(long)---", updatetime + "");
        Log.i("cha---", MainMapActivity.cha + "");
//        String token = String.valueOf(updatetime);
//        Log.i("token---", token);
        for (int i = 0; i < Bimp.tempSelectBitmap.size(); i++) {
            try {
                bm = imageZoom(Bimp.tempSelectBitmap.get(i).getBitmap());
@@ -709,13 +677,9 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                if (select_s.contains(stringArr[position])) {
                    String s = stringArr[position] + ",";
                    select_s = select_s.replaceAll(s, "");
//                    Log.e("select===",select_s);
                } else {
                    select_s += stringArr[position] + ",";
                }
//                if (!select_s.equals("")) {
//                    select_s = select_s.substring(0, select_s.length() - 1);
//                }
                Log.e("select===", select_s);
@@ -729,8 +693,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                    }
                } else {
                    if (et_pinglun.getText().toString().equals("#" + MainApplication.huodonglabel + "# ")) {
//                        tv_make_sure.setBackgroundResource(R.color.huise);
//                        tv_make_sure.setEnabled(false);
                        if (!star_level.equals("") && !select_s.equals("")) {
                            tv_make_sure.setTextColor(getResources().getColor(R.color.lvse));
                            tv_make_sure.setEnabled(true);
@@ -756,13 +718,8 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
    private void addComment(String fileUrl, String thumUrl) throws Exception {
        long appTime1 = System.currentTimeMillis() / 1000;
//        Log.i("appTime(long)---", appTime1 + "");
        long updatetime = appTime1 - MainMapActivity.cha - 2;
//        Log.i("updatetime(long)---", updatetime + "");
//        Log.i("cha---", MainMapActivity.cha + "");
        String token = String.valueOf(updatetime);
//        Log.e("commentType==",commentType+"");
        String childCommentUrl = "";
        if (commentsBean != null) {
            childCommentUrl = "&parentid=" + commentsBean.getId() + "&puserid=" + commentsBean.getUserid();
@@ -798,12 +755,6 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                            submitPF(data);
                            dialog.cancel();
//                            Toast.makeText(getApplicationContext(),"评论成功",Toast.LENGTH_SHORT).show();
//                                    new Handler().postDelayed(new Runnable() {
//                                        public void run() {
//                                            finish();
//                                        }
//                                    }, 1000);
                            if (!plusScore.equals("")) {
                                tv_point.setText(plusScore);
                                rl_point.setVisibility(View.VISIBLE);
@@ -826,27 +777,7 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
                                    }
                                }, 1500);
                            }
//                            ZhanCommentActivity.relativeLayout.setVisibility(View.VISIBLE);
//                            ZhanCommentActivity.textView.setVisibility(View.VISIBLE);
//                            ZhanCommentActivity.textView.startAnimation(ZhanCommentActivity.animation);
//                            new Handler().postDelayed(new Runnable() {
//                                public void run() {
//                                    ZhanCommentActivity.textView.setVisibility(View.GONE);
//                                    MyOtto.getInstance().post(new RankinglistRefreshEvent());
//                                    finish();
//                                }
//                            }, 1500);
//                                    Toast.makeText(getApplicationContext(),"评论成功",Toast.LENGTH_SHORT).show();
//                                    CommentFragment.relativeLayout.setVisibility(View.VISIBLE);
//                                    CommentFragment.textView.setVisibility(View.VISIBLE);
//                                    CommentFragment.textView.startAnimation(CommentFragment.animation);
//                                    new Handler().postDelayed(new Runnable() {
//                                        public void run() {
//                                            CommentFragment.textView.setVisibility(View.GONE);
//                                        }
//                                    }, 2000);
                            NewZhanDetailsActivity.reFreshUi();
                        } else {
                            ToastUtil.showToast(getApplicationContext(), rtnMsg, Toast.LENGTH_SHORT);
                        }
@@ -935,6 +866,12 @@ public class ZhanCommentActivity extends Activity implements View.OnClickListene
    }
    @Override
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
    }
    @Override
    public void onPermissionsGranted(int requestCode, List<String> perms) {
    }

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

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.zhy.autolayout.AutoRelativeLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
<com.zhy.autolayout.AutoRelativeLayout 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"
    xmlns:zhy="http://schemas.android.com/apk/res-auto"
@@ -12,10 +11,10 @@
    <View
        android:id="@+id/view_title"
        android:layout_height="0.5dp"
        android:layout_width="match_parent"
        android:background="@color/ui_line"
        android:layout_below="@+id/rl_title"/>
        android:layout_height="0.5dp"
        android:layout_below="@+id/rl_title"
        android:background="@color/ui_line" />
    <ImageView
        android:id="@+id/iv_hongbao"
@@ -23,18 +22,18 @@
        android:layout_height="wrap_content"
        android:layout_alignParentBottom="true"
        android:layout_centerHorizontal="true"
        android:layout_marginBottom="56px"
        android:src="@drawable/icon_hongbao"
        android:visibility="gone"
        android:layout_marginBottom="56px" />
        android:visibility="gone" />
    <com.zhy.autolayout.AutoRelativeLayout
        android:id="@+id/rl_title"
        android:layout_width="match_parent"
        android:layout_height="130px"
        android:background="@color/title_background"
        android:layout_alignParentTop="true"
        android:layout_alignParentStart="true"
        android:layout_alignParentLeft="true"
        android:layout_alignParentStart="true">
        android:layout_alignParentTop="true"
        android:background="@color/title_background">
        <TextView
            android:id="@+id/tv_zhan_name"
@@ -52,82 +51,82 @@
            android:layout_alignParentLeft="true"
            android:layout_centerVertical="true"
            android:contentDescription="@null"
            android:paddingBottom="4dp"
            android:paddingLeft="44px"
            android:paddingRight="44px"
            android:paddingTop="4dp"
            android:paddingRight="44px"
            android:paddingBottom="4dp"
            android:src="@drawable/icon_lvback1119" />
        <TextView
            android:id="@+id/tv_make_sure"
            android:layout_width="wrap_content"
            android:layout_height="match_parent"
            android:layout_alignParentRight="true"
            android:gravity="center"
            android:paddingLeft="15dp"
            android:paddingRight="15dp"
            android:text="发表"
            android:textColor="@color/lvse"
            android:textSize="15sp"
            android:layout_alignParentRight="true" />
            android:textSize="15sp" />
    </com.zhy.autolayout.AutoRelativeLayout>
    <com.electric.chargingpile.view.ObservableScrollView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_below="@+id/view_title"
        android:layout_alignParentLeft="true"
        android:layout_alignParentStart="true">
        android:layout_alignParentStart="true"
        android:layout_alignParentLeft="true">
        <com.zhy.autolayout.AutoLinearLayout
            android:id="@+id/ll_pingfen"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_alignParentStart="true"
            android:layout_alignParentLeft="true"
            android:background="@color/white"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:orientation="vertical"
            android:background="@color/white"
            android:layout_alignParentLeft="true"
            android:layout_alignParentStart="true">
            android:orientation="vertical">
            <RelativeLayout
                android:layout_width="match_parent"
                android:layout_height="58dp">
                <TextView
                    android:id="@+id/textView33"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_gravity="center_horizontal"
                    android:textColor="@color/ui_62"
                    android:textSize="14sp"
                    android:layout_marginLeft="15dp"
                    android:layout_centerVertical="true"
                    android:text="充电体验"
                    android:id="@+id/textView33" />
                    android:textColor="@color/ui_62"
                    android:textSize="14sp" />
                <com.electric.chargingpile.view.RatingBarView
                    android:id="@+id/custom_ratingbar"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_gravity="center_horizontal"
                    android:layout_marginLeft="21dp"
                    android:layout_toRightOf="@+id/textView33"
                    android:stepSize="1"
                    android:layout_centerVertical="true"
                    app:starCount="5"
                    app:starEmpty="@drawable/icon_star_empty"
                    app:starFill="@drawable/icon_star_full"
                    app:starImageSize="24dp"
                    android:layout_toRightOf="@+id/textView33"
                    android:layout_marginLeft="21dp" />
                    app:starImageSize="24dp" />
                <TextView
                    android:id="@+id/tv_grade"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:layout_toRightOf="@+id/custom_ratingbar"
                    android:layout_marginLeft="20dp"
                    android:layout_toRightOf="@+id/custom_ratingbar"
                    android:text=""
                    android:textColor="#ffa900"
                    android:textSize="20sp"
                    android:text=""/>
                    android:textSize="20sp" />
            </RelativeLayout>
@@ -137,11 +136,11 @@
                android:layout_height="wrap_content"
                android:layout_marginLeft="15dp"
                android:layout_marginRight="15dp"
                app:paddingStart="0dp"
                app:paddingEnd="0dp"
                android:visibility="visible"
                app:gravity="left"
                zhy:max_select="-1"
                android:visibility="visible">
                app:paddingEnd="0dp"
                app:paddingStart="0dp"
                zhy:max_select="-1">
            </com.zhy.view.flowlayout.TagFlowLayout>
@@ -151,14 +150,14 @@
                android:layout_height="wrap_content">
                <TextView
                    android:id="@+id/tv_huodong"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_centerVertical="true"
                    android:textColor="@color/ui_62"
                    android:textSize="14sp"
                    android:layout_marginLeft="15dp"
                    android:text="活动标签"
                    android:id="@+id/tv_huodong"/>
                    android:textColor="@color/ui_62"
                    android:textSize="14sp" />
                <com.zhy.view.flowlayout.TagFlowLayout
                    android:id="@+id/id_flowlayout_activity"
@@ -176,26 +175,26 @@
            <View
                android:layout_width="match_parent"
                android:layout_height="0.5dp"
                android:background="@color/Line"
                android:layout_marginLeft="15dp"
                android:layout_marginTop="15dp"/>
                android:layout_marginTop="15dp"
                android:background="@color/Line" />
            <com.electric.chargingpile.view.REditText
                android:id="@+id/et_pinglun"
                android:layout_width="match_parent"
                android:layout_height="85dp"
                android:layout_marginBottom="7dp"
                android:background="@color/white"
                android:gravity="left|top"
                android:hint="对本次充电感受如何？跟其他车友分享一下吧～"
                android:paddingLeft="15dp"
                android:paddingRight="15dp"
                android:paddingTop="12dp"
                android:paddingRight="15dp"
                android:paddingBottom="12dp"
                android:background="@color/white"
                android:hint="对本次充电感受如何？跟其他车友分享一下吧～"
                android:textColorHint="@color/ui_68"
                android:textColor="@color/ui_62"
                android:textColorHint="@color/ui_68"
                android:textSize="13sp"
                android:gravity="left|top"
                android:visibility="visible"
                android:layout_marginBottom="7dp"/>
                android:visibility="visible" />
            <GridView
                android:id="@+id/noScrollgridview"
@@ -206,14 +205,13 @@
                android:horizontalSpacing="3dp"
                android:numColumns="3"
                android:scrollbars="none"
                android:verticalSpacing="5dp" >
            </GridView>
                android:verticalSpacing="5dp"></GridView>
            <View
                android:layout_width="match_parent"
                android:layout_height="0.5dp"
                android:background="@color/Line"
                android:layout_marginTop="15dp"/>
                android:layout_marginTop="15dp"
                android:background="@color/Line" />
        </com.zhy.autolayout.AutoLinearLayout>
@@ -223,33 +221,33 @@
        android:id="@+id/tv_one"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_alignParentBottom="true"
        android:layout_centerHorizontal="true"
        android:layout_gravity="center"
        android:layout_marginBottom="51dp"
        android:background="@drawable/icon_5point"
        android:gravity="center"
        android:padding="5dp"
        android:scaleType="fitXY"
        android:background="@drawable/icon_5point"
        android:textColor="#000000"
        android:visibility="gone"
        android:layout_marginBottom="51dp"
        android:layout_alignParentBottom="true"
        android:layout_centerHorizontal="true" />
        android:visibility="gone" />
    <RelativeLayout
        android:id="@+id/rl_point"
        android:layout_width="80dp"
        android:layout_height="80dp"
        android:layout_marginBottom="50dp"
        android:layout_centerHorizontal="true"
        android:layout_alignParentBottom="true"
        android:visibility="gone"
        android:background="@drawable/icon_point_bg">
        android:layout_centerHorizontal="true"
        android:layout_marginBottom="50dp"
        android:background="@drawable/icon_point_bg"
        android:visibility="gone">
        <LinearLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:layout_centerInParent="true">
            android:layout_centerInParent="true"
            android:orientation="vertical">
            <LinearLayout
                android:layout_width="wrap_content"
@@ -260,37 +258,26 @@
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="+"
                    android:textSize="16sp"
                    android:textColor="@color/white"/>
                    android:textColor="@color/white"
                    android:textSize="16sp" />
                <TextView
                    android:id="@+id/tv_point"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="20"
                    android:textSize="19sp"
                    android:layout_marginLeft="2dp"
                    android:textColor="@color/white"/>
                    android:text="20"
                    android:textColor="@color/white"
                    android:textSize="19sp" />
            </LinearLayout>
            <TextView
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center_horizontal"
                android:layout_marginTop="2dp"
                android:text="充电币"
                android:textSize="13sp"
                android:textColor="@color/white"
                android:layout_marginTop="2dp"/>
                android:textSize="13sp" />
        </LinearLayout>
    </RelativeLayout>
</com.zhy.autolayout.AutoRelativeLayout>