浏览代码

3.5.20 版本

hy 2 年之前
父节点
当前提交
b379bd808d

+ 1 - 0
.gitignore

77
.idea/vcs.xml
77
.idea/vcs.xml
78
.idea/encodings.xml
78
.idea/encodings.xml
79
*.hprof
79
*.hprof
80
.idea

+ 2 - 2
app/src/main/AndroidManifest.xml

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="105"
6
    android:versionName="3.5.19">
5
    android:versionCode="106"
6
    android:versionName="3.5.20">
7
7
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
8
   <!-- <uses-permission android:name="android.permission.BLUETOOTH" />
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
9
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->

+ 19 - 8
app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java

109
import cn.sharesdk.wechat.friends.Wechat;
109
import cn.sharesdk.wechat.friends.Wechat;
110
import cn.sharesdk.wechat.moments.WechatMoments;
110
import cn.sharesdk.wechat.moments.WechatMoments;
111
import okhttp3.Call;
111
import okhttp3.Call;
112
import okhttp3.ResponseBody;
112
import pub.devrel.easypermissions.AfterPermissionGranted;
113
import pub.devrel.easypermissions.AfterPermissionGranted;
113
import pub.devrel.easypermissions.EasyPermissions;
114
import pub.devrel.easypermissions.EasyPermissions;
114
115
520
521
521
            par.put("file", file);
522
            par.put("file", file);
522
            par.put("filename", "androidapp" + i + ".jpg");
523
            par.put("filename", "androidapp" + i + ".jpg");
523
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
524
            JSONObject jsonObject = new JSONObject(u);
525
526
            String code = jsonObject.getString("code");
527
            if (code.equals("200")) {
528
                String fileUrl = jsonObject.getString("fileUrl");
529
                fileList.add(fileUrl);
524
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
525
                    .addParams("file", file)
526
                    .addParams("filename", "androidapp" + i + ".jpg")
527
                    .build().execute().body();
528
            if (body!=null){
529
                String u = body.string();
530
                JSONObject jsonObject = new JSONObject(u);
531
                String code = jsonObject.getString("code");
532
                if (code.equals("200")) {
533
                    String fileUrl = jsonObject.getString("fileUrl");
534
                    fileList.add(fileUrl);
535
                }else{
536
                    Message msg = new Message();
537
                    msg.what = IMG_ERROR;
538
                    handler.sendMessage(msg);
539
                    return;
540
                }
530
            }else{
541
            }else{
531
                Message msg = new Message();
542
                Message msg = new Message();
532
                msg.what = IMG_ERROR;
543
                msg.what = IMG_ERROR;
1371
            ImageDisplayActivity.actionStart(this, position);
1382
            ImageDisplayActivity.actionStart(this, position);
1372
        } else if (mInsterType == 2) {
1383
        } else if (mInsterType == 2) {
1373
            PictureSelector.create(ChargingCommentActivity.this)
1384
            PictureSelector.create(ChargingCommentActivity.this)
1374
                    .themeStyle(R.style.picture_default_style)
1385
                    .themeStyle(com.luck.picture.lib.R.style.picture_default_style)
1375
                    .setPictureStyle(Util.getWhiteStyle(ChargingCommentActivity.this))// 动态自定义相册主题
1386
                    .setPictureStyle(Util.getWhiteStyle(ChargingCommentActivity.this))// 动态自定义相册主题
1376
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
1387
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
1377
        }
1388
        }

+ 20 - 11
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

100
100
101
import cn.jpush.android.api.JPushInterface;
101
import cn.jpush.android.api.JPushInterface;
102
import okhttp3.Call;
102
import okhttp3.Call;
103
import okhttp3.ResponseBody;
103
import pub.devrel.easypermissions.AfterPermissionGranted;
104
import pub.devrel.easypermissions.AfterPermissionGranted;
104
import pub.devrel.easypermissions.EasyPermissions;
105
import pub.devrel.easypermissions.EasyPermissions;
105
106
473
474
474
            par.put("file", file);
475
            par.put("file", file);
475
            par.put("filename", "androidapp" + i + ".jpg");
476
            par.put("filename", "androidapp" + i + ".jpg");
476
            String u = UploadUtil.post(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload", par, null);
477
            JSONObject jsonObject = new JSONObject(u);
478
479
            String code = jsonObject.getString("code");
480
            if (code.equals("200")) {
481
                String fileUrl = jsonObject.getString("fileUrl");
482
                fileList.add(fileUrl);
477
            ResponseBody body = OkHttpUtils.post().url(MainApplication.url + "/zhannew/basic/web/index.php/fileupload/upload")
478
                    .addParams("file", file)
479
                    .addParams("filename", "androidapp" + i + ".jpg")
480
                    .build().execute().body();
481
            if (body!=null){
482
                String u = body.string();
483
                JSONObject jsonObject = new JSONObject(u);
484
                String code = jsonObject.getString("code");
485
                if (code.equals("200")) {
486
                    String fileUrl = jsonObject.getString("fileUrl");
487
                    fileList.add(fileUrl);
488
                }else{
489
                    Message msg = new Message();
490
                    msg.what = IMG_ERROR;
491
                    handler.sendMessage(msg);
492
                    return;
493
                }
483
            }else{
494
            }else{
484
                Message msg = new Message();
495
                Message msg = new Message();
485
                msg.what = IMG_ERROR;
496
                msg.what = IMG_ERROR;
486
                handler.sendMessage(msg);
497
                handler.sendMessage(msg);
487
                return;
498
                return;
488
            }
489
490
        }
499
            }        }
491
500
492
        Message msg = new Message();
