修改bug

app/build.gradle

@@ -303,10 +303,10 @@ dependencies {
    // 库过期，下载源码修改
    //    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
    //选择图片，查看图片
    implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc10'
    implementation 'io.github.lucksiege:pictureselector:v2.7.1'
//    implementation files('libs/bugly_crash_release_3.2.2.jar')
    implementation "androidx.camera:camera-camera2:1.1.0-alpha07"
    implementation "androidx.camera:camera-core:1.1.0-alpha07"
//    implementation "androidx.camera:camera-core:1.1.0-alpha07"
//    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
    // 使用微信分享、登录、收藏、支付等功能需要的库以及文件

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

@@ -1849,8 +1849,8 @@ public class ClaimSurveyTwoActivity extends Activity implements View.OnClickList
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(false)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(true)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
@@ -1882,8 +1882,8 @@ public class ClaimSurveyTwoActivity extends Activity implements View.OnClickList
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
               // .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(true)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

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

@@ -36,6 +36,7 @@ import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.NetUtil;
import com.electric.chargingpile.util.StringUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.electric.chargingpile.view.CircleImageView;
@@ -255,7 +256,7 @@ public class SingleCommentActivity extends Activity implements View.OnClickListe
            tv_pcontext.setVisibility(View.VISIBLE);
            SpannableString ss = new SpannableString(content);
            Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
            Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
            Matcher matcher = pattern.matcher(ss);
            while (matcher.find()) {
                int start = matcher.start();

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

@@ -535,8 +535,8 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(true)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
@@ -568,8 +568,8 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(true)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

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

@@ -601,8 +601,8 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(true)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
@@ -633,8 +633,8 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
                .isEnableCrop(true)
                .rotateEnabled(false)//裁剪是否可旋转图片
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
                .circleDimmedLayer(true)// 是否开启圆形裁剪
                .isDragFrame(true)//是否可拖动裁剪框(固定)
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

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

@@ -70,6 +70,9 @@ import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.animators.AnimationType;
import com.luck.picture.lib.camera.CustomCameraView;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
@@ -948,8 +951,9 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
    private void addVideo() {
        PictureSelector.create(this)
                .openGallery(PictureMimeType.ofVideo())
                .selectionMode(PictureConfig.SINGLE)
               // .selectionMode(PictureConfig.SINGLE)
                .isCompress(true)//是否压缩
                .maxSelectNum(1)
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
                .isAndroidQTransform(true)
                .imageEngine(GlideEngine.createGlideEngine())
@@ -964,9 +968,11 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
                .videoMaxSecond(16)   // 查询多少秒以内的视频
                .videoMinSecond(2)   // 查询多少秒以内的视频
                .recordVideoSecond(15)//录制视频秒数 默认60s
                .recordVideoSecond(16)//录制视频秒数 默认60s
                .isPreviewVideo(true)//是否预览视频
                .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
                .setButtonFeatures(CustomCameraView.BUTTON_STATE_ONLY_RECORDER) //自定义按钮样式
                .isUseCustomCamera(true)// 开启自定义相机
               // .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
                .filterMaxFileSize( 100 * 1024 )//查询指定大小内的图片、视频、音频大小，单位 KB
                .forResult(REQUEST_VIDEO_CODE_CHOOSE);
    }

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

@@ -31,6 +31,7 @@ import com.electric.chargingpile.activity.SingleCommentActivity;
import com.electric.chargingpile.activity.CommentVideoDetailActivity;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.StringUtils;
import com.electric.chargingpile.util.Util;
import com.electric.chargingpile.view.CircleImageView;
import com.squareup.picasso.Picasso;
@@ -535,7 +536,7 @@ public class NewPingLunAdapter extends BaseAdapter {
                    holder.tv_comment.setVisibility(View.VISIBLE);
                    SpannableString ss = new SpannableString(datas.get(position).getString(
                            "content"));
                    Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
                    Matcher matcher = pattern.matcher(ss);
                    while (matcher.find()) {
                        int start = matcher.start();

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

@@ -28,6 +28,7 @@ import com.electric.chargingpile.activity.SingleCommentActivity;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.util.NetUtil;
import com.electric.chargingpile.util.OkHttpUtil;
import com.electric.chargingpile.util.StringUtils;
import com.electric.chargingpile.util.Util;
import com.electric.chargingpile.view.CircleImageView;
import com.squareup.okhttp.Request;
@@ -345,7 +346,7 @@ public class PingLunAdapter extends BaseAdapter {
                        "pcontent"));
//                SpannableString ss = new SpannableString("123#haode#");
                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
                Matcher matcher = pattern.matcher(ss);
                while (matcher.find()) {
                    int start = matcher.start();
@@ -454,7 +455,7 @@ public class PingLunAdapter extends BaseAdapter {
    public static boolean isTopic() {
//        String strPattern = "#[0-9a-zA-Z\\u4e00-\\u9fa5]+#";
        Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
        Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
        Matcher matcher = pattern.matcher("11111#haode#");
        System.out.println(matcher.matches() + "---");

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

@@ -34,6 +34,7 @@ import com.electric.chargingpile.util.CarTypeUtil;
import com.electric.chargingpile.util.CircleTransform;
import com.electric.chargingpile.util.DES3;
import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.StringUtils;
import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.squareup.picasso.Picasso;
@@ -202,7 +203,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
                } else {
                    holder.tv_pcontext.setVisibility(View.VISIBLE);
                    SpannableString ss = new SpannableString(content);
                    Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
                    Matcher matcher = pattern.matcher(ss);
                    while (matcher.find()) {
                        int start = matcher.start();

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

@@ -10,6 +10,10 @@ import android.os.StrictMode;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.camera.camera2.Camera2Config;
import androidx.camera.core.CameraXConfig;
import androidx.multidex.MultiDexApplication;
import com.alibaba.fastjson.JSONException;
@@ -44,6 +48,8 @@ import com.tencent.bugly.crashreport.CrashReport;
import com.zhy.http.okhttp.OkHttpUtils;
import com.zhy.http.okhttp.callback.StringCallback;
import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -63,7 +69,7 @@ import okhttp3.Call;
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
public class MainApplication extends MultiDexApplication {
public class MainApplication extends MultiDexApplication implements CameraXConfig.Provider{
    public static MainApplication instances;
    private DaoMaster.DevOpenHelper mHelper;
    private SQLiteDatabase db;
@@ -418,6 +424,13 @@ public class MainApplication extends MultiDexApplication {
        CrashReport.initCrashReport(MainApplication.context, "900010422", BuildConfig.DEBUG);
        CrashReport.setAppChannel(MainApplication.context, BuildConfig.FLAVOR);
    }
    @NonNull
    @NotNull
    @Override
    public CameraXConfig getCameraXConfig() {
        return Camera2Config.defaultConfig();
    }
}

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

@@ -63,6 +63,7 @@ import com.electric.chargingpile.util.JsonUtils;
import com.electric.chargingpile.util.LoadingDialog;
import com.electric.chargingpile.util.Md5Util;
import com.electric.chargingpile.util.OkHttpUtil;
import com.electric.chargingpile.util.StringUtils;
import com.electric.chargingpile.util.Util;
import com.electric.chargingpile.view.CircleImageView;
import com.electric.chargingpile.view.CustomProgressDialog;
@@ -1308,7 +1309,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                            } else {
                                tv_pcontext.setVisibility(View.VISIBLE);
                                SpannableString ss = new SpannableString(content);
                                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
                                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
                                Matcher matcher = pattern.matcher(ss);
                                while (matcher.find()) {
                                    int start = matcher.start();

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

@@ -17,6 +17,8 @@ import java.util.regex.Pattern;
 */
public class StringUtils {
    private static final String TAG = "StringUtils";
    //话题 正则 匹配
    public static String ThemeRegular = "#[0-9a-zA-Z,~!@#$%^&*()+=|{}':;',\\\\[\\\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。， 、？\\u4e00-\\u9fa5]+#";
    /**

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

@@ -512,7 +512,7 @@ public class Util {
        // 相册文件夹列表选中圆点
        style.pictureFolderCheckedDotStyle = R.drawable.picture_orange_oval;
        // 相册返回箭头
        style.pictureLeftBackIcon = R.drawable.ic_back_arrow;
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
        // 标题栏字体颜色
        style.pictureTitleTextColor = ContextCompat.getColor(context, R.color.app_color_black);
        // 相册右侧取消按钮字体颜色  废弃 改用.pictureRightDefaultTextColor和.pictureRightDefaultTextColor

app/src/main/java/com/electric/chargingpile/view/SignInDialog.java

@@ -3,6 +3,7 @@ package com.electric.chargingpile.view;
import android.content.Context;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
import android.view.LayoutInflater;
import android.view.View;
@@ -13,6 +14,8 @@ import android.widget.TextView;
import com.electric.chargingpile.R;
import static android.text.Html.FROM_HTML_MODE_LEGACY;
/**
 * Created by demon on 2017/5/26.
 */
@@ -107,20 +110,31 @@ public class SignInDialog {
            tv_first.setText(first);
        }
        int intLogDay = Integer.parseInt(log_day);
        int i1 = intLogDay / 7;//获取倍数
        i1 = i1 * 7 ;
        if (i1 < intLogDay){
            i1 += 7;
        }
        int i2 = i1 - intLogDay; //差值
        if (score != null && !score.equals("")) {
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币"));
            int i = 7 - Integer.parseInt(log_day);
            if (i>=0){
                tv_2.setText("还有"+ i+"天获得充电优惠哦~");
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币", FROM_HTML_MODE_LEGACY));
            if ( i2 > 0 ){
                tv_2.setText("还有"+ i2 +"天获得充电优惠哦~");
            }
        } else {
            tv_num.setText("");
        }
        if (Integer.parseInt(log_day)>= 7){
        if (i2 == 0){
            tv_num.setText("充电订单折扣优惠券已到账");
            tv_2.setText("充电订单八折");
        }
        return this;
    }

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

@@ -125,6 +125,7 @@
        <TextView
            android:textColor="@color/color_1f1f1f"
            android:id="@+id/tv_pcontext"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/ll_out"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -14,6 +15,7 @@
        android:background="#fafafa">
        <com.electric.chargingpile.view.CircleImageView
            tools:visibility="visible"
            android:id="@+id/iv_icon_son"
            app:border_color="@color/white"
            android:layout_width="35dp"
@@ -34,12 +36,13 @@
            android:layout_alignParentLeft="true"
            android:layout_gravity="center_vertical"
            android:layout_marginTop="12dp"
            android:text="EV200车主"
            android:text="EV200车主"   tools:visibility="visible"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="@color/ui_65"
            android:textSize="13sp" />
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_city_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -56,6 +59,8 @@
        <TextView
            android:textColor="@color/color_1f1f1f"
            tools:visibility="visible"
            android:id="@+id/tv_comment_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -71,6 +76,7 @@
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_time_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -84,6 +90,7 @@
            android:textSize="12sp" />
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_reply_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -97,6 +104,7 @@
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_childName_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -109,6 +117,7 @@
            android:visibility="gone" />
        <TextView
            tools:visibility="visible"
            android:id="@+id/textView15"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -121,6 +130,7 @@
            android:visibility="gone" />
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_parentName_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -133,6 +143,7 @@
            android:visibility="gone" />
        <TextView
            tools:visibility="visible"
            android:id="@+id/tv_commentDetail_son"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -145,6 +156,7 @@
            android:visibility="gone" />
        <View
            tools:visibility="visible"
            android:id="@+id/vvvv"
            android:layout_width="match_parent"
            android:layout_height="0.5dp"

app/src/main/res/values/colors.xml

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="color_green_style1">#ff3ab948</color>
    <color name="color_1f1f1f">#1F1F1F</color>
</resources>