Browse Source

修改bug

hy 2 years ago
parent
commit
a14bfa24bf

+ 2 - 2
app/build.gradle

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

+ 4 - 4
app/src/main/java/com/electric/chargingpile/activity/ClaimSurveyTwoActivity.java

1849
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
1849
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
1850
                .isEnableCrop(true)
1850
                .isEnableCrop(true)
1851
                .rotateEnabled(false)//裁剪是否可旋转图片
1851
                .rotateEnabled(false)//裁剪是否可旋转图片
1852
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
1853
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
1852
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
1853
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
1854
                .circleDimmedLayer(false)// 是否开启圆形裁剪
1854
                .circleDimmedLayer(false)// 是否开启圆形裁剪
1855
                .isDragFrame(true)//是否可拖动裁剪框(固定)
1855
                .isDragFrame(true)//是否可拖动裁剪框(固定)
1856
                .showCropFrame(true)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
1856
                .showCropFrame(true)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
1882
                .isEnableCrop(true)
1882
                .isEnableCrop(true)
1883
                .rotateEnabled(false)//裁剪是否可旋转图片
1883
                .rotateEnabled(false)//裁剪是否可旋转图片
1884
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
1884
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
1885
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
1886
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
1885
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
1886
               // .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
1887
                .circleDimmedLayer(true)// 是否开启圆形裁剪
1887
                .circleDimmedLayer(true)// 是否开启圆形裁剪
1888
                .isDragFrame(true)//是否可拖动裁剪框(固定)
1888
                .isDragFrame(true)//是否可拖动裁剪框(固定)
1889
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
1889
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

+ 2 - 1
app/src/main/java/com/electric/chargingpile/activity/SingleCommentActivity.java

36
import com.electric.chargingpile.util.JsonUtils;
36
import com.electric.chargingpile.util.JsonUtils;
37
import com.electric.chargingpile.util.LoadingDialog;
37
import com.electric.chargingpile.util.LoadingDialog;
38
import com.electric.chargingpile.util.NetUtil;
38
import com.electric.chargingpile.util.NetUtil;
39
import com.electric.chargingpile.util.StringUtils;
39
import com.electric.chargingpile.util.ToastUtil;
40
import com.electric.chargingpile.util.ToastUtil;
40
import com.electric.chargingpile.util.Util;
41
import com.electric.chargingpile.util.Util;
41
import com.electric.chargingpile.view.CircleImageView;
42
import com.electric.chargingpile.view.CircleImageView;
255
256
256
            tv_pcontext.setVisibility(View.VISIBLE);
257
            tv_pcontext.setVisibility(View.VISIBLE);
257
            SpannableString ss = new SpannableString(content);
258
            SpannableString ss = new SpannableString(content);
258
            Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
259
            Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
259
            Matcher matcher = pattern.matcher(ss);
260
            Matcher matcher = pattern.matcher(ss);