501
        Message msg = new Message();
493
        msg.obj = mGson.toJson(fileList);
502
        msg.obj = mGson.toJson(fileList);
1040
            ImageDisplayActivity.actionStart(this, position);
1049
            ImageDisplayActivity.actionStart(this, position);
1041
        } else if (mInsterType == 2) {
1050
        } else if (mInsterType == 2) {
1042
            PictureSelector.create(ZhanCommentActivity.this)
1051
            PictureSelector.create(ZhanCommentActivity.this)
1043
                    .themeStyle(R.style.picture_default_style)
1052
                    .themeStyle(com.luck.picture.lib.R.style.picture_default_style)
1044
                    .setPictureStyle(Util.getWhiteStyle(ZhanCommentActivity.this))// 动态自定义相册主题
1053
                    .setPictureStyle(Util.getWhiteStyle(ZhanCommentActivity.this))// 动态自定义相册主题
1045
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
1054
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
1046
        }
1055
        }

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

510
        // 相册列表标题栏右侧下拉箭头
510
        // 相册列表标题栏右侧下拉箭头
511
        style.pictureTitleDownResId = R.drawable.ic_orange_arrow_down;
511
        style.pictureTitleDownResId = R.drawable.ic_orange_arrow_down;
512
        // 相册文件夹列表选中圆点
512
        // 相册文件夹列表选中圆点
513
        style.pictureFolderCheckedDotStyle = R.drawable.picture_orange_oval;
513
        style.pictureFolderCheckedDotStyle = com.luck.picture.lib.R.drawable.picture_orange_oval;
514
        // 相册返回箭头
514
        // 相册返回箭头
515
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
515
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
516
        // 标题栏字体颜色
516
        // 标题栏字体颜色
520
        // 选择相册目录背景样式
520
        // 选择相册目录背景样式
521
        style.pictureAlbumStyle = R.drawable.picture_new_item_select_bg;
521
        style.pictureAlbumStyle = R.drawable.picture_new_item_select_bg;
522
        // 相册列表勾选图片样式
522
        // 相册列表勾选图片样式
523
        style.pictureCheckedStyle = R.drawable.picture_checkbox_selector;
523
        style.pictureCheckedStyle = com.luck.picture.lib.R.drawable.picture_checkbox_selector;
524
        // 相册列表底部背景色
524
        // 相册列表底部背景色
525
        style.pictureBottomBgColor = ContextCompat.getColor(context, R.color.picture_color_fa);
525
        style.pictureBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa);
526
        // 已选数量圆点背景样式
526
        // 已选数量圆点背景样式
527
        style.pictureCheckNumBgStyle = R.drawable.picture_num_oval;
527
        style.pictureCheckNumBgStyle = com.luck.picture.lib.R.drawable.picture_num_oval;
528
        // 相册列表底下预览文字色值(预览按钮可点击时的色值)
528
        // 相册列表底下预览文字色值(预览按钮可点击时的色值)
529
        style.picturePreviewTextColor = ContextCompat.getColor(context, R.color.picture_color_fa632d);
529
        style.picturePreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
530
        // 相册列表底下不可预览文字色值(预览按钮不可点击时的色值)
530
        // 相册列表底下不可预览文字色值(预览按钮不可点击时的色值)
531
        style.pictureUnPreviewTextColor = ContextCompat.getColor(context, R.color.picture_color_9b);
531
        style.pictureUnPreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
532
        // 相册列表已完成色值(已完成 可点击色值)
532
        // 相册列表已完成色值(已完成 可点击色值)
533
        style.pictureCompleteTextColor = ContextCompat.getColor(context, R.color.picture_color_fa632d);
533
        style.pictureCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
534
        // 相册列表未完成色值(请选择 不可点击色值)
534
        // 相册列表未完成色值(请选择 不可点击色值)
535
        style.pictureUnCompleteTextColor = ContextCompat.getColor(context, R.color.picture_color_9b);
535
        style.pictureUnCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
536
        // 预览界面底部背景色
536
        // 预览界面底部背景色
537
        style.picturePreviewBottomBgColor = ContextCompat.getColor(context, R.color.picture_color_white);
537
        style.picturePreviewBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_white);
538
        // 原图按钮勾选样式  需设置.isOriginalImageControl(true); 才有效
538
        // 原图按钮勾选样式  需设置.isOriginalImageControl(true); 才有效
539
        style.pictureOriginalControlStyle = R.drawable.picture_original_checkbox;
539
        style.pictureOriginalControlStyle = com.luck.picture.lib.R.drawable.picture_original_checkbox;
540
        // 原图文字颜色 需设置.isOriginalImageControl(true); 才有效
540
        // 原图文字颜色 需设置.isOriginalImageControl(true); 才有效
541
        style.pictureOriginalFontColor = ContextCompat.getColor(context, R.color.app_color_53575e);
541
        style.pictureOriginalFontColor = ContextCompat.getColor(context, R.color.app_color_53575e);
542
        // 外部预览界面删除按钮样式
542
        // 外部预览界面删除按钮样式
543
        style.pictureExternalPreviewDeleteStyle = R.drawable.picture_icon_black_delete;
543
        style.pictureExternalPreviewDeleteStyle = com.luck.picture.lib.R.drawable.picture_icon_black_delete;
544
        // 外部预览界面是否显示删除按钮
544
        // 外部预览界面是否显示删除按钮
545
        style.pictureExternalPreviewGonePreviewDelete = true;
545
        style.pictureExternalPreviewGonePreviewDelete = true;
546
//        // 自定义相册右侧文本内容设置
546
//        // 自定义相册右侧文本内容设置