Merge branch '3.5.20'

# Conflicts:
#	app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java
#	app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

.gitignore

@@ -77,3 +77,4 @@ fastlane/readme.md
.idea/vcs.xml
.idea/encodings.xml
*.hprof
.idea

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="105"
    android:versionName="3.5.19">
    android:versionCode="106"
    android:versionName="3.5.20">
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

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

@@ -111,6 +111,7 @@ import cn.sharesdk.wechat.moments.WechatMoments;
import okhttp3.Call;
import okhttp3.Response;
import okhttp3.ResponseBody;
import pub.devrel.easypermissions.AfterPermissionGranted;
import pub.devrel.easypermissions.EasyPermissions;
@@ -1386,7 +1387,7 @@ public class ChargingCommentActivity extends AppCompatActivity implements View.O
            ImageDisplayActivity.actionStart(this, position);
        } else if (mInsterType == 2) {
            PictureSelector.create(ChargingCommentActivity.this)
                    .themeStyle(R.style.picture_default_style)
                    .themeStyle(com.luck.picture.lib.R.style.picture_default_style)
                    .setPictureStyle(Util.getWhiteStyle(ChargingCommentActivity.this))// 动态自定义相册主题
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
        }

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

@@ -106,7 +106,7 @@ import pub.devrel.easypermissions.EasyPermissions;
import static android.text.Html.FROM_HTML_MODE_LEGACY;
/**
 * 如果更改此页面，则需要同步更改 ZhanCommentActivity，
 * 如果更改此页面，则需要同步更改 ChargingCommentActivity，
 * ZhanCommentActivity 该页面为从地图充电icon-> 列表 ->去评论
 * */
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
@@ -497,8 +497,6 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                handler.sendMessage(msg);
                return;
            }
        }
        Message msg = new Message();
@@ -1052,7 +1050,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
            ImageDisplayActivity.actionStart(this, position);
        } else if (mInsterType == 2) {
            PictureSelector.create(ZhanCommentActivity.this)
                    .themeStyle(R.style.picture_default_style)
                    .themeStyle(com.luck.picture.lib.R.style.picture_default_style)
                    .setPictureStyle(Util.getWhiteStyle(ZhanCommentActivity.this))// 动态自定义相册主题
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
        }

app/src/main/java/com/electric/chargingpile/util/Util.java

@@ -510,7 +510,7 @@ public class Util {
        // 相册列表标题栏右侧下拉箭头
        style.pictureTitleDownResId = R.drawable.ic_orange_arrow_down;
        // 相册文件夹列表选中圆点
        style.pictureFolderCheckedDotStyle = R.drawable.picture_orange_oval;
        style.pictureFolderCheckedDotStyle = com.luck.picture.lib.R.drawable.picture_orange_oval;
        // 相册返回箭头
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
        // 标题栏字体颜色
@@ -520,27 +520,27 @@ public class Util {
        // 选择相册目录背景样式
        style.pictureAlbumStyle = R.drawable.picture_new_item_select_bg;
        // 相册列表勾选图片样式
        style.pictureCheckedStyle = R.drawable.picture_checkbox_selector;
        style.pictureCheckedStyle = com.luck.picture.lib.R.drawable.picture_checkbox_selector;
        // 相册列表底部背景色
        style.pictureBottomBgColor = ContextCompat.getColor(context, R.color.picture_color_fa);
        style.pictureBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa);
        // 已选数量圆点背景样式
        style.pictureCheckNumBgStyle = R.drawable.picture_num_oval;
        style.pictureCheckNumBgStyle = com.luck.picture.lib.R.drawable.picture_num_oval;
        // 相册列表底下预览文字色值(预览按钮可点击时的色值)
        style.picturePreviewTextColor = ContextCompat.getColor(context, R.color.picture_color_fa632d);
        style.picturePreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
        // 相册列表底下不可预览文字色值(预览按钮不可点击时的色值)
        style.pictureUnPreviewTextColor = ContextCompat.getColor(context, R.color.picture_color_9b);
        style.pictureUnPreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
        // 相册列表已完成色值(已完成 可点击色值)
        style.pictureCompleteTextColor = ContextCompat.getColor(context, R.color.picture_color_fa632d);
        style.pictureCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
        // 相册列表未完成色值(请选择 不可点击色值)
        style.pictureUnCompleteTextColor = ContextCompat.getColor(context, R.color.picture_color_9b);
        style.pictureUnCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
        // 预览界面底部背景色
        style.picturePreviewBottomBgColor = ContextCompat.getColor(context, R.color.picture_color_white);
        style.picturePreviewBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_white);
        // 原图按钮勾选样式  需设置.isOriginalImageControl(true); 才有效
        style.pictureOriginalControlStyle = R.drawable.picture_original_checkbox;
        style.pictureOriginalControlStyle = com.luck.picture.lib.R.drawable.picture_original_checkbox;
        // 原图文字颜色 需设置.isOriginalImageControl(true); 才有效
        style.pictureOriginalFontColor = ContextCompat.getColor(context, R.color.app_color_53575e);
        // 外部预览界面删除按钮样式
        style.pictureExternalPreviewDeleteStyle = R.drawable.picture_icon_black_delete;
        style.pictureExternalPreviewDeleteStyle = com.luck.picture.lib.R.drawable.picture_icon_black_delete;
        // 外部预览界面是否显示删除按钮
        style.pictureExternalPreviewGonePreviewDelete = true;
//        // 自定义相册右侧文本内容设置