260
            while (matcher.find()) {
261
            while (matcher.find()) {
261
                int start = matcher.start();
262
                int start = matcher.start();

+ 4 - 4
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java

535
                .isEnableCrop(true)
535
                .isEnableCrop(true)
536
                .rotateEnabled(false)//裁剪是否可旋转图片
536
                .rotateEnabled(false)//裁剪是否可旋转图片
537
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
537
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
538
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
539
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
538
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
539
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
540
                .circleDimmedLayer(true)// 是否开启圆形裁剪
540
                .circleDimmedLayer(true)// 是否开启圆形裁剪
541
                .isDragFrame(true)//是否可拖动裁剪框(固定)
541
                .isDragFrame(true)//是否可拖动裁剪框(固定)
542
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
542
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
568
                .isEnableCrop(true)
568
                .isEnableCrop(true)
569
                .rotateEnabled(false)//裁剪是否可旋转图片
569
                .rotateEnabled(false)//裁剪是否可旋转图片
570
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
570
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
571
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
572
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
571
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
572
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
573
                .circleDimmedLayer(true)// 是否开启圆形裁剪
573
                .circleDimmedLayer(true)// 是否开启圆形裁剪
574
                .isDragFrame(true)//是否可拖动裁剪框(固定)
574
                .isDragFrame(true)//是否可拖动裁剪框(固定)
575
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
575
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

+ 4 - 4
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java

601
                .isEnableCrop(true)
601
                .isEnableCrop(true)
602
                .rotateEnabled(false)//裁剪是否可旋转图片
602
                .rotateEnabled(false)//裁剪是否可旋转图片
603
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
603
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
604
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
605
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
604
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
605
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
606
                .circleDimmedLayer(true)// 是否开启圆形裁剪
606
                .circleDimmedLayer(true)// 是否开启圆形裁剪
607
                .isDragFrame(true)//是否可拖动裁剪框(固定)
607
                .isDragFrame(true)//是否可拖动裁剪框(固定)
608
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
608
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
633
                .isEnableCrop(true)
633
                .isEnableCrop(true)
634
                .rotateEnabled(false)//裁剪是否可旋转图片
634
                .rotateEnabled(false)//裁剪是否可旋转图片
635
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
635
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
636
                .freeStyleCropMode(OverlayView.DEFAULT_FREESTYLE_CROP_MODE)// 裁剪框拖动模式
637
                .isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
636
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
637
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
638
                .circleDimmedLayer(true)// 是否开启圆形裁剪
638
                .circleDimmedLayer(true)// 是否开启圆形裁剪
639
                .isDragFrame(true)//是否可拖动裁剪框(固定)
639
                .isDragFrame(true)//是否可拖动裁剪框(固定)
640
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
640
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false

+ 9 - 3
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

70
import com.google.gson.reflect.TypeToken;
70
import com.google.gson.reflect.TypeToken;
71
import com.luck.picture.lib.PictureSelector;
71
import com.luck.picture.lib.PictureSelector;
72
import com.luck.picture.lib.animators.AnimationType;
72
import com.luck.picture.lib.animators.AnimationType;
73
74
75
import com.luck.picture.lib.camera.CustomCameraView;
73
import com.luck.picture.lib.config.PictureConfig;
76
import com.luck.picture.lib.config.PictureConfig;
74
import com.luck.picture.lib.config.PictureMimeType;
77
import com.luck.picture.lib.config.PictureMimeType;
75
import com.luck.picture.lib.entity.LocalMedia;
78
import com.luck.picture.lib.entity.LocalMedia;
948
    private void addVideo() {
951
    private void addVideo() {
949
        PictureSelector.create(this)
952
        PictureSelector.create(this)
950
                .openGallery(PictureMimeType.ofVideo())
953
                .openGallery(PictureMimeType.ofVideo())
951
                .selectionMode(PictureConfig.SINGLE)
954
               // .selectionMode(PictureConfig.SINGLE)
952
                .isCompress(true)//是否压缩
955
                .isCompress(true)//是否压缩
956
                .maxSelectNum(1)
953
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
957
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
954
                .isAndroidQTransform(true)
958
                .isAndroidQTransform(true)
955
                .imageEngine(GlideEngine.createGlideEngine())
959
                .imageEngine(GlideEngine.createGlideEngine())
964
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
968
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
965
                .videoMaxSecond(16)   // 查询多少秒以内的视频
969
                .videoMaxSecond(16)   // 查询多少秒以内的视频
966
                .videoMinSecond(2)   // 查询多少秒以内的视频
970
                .videoMinSecond(2)   // 查询多少秒以内的视频
967
                .recordVideoSecond(15)//录制视频秒数 默认60s
971
                .recordVideoSecond(16)//录制视频秒数 默认60s
968
                .isPreviewVideo(true)//是否预览视频
972
                .isPreviewVideo(true)//是否预览视频
969
                .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
973
                .setButtonFeatures(CustomCameraView.BUTTON_STATE_ONLY_RECORDER) //自定义按钮样式
974
                .isUseCustomCamera(true)// 开启自定义相机
975
               // .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
970
                .filterMaxFileSize( 100 * 1024 )//查询指定大小内的图片、视频、音频大小,单位 KB
976
                .filterMaxFileSize( 100 * 1024 )//查询指定大小内的图片、视频、音频大小,单位 KB
971
                .forResult(REQUEST_VIDEO_CODE_CHOOSE);
977
                .forResult(REQUEST_VIDEO_CODE_CHOOSE);
972
    }
978
    }

+ 2 - 1
app/src/main/java/com/electric/chargingpile/adapter/NewPingLunAdapter.java

31
import com.electric.chargingpile.activity.CommentVideoDetailActivity;
31
import com.electric.chargingpile.activity.CommentVideoDetailActivity;
32
import com.electric.chargingpile.application.MainApplication;
32
import com.electric.chargingpile.application.MainApplication;
33
import com.electric.chargingpile.util.JsonUtils;
33
import com.electric.chargingpile.util.JsonUtils;
34
import com.electric.chargingpile.util.StringUtils;
34
import com.electric.chargingpile.util.Util;
35
import com.electric.chargingpile.util.Util;
35
import com.electric.chargingpile.view.CircleImageView;
36
import com.electric.chargingpile.view.CircleImageView;
36
import com.squareup.picasso.Picasso;
37
import com.squareup.picasso.Picasso;
535
                    holder.tv_comment.setVisibility(View.VISIBLE);
536
                    holder.tv_comment.setVisibility(View.VISIBLE);
536
                    SpannableString ss = new SpannableString(datas.get(position).getString(
537
                    SpannableString ss = new SpannableString(datas.get(position).getString(
537
                            "content"));
538
                            "content"));
538
                    Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
539
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
539
                    Matcher matcher = pattern.matcher(ss);
540
                    Matcher matcher = pattern.matcher(ss);
540
                    while (matcher.find()) {
541
                    while (matcher.find()) {
541
                        int start = matcher.start();
542
                        int start = matcher.start();

+ 3 - 2
app/src/main/java/com/electric/chargingpile/adapter/PingLunAdapter.java

28
import com.electric.chargingpile.application.MainApplication;
28
import com.electric.chargingpile.application.MainApplication;
29
import com.electric.chargingpile.util.NetUtil;
29
import com.electric.chargingpile.util.NetUtil;
30
import com.electric.chargingpile.util.OkHttpUtil;
30
import com.electric.chargingpile.util.OkHttpUtil;
31
import com.electric.chargingpile.util.StringUtils;
31
import com.electric.chargingpile.util.Util;
32
import com.electric.chargingpile.util.Util;
32
import com.electric.chargingpile.view.CircleImageView;
33
import com.electric.chargingpile.view.CircleImageView;
33
import com.squareup.okhttp.Request;
34
import com.squareup.okhttp.Request;
345
                        "pcontent"));
346
                        "pcontent"));
346
347
347
//                SpannableString ss = new SpannableString("123#haode#");
348
//                SpannableString ss = new SpannableString("123#haode#");
348
                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
349
                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
349
                Matcher matcher = pattern.matcher(ss);
350
                Matcher matcher = pattern.matcher(ss);
350
                while (matcher.find()) {
351
                while (matcher.find()) {
351
                    int start = matcher.start();
352
                    int start = matcher.start();
454
455
455
    public static boolean isTopic() {
456
    public static boolean isTopic() {
456
//        String strPattern = "#[0-9a-zA-Z\\u4e00-\\u9fa5]+#";
457
//        String strPattern = "#[0-9a-zA-Z\\u4e00-\\u9fa5]+#";
457
        Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
458
        Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
458
        Matcher matcher = pattern.matcher("11111#haode#");
459
        Matcher matcher = pattern.matcher("11111#haode#");
459
        System.out.println(matcher.matches() + "---");
460
        System.out.println(matcher.matches() + "---");
460
461

+ 2 - 1
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java

34
import com.electric.chargingpile.util.CircleTransform;
34
import com.electric.chargingpile.util.CircleTransform;
35
import com.electric.chargingpile.util.DES3;
35
import com.electric.chargingpile.util.DES3;
36
import com.electric.chargingpile.util.JsonUtils;
36
import com.electric.chargingpile.util.JsonUtils;
37
import com.electric.chargingpile.util.StringUtils;
37
import com.electric.chargingpile.util.ToastUtil;
38
import com.electric.chargingpile.util.ToastUtil;
38
import com.electric.chargingpile.util.Util;
39
import com.electric.chargingpile.util.Util;
39
import com.squareup.picasso.Picasso;
40
import com.squareup.picasso.Picasso;
202
                } else {
203
                } else {
203
                    holder.tv_pcontext.setVisibility(View.VISIBLE);
204
                    holder.tv_pcontext.setVisibility(View.VISIBLE);
204
                    SpannableString ss = new SpannableString(content);
205
                    SpannableString ss = new SpannableString(content);
205
                    Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
206
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
206
                    Matcher matcher = pattern.matcher(ss);
207
                    Matcher matcher = pattern.matcher(ss);
207
                    while (matcher.find()) {
208
                    while (matcher.find()) {
208
                        int start = matcher.start();
209
                        int start = matcher.start();

+ 14 - 1
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

10
import android.text.TextUtils;
10
import android.text.TextUtils;
11
import android.util.Log;
11
import android.util.Log;
12

12

13
import androidx.annotation.NonNull;
14
import androidx.camera.camera2.Camera2Config;
15

16
import androidx.camera.core.CameraXConfig;
13
import androidx.multidex.MultiDexApplication;
17
import androidx.multidex.MultiDexApplication;
14

18

15
import com.alibaba.fastjson.JSONException;
19
import com.alibaba.fastjson.JSONException;
44
import com.zhy.http.okhttp.OkHttpUtils;
48
import com.zhy.http.okhttp.OkHttpUtils;
45
import com.zhy.http.okhttp.callback.StringCallback;
49
import com.zhy.http.okhttp.callback.StringCallback;
46

50

51
import org.jetbrains.annotations.NotNull;
52

47
import java.io.BufferedReader;
53
import java.io.BufferedReader;
48
import java.io.BufferedWriter;
54
import java.io.BufferedWriter;
49
import java.io.File;
55
import java.io.File;
63
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
69
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
64

70

65

71

66
public class MainApplication extends MultiDexApplication {
72
public class MainApplication extends MultiDexApplication implements CameraXConfig.Provider{
67
    public static MainApplication instances;
73
    public static MainApplication instances;
68
    private DaoMaster.DevOpenHelper mHelper;
74
    private DaoMaster.DevOpenHelper mHelper;
69
    private SQLiteDatabase db;
75
    private SQLiteDatabase db;
418
        CrashReport.initCrashReport(MainApplication.context, "900010422", BuildConfig.DEBUG);
424
        CrashReport.initCrashReport(MainApplication.context, "900010422", BuildConfig.DEBUG);
419
        CrashReport.setAppChannel(MainApplication.context, BuildConfig.FLAVOR);
425
        CrashReport.setAppChannel(MainApplication.context, BuildConfig.FLAVOR);
420
    }
426
    }
427

428
    @NonNull
429
    @NotNull
430
    @Override
431
    public CameraXConfig getCameraXConfig() {
432
        return Camera2Config.defaultConfig();
433
    }
421
}
434
}
422

435

423

436


+ 2 - 1
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

63
import com.electric.chargingpile.util.LoadingDialog;
63
import com.electric.chargingpile.util.LoadingDialog;
64
import com.electric.chargingpile.util.Md5Util;
64
import com.electric.chargingpile.util.Md5Util;
65
import com.electric.chargingpile.util.OkHttpUtil;
65
import com.electric.chargingpile.util.OkHttpUtil;
66
import com.electric.chargingpile.util.StringUtils;
66
import com.electric.chargingpile.util.Util;
67
import com.electric.chargingpile.util.Util;
67
import com.electric.chargingpile.view.CircleImageView;
68
import com.electric.chargingpile.view.CircleImageView;
68
import com.electric.chargingpile.view.CustomProgressDialog;
69
import com.electric.chargingpile.view.CustomProgressDialog;
1308
                            } else {
1309
                            } else {
1309
                                tv_pcontext.setVisibility(View.VISIBLE);
1310
                                tv_pcontext.setVisibility(View.VISIBLE);
1310
                                SpannableString ss = new SpannableString(content);
1311
                                SpannableString ss = new SpannableString(content);
1311
                                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
1312
                                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
1312
                                Matcher matcher = pattern.matcher(ss);
1313
                                Matcher matcher = pattern.matcher(ss);
1313
                                while (matcher.find()) {
1314
                                while (matcher.find()) {
1314
                                    int start = matcher.start();
1315
                                    int start = matcher.start();

+ 2 - 0
app/src/main/java/com/electric/chargingpile/util/StringUtils.java

17
 */
17
 */
18
public class StringUtils {
18
public class StringUtils {
19
    private static final String TAG = "StringUtils";
19
    private static final String TAG = "StringUtils";
20
    //话题 正则 匹配
21
    public static String ThemeRegular = "#[0-9a-zA-Z,~!@#$%^&*()+=|{}':;',\\\\[\\\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。, 、?\\u4e00-\\u9fa5]+#";
20
22
21
23
22
    /**
24
    /**

+ 1 - 1
app/src/main/java/com/electric/chargingpile/util/Util.java

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

+ 19 - 5
app/src/main/java/com/electric/chargingpile/view/SignInDialog.java

3
import android.content.Context;
3
import android.content.Context;
4
import android.text.Html;
4
import android.text.Html;
5
import android.text.TextUtils;
5
import android.text.TextUtils;
6
import android.util.Log;
6
import android.view.Display;
7
import android.view.Display;
7
import android.view.LayoutInflater;
8
import android.view.LayoutInflater;
8
import android.view.View;
9
import android.view.View;
13
14
14
import com.electric.chargingpile.R;
15
import com.electric.chargingpile.R;
15
16
17
import static android.text.Html.FROM_HTML_MODE_LEGACY;
18
16
/**
19
/**
17
 * Created by demon on 2017/5/26.
20
 * Created by demon on 2017/5/26.
18
 */
21
 */
107
            tv_first.setText(first);
110
            tv_first.setText(first);
108
        }
111
        }
109
112
113
114
        int intLogDay = Integer.parseInt(log_day);
115
        int i1 = intLogDay / 7;//获取倍数
116
        i1 = i1 * 7 ;
117
        if (i1 < intLogDay){
118
            i1 += 7;
119
        }
120
        int i2 = i1 - intLogDay; //差值
121
110
        if (score != null && !score.equals("")) {
122
        if (score != null && !score.equals("")) {
111
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币"));
112
            int i = 7 - Integer.parseInt(log_day);
113
            if (i>=0){
114
                tv_2.setText("还有"+ i+"天获得充电优惠哦~");
123
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币", FROM_HTML_MODE_LEGACY));
124
125
            if ( i2 > 0 ){
126
                tv_2.setText("还有"+ i2 +"天获得充电优惠哦~");
115
            }
127
            }
116
        } else {
128
        } else {
117
            tv_num.setText("");
129
            tv_num.setText("");
118
        }
130
        }
119
131
120
        if (Integer.parseInt(log_day)>= 7){
132
        if (i2 == 0){
121
            tv_num.setText("充电订单折扣优惠券已到账");
133
            tv_num.setText("充电订单折扣优惠券已到账");
122
            tv_2.setText("充电订单八折");
134
            tv_2.setText("充电订单八折");
123
        }
135
        }
136
137
124
        return this;
138
        return this;
125
    }
139
    }
126
140

BIN
app/src/main/res/drawable-xhdpi/ic_back_orange.png


+ 1 - 0
app/src/main/res/layout/item_zhancomments.xml

125
125
126
126
127
        <TextView
127
        <TextView
128
            android:textColor="@color/color_1f1f1f"
128
            android:id="@+id/tv_pcontext"
129
            android:id="@+id/tv_pcontext"
129
            android:layout_width="wrap_content"
130
            android:layout_width="wrap_content"
130
            android:layout_height="wrap_content"
131
            android:layout_height="wrap_content"

+ 13 - 1
app/src/main/res/layout/item_zhanscomments.xml

1
<?xml version="1.0" encoding="utf-8"?>
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:app="http://schemas.android.com/apk/res-auto"
3
    xmlns:app="http://schemas.android.com/apk/res-auto"
4
    xmlns:tools="http://schemas.android.com/tools"
4
    android:id="@+id/ll_out"
5
    android:id="@+id/ll_out"
5
    android:layout_width="match_parent"
6
    android:layout_width="match_parent"
6
    android:layout_height="match_parent"
7
    android:layout_height="match_parent"
14
        android:background="#fafafa">
15
        android:background="#fafafa">
15
16
16
        <com.electric.chargingpile.view.CircleImageView
17
        <com.electric.chargingpile.view.CircleImageView
18
            tools:visibility="visible"
17
            android:id="@+id/iv_icon_son"
19
            android:id="@+id/iv_icon_son"
18
            app:border_color="@color/white"
20
            app:border_color="@color/white"
19
            android:layout_width="35dp"
21
            android:layout_width="35dp"
34
            android:layout_alignParentLeft="true"
36
            android:layout_alignParentLeft="true"
35
            android:layout_gravity="center_vertical"
37
            android:layout_gravity="center_vertical"
36
            android:layout_marginTop="12dp"
38
            android:layout_marginTop="12dp"
37
            android:text="EV200车主"
39
            android:text="EV200车主"   tools:visibility="visible"
38
            android:textAppearance="?android:attr/textAppearanceSmall"
40
            android:textAppearance="?android:attr/textAppearanceSmall"
39
            android:textColor="@color/ui_65"
41
            android:textColor="@color/ui_65"
40
            android:textSize="13sp" />
42
            android:textSize="13sp" />
41
43
42
        <TextView
44
        <TextView
45
            tools:visibility="visible"
43
            android:id="@+id/tv_city_son"
46
            android:id="@+id/tv_city_son"
44
            android:layout_width="wrap_content"
47
            android:layout_width="wrap_content"
45
            android:layout_height="wrap_content"
48
            android:layout_height="wrap_content"
56
59
57
60
58
        <TextView
61
        <TextView
62
            android:textColor="@color/color_1f1f1f"
63
            tools:visibility="visible"
59
            android:id="@+id/tv_comment_son"
64
            android:id="@+id/tv_comment_son"
60
            android:layout_width="wrap_content"
65
            android:layout_width="wrap_content"
61
            android:layout_height="wrap_content"
66
            android:layout_height="wrap_content"
71
76
72
77
73
        <TextView
78
        <TextView
79
            tools:visibility="visible"
74
            android:id="@+id/tv_time_son"
80
            android:id="@+id/tv_time_son"
75
            android:layout_width="wrap_content"
81
            android:layout_width="wrap_content"
76
            android:layout_height="wrap_content"
82
            android:layout_height="wrap_content"
84
            android:textSize="12sp" />
90
            android:textSize="12sp" />
85
91
86
        <TextView
92
        <TextView
93
            tools:visibility="visible"
87
            android:id="@+id/tv_reply_son"
94
            android:id="@+id/tv_reply_son"
88
            android:layout_width="wrap_content"
95
            android:layout_width="wrap_content"
89
            android:layout_height="wrap_content"
96
            android:layout_height="wrap_content"
97
104
98
105
99
        <TextView
106
        <TextView
107
            tools:visibility="visible"
100
            android:id="@+id/tv_childName_son"
108
            android:id="@+id/tv_childName_son"
101
            android:layout_width="wrap_content"
109
            android:layout_width="wrap_content"
102
            android:layout_height="wrap_content"
110
            android:layout_height="wrap_content"
109
            android:visibility="gone" />
117
            android:visibility="gone" />
110
118
111
        <TextView
119
        <TextView
120
            tools:visibility="visible"
112
            android:id="@+id/textView15"
121
            android:id="@+id/textView15"
113
            android:layout_width="wrap_content"
122
            android:layout_width="wrap_content"
114
            android:layout_height="wrap_content"
123
            android:layout_height="wrap_content"
121
            android:visibility="gone" />
130
            android:visibility="gone" />
122
131
123
        <TextView
132
        <TextView
133
            tools:visibility="visible"
124
            android:id="@+id/tv_parentName_son"
134
            android:id="@+id/tv_parentName_son"
125
            android:layout_width="wrap_content"
135
            android:layout_width="wrap_content"
126
            android:layout_height="wrap_content"
136
            android:layout_height="wrap_content"
133
            android:visibility="gone" />
143
            android:visibility="gone" />
134
144
135
        <TextView
145
        <TextView
146
            tools:visibility="visible"
136
            android:id="@+id/tv_commentDetail_son"
147
            android:id="@+id/tv_commentDetail_son"
137
            android:layout_width="wrap_content"
148
            android:layout_width="wrap_content"
138
            android:layout_height="wrap_content"
149
            android:layout_height="wrap_content"
145
            android:visibility="gone" />
156
            android:visibility="gone" />
146
157
147
        <View
158
        <View
159
            tools:visibility="visible"
148
            android:id="@+id/vvvv"
160
            android:id="@+id/vvvv"
149
            android:layout_width="match_parent"
161
            android:layout_width="match_parent"
150
            android:layout_height="0.5dp"
162
            android:layout_height="0.5dp"

+ 1 - 0
app/src/main/res/values/colors.xml

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