e) //点击相册标题是否快速回到第一项 385 
                .isFastSlidingSelect(true) //快速滑动选择
386 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
387 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
388 
                .isPreviewImage(true)//是否预览图片
389 
                .setFilterMinFileSize(1) //过滤最小文件
376 390 
                .forResult(REQUEST_CODE_CHOOSE);
377 391 
    }
378 392 
@ -403,22 +417,9 @@ public class ShareTwoActivity extends Activity implements View.OnClickListener,
403 417 
            public void subscribe(ObservableEmitter<String> subscriber) throws Exception {
404 418
405 419 
                try {
406 
                    List<LocalMedia> mediaList = PictureSelector.obtainMultipleResult(data);
420 
                    List<LocalMedia> mediaList = PictureSelector.obtainSelectorList(data);
407 421 
                    if (mediaList!=null && mediaList.size()>0){
408 
                       /* List<Uri> uriList = Matisse.obtainResult(data);
409 
                        Uri uri = uriList.get(0);
410 
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
411 
                        File file = FileUtils.from(ShareTwoActivity.this, uri);
412
413 
                        bitmap = FileUtils.rotateIfRequired(file, bitmap);
414 
                        bitmap = imageZoom(bitmap);
415 
*/
416 
                        String path="";
417 
                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
418 
                            path= mediaList.get(0).getAndroidQToPath();
419 
                        }else{
420 
                            path=mediaList.get(0).getPath();
421 
                        }
422 
                        String path = Util.getCompressAbsolutePath(mediaList.get(0));
422 423 
                        ImageItem takePhoto = new ImageItem();
423 424 
                        takePhoto.setBitmap(imageZoom(BitmapFactory.decodeFile(path)));
424 425 
                        selectBitmap[selectIndex] = takePhoto;
@ -953,48 +954,37 @@ public class ShareTwoActivity extends Activity implements View.OnClickListener,
953 954 
        }
954 955 
    }
955 956
956 
    @Override
957 
    public void onRequestPermissionsResult(int requestCode,
958 
                                           @NonNull String[] permissions,
959 
                                           @NonNull int[] grantResults) {
960 
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
961
962 
        // EasyPermissions handles the request result.
963 
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
964 
    }
965
966 
    @Override
967 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
968 957
969 
    }
970 958
971 
    @Override
972 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
973
974 
    }
975 959
976 
    @AfterPermissionGranted(RC_ALBUM_PERM)
977 960 
    public void permissionTask() {
978 
        if (isPermissionOK()) {
979 
            callGallery();
980 
        } else {
981 
            // Ask for one permission
982 
            EasyPermissions.requestPermissions(
983 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
984 
                    RC_ALBUM_PERM,
985 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
986 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
987 
                    Manifest.permission.CAMERA);
988 
        }
961 
        String[] callPhone  =
962 
                new String[]{READ_MEDIA_IMAGES, CAMERA};
963 
        XXPermissions.with(this)
964 
                // 申请单个权限
965 
                .permission(callPhone)
966 
                .request(new OnPermissionCallback() {
967 
                    @Override
968 
                    public void onGranted(List<String> permissions, boolean all) {
969 
                        if (all) {
970 
                            callGallery();
971 
                        }else{
972 
                            ToastUtil.showToast(getApplicationContext(), "获取部分权限成功，但部分权限未正常授予", Toast.LENGTH_SHORT);
973 
                        }
974 
                    }
975 
                    @Override
976 
                    public void onDenied(List<String> permissions, boolean never) {
977 
                        if (never) {
978 
                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
979 
                            XXPermissions.startPermissionActivity(ShareTwoActivity.this, permissions);
980 
                        } else {
981 
                            ToastUtil.showToast(getApplicationContext(), "获取权限失败", Toast.LENGTH_SHORT);
982 
                        }
983 
                    }
984 
                });
989 985 
    }
990 986
991 
    private boolean isPermissionOK() {
992 
        return EasyPermissions.hasPermissions(this,
993 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
994 
                Manifest.permission.READ_EXTERNAL_STORAGE,
995 
                Manifest.permission.CAMERA
996 
        );
997 
    }
987
998 988
999 989 
    @SuppressLint("HandlerLeak")
1000 990 
    public class GridAdapter extends BaseAdapter {

+ 71 - 73
app/src/main/java/com/electric/chargingpile/activity/ShareTwoEditActivity.java
Vedi File 

@ -1,5 +1,8 @@
1 1 
package com.electric.chargingpile.activity;
2 2
3 
import static com.hjq.permissions.Permission.CAMERA;
4 
import static com.hjq.permissions.Permission.READ_MEDIA_IMAGES;
5
3 6 
import android.Manifest;
4 7 
import android.app.Activity;
5 8 
import android.app.ProgressDialog;
 
@ -50,11 +53,16 @@ import com.electric.chargingpile.application.MainApplication;
50 53 
import com.electric.chargingpile.data.Zhan;
51 54 
import com.electric.chargingpile.engine.GlideEngine;
52 55 
import com.electric.chargingpile.util.BarColorUtil;
56 
import com.electric.chargingpile.util.Bimp;
53 57 
import com.electric.chargingpile.util.DES3;
54 58 
import com.electric.chargingpile.util.DensityUtil;
59 
import com.electric.chargingpile.util.ImageFileCompressEngine;
55 60 
import com.electric.chargingpile.util.ImageItem;
56 61 
import com.electric.chargingpile.util.JsonUtils;
62 
import com.electric.chargingpile.util.MeOnCameraInterceptListener;
63 
import com.electric.chargingpile.util.MeSandboxFileEngine;
57 64 
import com.electric.chargingpile.util.OkHttpUtil;
65 
import com.electric.chargingpile.util.PictureUtlis;
58 66 
import com.electric.chargingpile.util.PublicWayFour;
59 67 
import com.electric.chargingpile.util.Res;
60 68 
import com.electric.chargingpile.util.SharedPreferencesUtil;
 
@ -63,10 +71,15 @@ import com.electric.chargingpile.util.UploadUtil;
63 71 
import com.electric.chargingpile.util.Util;
64 72 
import com.electric.chargingpile.view.CustomProgressDialog;
65 73 
import com.electric.chargingpile.view.ShareDialog;
66 
import com.luck.picture.lib.PictureSelector;
74
75 
import com.hjq.permissions.OnPermissionCallback;
76 
import com.hjq.permissions.XXPermissions;
67 77 
import com.luck.picture.lib.animators.AnimationType;
78 
import com.luck.picture.lib.basic.PictureSelector;
68 79 
import com.luck.picture.lib.config.PictureConfig;
69 80 
import com.luck.picture.lib.config.PictureMimeType;
81 
import com.luck.picture.lib.config.SelectMimeType;
82 
import com.luck.picture.lib.config.SelectModeConfig;
70 83 
import com.luck.picture.lib.entity.LocalMedia;
71 84 
import com.squareup.okhttp.Request;
72 85 
import com.squareup.okhttp.Response;
 
@ -101,7 +114,7 @@ import okhttp3.Call;
101 114 
import pub.devrel.easypermissions.AfterPermissionGranted;
102 115 
import pub.devrel.easypermissions.EasyPermissions;
103 116
104 
public class ShareTwoEditActivity extends Activity implements View.OnClickListener, EasyPermissions.PermissionCallbacks {
117 
public class ShareTwoEditActivity extends Activity implements View.OnClickListener{
105 118 
    private static final String TAG = "ShareTwoActivity";
106 119 
    private static final int PIC_NUM = 4;
107 120 
    private ImageView ivBack, ivType;
 
@ -299,35 +312,36 @@ public class ShareTwoEditActivity extends Activity implements View.OnClickListen
299 312 
     * 调用图库选择
300 313 
     */
301 314 
    private void callGallery() {
302 
/*
303 
        Matisse.from(ShareTwoEditActivity.this)
304 
                .choose(MimeType.of(MimeType.JPEG, MimeType.PNG, MimeType.GIF))
305 
                .showSingleMediaType(true)
306 
                .countable(true)
307 
                .maxSelectable(1)
308 
                .capture(true)
309 
                .captureStrategy(new CaptureStrategy(true, "com.electric.chargingpile.provider"))
310 
                .imageEngine(new GlideEngine())
311 
                .forResult(REQUEST_CODE_CHOOSE);
312 
*/
313 315 
        PictureSelector.create(this)
314 
                .openGallery(PictureMimeType.ofImage())
315 
                .selectionMode(PictureConfig.SINGLE)
316 
                .isSingleDirectReturn(true)
317 
                .isCompress(true)//是否压缩
318 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
319 
                .isGif(true)//是否显示gif
320 
                .isAndroidQTransform(true)
321 
                .imageEngine(GlideEngine.createGlideEngine())
322 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
323 
                .isUseCustomCamera(false)// 是否使用自定义相机
324 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
325 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
326 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
327 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
328 
                .imageSpanCount(4)// 每行显示个数
329 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
330 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
316 
                .openGallery(SelectMimeType.ofImage())
317 
                .setSelectorUIStyle(PictureUtlis.getStyle())
318 
                .setImageEngine(GlideEngine.createGlideEngine())
319 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
320 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
321 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
322 
                .setSelectionMode(SelectModeConfig.SINGLE)
323 
                .setMaxSelectNum(1)
324 
                .isEmptyResultReturn(true) //支持未选择返回
325 
                .setImageSpanCount(4)
326 
                .isPageStrategy(true)   // 是否开启分页模式
327 
                .isDisplayCamera(true) //是否显示相机入口
328 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
329 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
330 
                .isEmptyResultReturn(true)//支持未选择返回
331 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
332 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
333 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
334 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
335 
                .isGif(false)// 是否显示gif文件
336 
                .isWebp(true)// 是否显示webp文件
337 
                .isBmp(true)//是否显示bmp文件
338 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
339 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
340 
                .isFastSlidingSelect(true) //快速滑动选择
341 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
342 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
343 
                .isPreviewImage(true)//是否预览图片
344 
                .setFilterMinFileSize(1) //过滤最小文件
331 345 
                .forResult(REQUEST_CODE_CHOOSE);
332 346
333 347 
    }
 
@ -358,22 +372,9 @@ public class ShareTwoEditActivity extends Activity implements View.OnClickListen
358 372 
            @Override
359 373 
            public void subscribe(ObservableEmitter<String> subscriber) throws Exception {
360 374 
                try {
361 
                    List<LocalMedia> mediaList = PictureSelector.obtainMultipleResult(data);
375 
                    List<LocalMedia> mediaList = PictureSelector.obtainSelectorList(data);
362 376 
                    if (mediaList!=null && mediaList.size()>0){
363 
                      /*  List<Uri> uriList = Matisse.obtainResult(data);
364 
                        Uri uri = uriList.get(0);
365 
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
366 
                        File file = FileUtils.from(ShareTwoEditActivity.this, uri);
367
368 
                        bitmap = FileUtils.rotateIfRequired(file, bitmap);
369 
                        bitmap = imageZoom(bitmap);
370 
*/
371 
                        String path="";
372 
                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
373 
                            path= mediaList.get(0).getAndroidQToPath();
374 
                        }else{
375 
                            path=mediaList.get(0).getPath();
376 
                        }
377 
                        String path = Util.getCompressAbsolutePath(mediaList.get(0));
377 378 
                        ImageItem takePhoto = new ImageItem();
378 379 
                        takePhoto.setBitmap(imageZoom(BitmapFactory.decodeFile(path)));
379 380 
                        selectBitmap[selectIndex] = takePhoto;
 
@ -922,39 +923,36 @@ public class ShareTwoEditActivity extends Activity implements View.OnClickListen
922 923 
        }
923 924 
    }
924 925
925 
    @Override
926 
    public void onRequestPermissionsResult(int requestCode,
927 
                                           @NonNull String[] permissions,
928 
                                           @NonNull int[] grantResults) {
929 
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
930 926
931 
        // EasyPermissions handles the request result.
932 
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
933 
    }
934 927
935 
    @Override
936 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
937
938 
    }
939 928
940 
    @Override
941 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
929 
    public void permissionTask() {
942 930
943 
    }
931 
        String[] callPhone  =
932 
                new String[]{READ_MEDIA_IMAGES, CAMERA};
933 
        XXPermissions.with(this)
934 
                // 申请单个权限
935 
                .permission(callPhone)
936 
                .request(new OnPermissionCallback() {
937 
                    @Override
938 
                    public void onGranted(List<String> permissions, boolean all) {
939 
                        if (all) {
940 
                            callGallery();
941 
                        }else{
942 
                            ToastUtil.showToast(getApplicationContext(), "获取部分权限成功，但部分权限未正常授予", Toast.LENGTH_SHORT);
943 
                        }
944 
                    }
945 
                    @Override
946 
                    public void onDenied(List<String> permissions, boolean never) {
947 
                        if (never) {
948 
                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
949 
                            XXPermissions.startPermissionActivity(ShareTwoEditActivity.this, permissions);
950 
                        } else {
951 
                            ToastUtil.showToast(getApplicationContext(), "获取权限失败", Toast.LENGTH_SHORT);
952 
                        }
953 
                    }
954 
                });
944 955
945 
    @AfterPermissionGranted(RC_ALBUM_PERM)
946 
    public void permissionTask() {
947 
        if (isPermissionOK()) {
948 
            callGallery();
949 
        } else {
950 
            // Ask for one permission
951 
            EasyPermissions.requestPermissions(
952 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
953 
                    RC_ALBUM_PERM,
954 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
955 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
956 
                    Manifest.permission.CAMERA);
957 
        }
958 956 
    }
959 957
960 958 
    private boolean isPermissionOK() {

+ 102 - 95
app/src/main/java/com/electric/chargingpile/activity/SkipUserInfoActivity.java
Vedi File 

@ -1,5 +1,8 @@
1 1 
package com.electric.chargingpile.activity;
2 2
3 
import static com.hjq.permissions.Permission.CAMERA;
4 
import static com.hjq.permissions.Permission.READ_MEDIA_IMAGES;
5
3 6 
import android.Manifest;
4 7 
import android.app.Activity;
5 8 
import android.content.Context;
 
@ -54,12 +57,17 @@ import com.electric.chargingpile.manager.ProfileManager;
54 57 
import com.electric.chargingpile.util.ActivityManagerApplication;
55 58 
import com.electric.chargingpile.util.BarColorUtil;
56 59 
import com.electric.chargingpile.util.DES3;
60 
import com.electric.chargingpile.util.ImageCropEngine;
61 
import com.electric.chargingpile.util.ImageFileCompressEngine;
57 62 
import com.electric.chargingpile.util.ImageTools;
58 63 
import com.electric.chargingpile.util.JsonUtils;
59 64 
import com.electric.chargingpile.util.LoadingDialog;
60 65 
import com.electric.chargingpile.util.LogUtils;
66 
import com.electric.chargingpile.util.MeOnCameraInterceptListener;
67 
import com.electric.chargingpile.util.MeSandboxFileEngine;
61 68 
import com.electric.chargingpile.util.OkHttpUtil;
62 69 
import com.electric.chargingpile.util.PhotoUtils;
70 
import com.electric.chargingpile.util.PictureUtlis;
63 71 
import com.electric.chargingpile.util.StatusConstants;
64 72 
import com.electric.chargingpile.util.ToastUtil;
65 73 
import com.electric.chargingpile.util.UploadUtil;
 
@ -68,10 +76,15 @@ import com.electric.chargingpile.view.CustomProgressDialog;
68 76 
import com.electric.chargingpile.view.RoundImageView;
69 77 
import com.electric.chargingpile.view.xrichtext.SDCardUtil;
70 78 
import com.google.gson.Gson;
71 
import com.luck.picture.lib.PictureSelector;
79
80 
import com.hjq.permissions.OnPermissionCallback;
81 
import com.hjq.permissions.XXPermissions;
72 82 
import com.luck.picture.lib.animators.AnimationType;
83 
import com.luck.picture.lib.basic.PictureSelector;
73 84 
import com.luck.picture.lib.config.PictureConfig;
74 85 
import com.luck.picture.lib.config.PictureMimeType;
86 
import com.luck.picture.lib.config.SelectMimeType;
87 
import com.luck.picture.lib.config.SelectModeConfig;
75 88 
import com.luck.picture.lib.entity.LocalMedia;
76 89 
import com.squareup.okhttp.Request;
77 90 
import com.squareup.okhttp.Response;
 
@ -102,7 +115,7 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
102 115 
import pub.devrel.easypermissions.EasyPermissions;
103 116
104 117
105 
public class SkipUserInfoActivity extends Activity implements View.OnClickListener, EasyPermissions.PermissionCallbacks {
118 
public class SkipUserInfoActivity extends Activity implements View.OnClickListener {
106 119 
    private ImageView back;
107 120 
    private EditText et_nickName;
108 121 
    private EditText et_realName;
 
@ -293,15 +306,6 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
293 306 
        spinnerCity.setOnItemSelectedListener(new CityAdapter());
294 307 
    }
295 308
296 
    @Override
297 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
298
299 
    }
300
301 
    @Override
302 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
303
304 
    }
305 309
306 310 
    private void showWindow() {
307 311 
        LayoutInflater inflater = (LayoutInflater) getSystemService(mContext.LAYOUT_INFLATER_SERVICE);
 
@ -369,31 +373,35 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
369 373 
        popupWindow.showAtLocation(cancleButton, Gravity.CENTER, 0, 0);
370 374 
    }
371 375
372 
    @AfterPermissionGranted(RC_CAMERA_PERM)
376
373 377 
    public void cameraTask() {
374 
        if (hasCameraPermission()) {
375 
            // Have permission, do the thing!
376 
//            Toast.makeText(this, "TODO: Camera things", Toast.LENGTH_LONG).show();
377 
            showWindow();
378 
        } else {
379 
            // Ask for one permission
380 
            EasyPermissions.requestPermissions(
381 
                    this,
382 
                    "充电桩需要获取您相关权限，是否允许？",
383 
                    RC_CAMERA_PERM,
384 
                    Manifest.permission.CAMERA,
385 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
386 
                    Manifest.permission.READ_EXTERNAL_STORAGE);
387 
        }
378 
        String[] callPhone  =
379 
                new String[]{READ_MEDIA_IMAGES, CAMERA};
380 
        XXPermissions.with(this)
381 
                // 申请单个权限
382 
                .permission(callPhone)
383 
                .request(new OnPermissionCallback() {
384 
                    @Override
385 
                    public void onGranted(List<String> permissions, boolean all) {
386 
                        if (all) {
387 
                            showWindow();
388 
                        }else{
389 
                            ToastUtil.showToast(getApplicationContext(), "获取部分权限成功，但部分权限未正常授予", Toast.LENGTH_SHORT);
390 
                        }
391 
                    }
392 
                    @Override
393 
                    public void onDenied(List<String> permissions, boolean never) {
394 
                        if (never) {
395 
                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
396 
                            XXPermissions.startPermissionActivity(SkipUserInfoActivity.this, permissions);
397 
                        } else {
398 
                            ToastUtil.showToast(getApplicationContext(), "获取权限失败", Toast.LENGTH_SHORT);
399 
                        }
400 
                    }
401 
                });
388 402 
    }
389 403
390 
    private boolean hasCameraPermission() {
391 
        return EasyPermissions.hasPermissions(this,
392 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
393 
                Manifest.permission.READ_EXTERNAL_STORAGE,
394 
                Manifest.permission.CAMERA
395 
        );
396 
    }
404
397 405
398 406 
    class ProvinceAdapter implements AdapterView.OnItemSelectedListener {
399 407 
@ -515,65 +523,69 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
515 523 
     */
516 524 
    public void takePhoto(View view) {
517 525 
        PictureSelector.create(this)
518 
                .openCamera(PictureMimeType.ofImage())
519 
                .selectionMode(PictureConfig.SINGLE)
520 
                .isSingleDirectReturn(true)
521 
                .isCompress(true)//是否压缩
522 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
523 
                .isGif(false)//是否显示gif
524 
                .isAndroidQTransform(true)
525 
                .imageEngine(GlideEngine.createGlideEngine())
526 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
527 
                .isUseCustomCamera(false)// 是否使用自定义相机
528 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
529 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
530 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
531 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
532 
                .imageSpanCount(4)// 每行显示个数
533 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
534 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
535 
                .isEnableCrop(true)
536 
                .rotateEnabled(false)//裁剪是否可旋转图片
537 
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
538 
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
539 
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
540 
                .circleDimmedLayer(true)// 是否开启圆形裁剪
541 
                .isDragFrame(true)//是否可拖动裁剪框(固定)
542 
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
543 
                .showCropGrid(false)//是否显示裁剪矩形网格 圆形裁剪时建议设为false
526 
                .openGallery(SelectMimeType.ofImage())
527 
                .setSelectorUIStyle(PictureUtlis.getStyle())
528 
                .setImageEngine(GlideEngine.createGlideEngine())
529 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
530 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
531 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
532 
                .setSelectionMode(SelectModeConfig.SINGLE)
533 
                .setMaxSelectNum(1)
534 
                .isEmptyResultReturn(true) //支持未选择返回
535 
                .setImageSpanCount(4)
536 
                .isPageStrategy(true)   // 是否开启分页模式
537 
                .isDisplayCamera(true) //是否显示相机入口
538 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
539 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
540 
                .isEmptyResultReturn(true)//支持未选择返回
541 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
542 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
543 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
544 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
545 
                .isGif(false)// 是否显示gif文件
546 
                .isWebp(true)// 是否显示webp文件
547 
                .isBmp(true)//是否显示bmp文件
548 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
549 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
550 
                .isFastSlidingSelect(true) //快速滑动选择
551 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
552 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
553 
                .isPreviewImage(true)//是否预览图片
554 
                .setCropEngine(new ImageCropEngine(1F,1F,true))
555 
                .setFilterMinFileSize(1) //过滤最小文件
544 556 
                .forResult(2);
545
546 557 
    }
547 558 
    private void openPhotoAlbum() {
548 559 
        PictureSelector.create(this)
549 
                .openGallery(PictureMimeType.ofImage())
550 
                .isCamera(false)//列表是否显示拍照按钮
551 
                .selectionMode(PictureConfig.SINGLE)
552 
                .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
553 
                .isCompress(true)//是否压缩
554 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
555 
                .isGif(false)//是否显示gif
556 
                .isAndroidQTransform(true)
557 
                .imageEngine(GlideEngine.createGlideEngine())
558 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
559 
                .isUseCustomCamera(false)// 是否使用自定义相机
560 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
561 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
562 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
563 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
564 
                .imageSpanCount(4)// 每行显示个数
565 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
566 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
567 
                .rotateEnabled(false)//裁剪是否可旋转图片
568 
                .isEnableCrop(true)
569 
                .rotateEnabled(false)//裁剪是否可旋转图片
570 
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
571 
                .freeStyleCropEnabled(true)// 裁剪框拖动模式
572 
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
573 
                .circleDimmedLayer(true)// 是否开启圆形裁剪
574 
                .isDragFrame(true)//是否可拖动裁剪框(固定)
575 
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
576 
                .showCropGrid(false)//是否显示裁剪矩形网格 圆形裁剪时建议设为false
560 
                .openGallery(SelectMimeType.ofImage())
561 
                .setSelectorUIStyle(PictureUtlis.getStyle())
562 
                .setImageEngine(GlideEngine.createGlideEngine())
563 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
564 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
565 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
566 
                .setSelectionMode(SelectModeConfig.SINGLE)
567 
                .setMaxSelectNum(1)
568 
                .isEmptyResultReturn(true) //支持未选择返回
569 
                .setImageSpanCount(4)
570 
                .isPageStrategy(true)   // 是否开启分页模式
571 
                .isDisplayCamera(true) //是否显示相机入口
572 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
573 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
574 
                .isEmptyResultReturn(true)//支持未选择返回
575 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
576 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
577 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
578 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
579 
                .isGif(false)// 是否显示gif文件
580 
                .isWebp(true)// 是否显示webp文件
581 
                .isBmp(true)//是否显示bmp文件
582 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
583 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
584 
                .isFastSlidingSelect(true) //快速滑动选择
585 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
586 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
587 
                .isPreviewImage(true)//是否预览图片
588 
                .setCropEngine(new ImageCropEngine(1F,1F,true))
577 589 
                .forResult(1);
578 590 
    }
579 591 
@ -735,14 +747,9 @@ public class SkipUserInfoActivity extends Activity implements View.OnClickListen
735 747 
        ;
736 748 
    }
737 749 
    private void activityResult(Intent data) {
738 
        List<LocalMedia> medias = PictureSelector.obtainMultipleResult(data);
750 
        List<LocalMedia> medias = PictureSelector.obtainSelectorList(data);
739 751 
        if (medias != null && medias.size() > 0) {
740 
            String path = "";
741 
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
742 
                path = medias.get(0).getAndroidQToPath();
743 
            } else {
744 
                path = medias.get(0).getPath();
745 
            }
752 
            String path = Util.getCompressAbsolutePath(medias.get(0));
746 753 
            photo = imageZoom(BitmapFactory.decodeFile(path));
747 754 
            if (photo != null) {
748 755 
                iconPic.setImageBitmap(photo);

+ 7 - 7
app/src/main/java/com/electric/chargingpile/activity/TopicDetailActivity.java
Vedi File 

@ -263,13 +263,13 @@ public class TopicDetailActivity extends AppCompatActivity implements View.OnCli
263 263 
                String code = JsonUtils.getKeyResult(response, "code");
264 264 
                String desc = JsonUtils.getKeyResult(response, "desc");
265 265 
                if ("1000".equals(code)) {
266 
                    Intent intent = new Intent(getApplicationContext(), PublishItemsActivity.class);
267 
                    PublishItemSerializable intentData = new PublishItemSerializable();
268 
                    intentData.setFrom(PublishItemsActivity.FROM_TOPIC_DETAIL);
269 
                    intentData.setTopicId(homePageBean.topicVo.topicId);
270 
                    intentData.setName(homePageBean.topicVo.name);
271 
                    intent.putExtra("intent_data", intentData);
272 
                    startActivity(intent);
266 
//                    Intent intent = new Intent(getApplicationContext(), PublishItemsActivity.class);
267 
//                    PublishItemSerializable intentData = new PublishItemSerializable();
268 
//                    intentData.setFrom(PublishItemsActivity.FROM_TOPIC_DETAIL);
269 
//                    intentData.setTopicId(homePageBean.topicVo.topicId);
270 
//                    intentData.setName(homePageBean.topicVo.name);
271 
//                    intent.putExtra("intent_data", intentData);
272 
//                    startActivity(intent);
273 273 
                } else if ("8010".equals(code)) {
274 274 
                    startActivity(new Intent(getApplicationContext(), LoginActivity.class));
275 275 
                    ToastUtil.showToast(getApplicationContext(), desc, Toast.LENGTH_LONG);

+ 104 - 74
app/src/main/java/com/electric/chargingpile/activity/UserInfoActivity.java
Vedi File 

@ -1,5 +1,8 @@
1 1 
package com.electric.chargingpile.activity;
2 2
3 
import static com.hjq.permissions.Permission.CAMERA;
4 
import static com.hjq.permissions.Permission.READ_MEDIA_IMAGES;
5
3 6 
import android.Manifest;
4 7 
import android.app.Activity;
5 8 
import android.content.Context;
 
@ -22,6 +25,7 @@ import android.os.Bundle;
22 25 
import android.os.Handler;
23 26 
import android.os.Looper;
24 27 
import android.os.Message;
28 
import android.provider.MediaStore;
25 29 
import android.text.TextUtils;
26 30 
import android.util.Log;
27 31 
import android.view.Gravity;
 
@ -57,11 +61,16 @@ import com.electric.chargingpile.event.CarIntentModelEvent;
57 61 
import com.electric.chargingpile.manager.ProfileManager;
58 62 
import com.electric.chargingpile.util.BarColorUtil;
59 63 
import com.electric.chargingpile.util.DES3;
64 
import com.electric.chargingpile.util.ImageCropEngine;
65 
import com.electric.chargingpile.util.ImageFileCompressEngine;
60 66 
import com.electric.chargingpile.util.JsonUtils;
61 67 
import com.electric.chargingpile.util.LoadingDialog;
62 68 
import com.electric.chargingpile.util.LogUtils;
69 
import com.electric.chargingpile.util.MeOnCameraInterceptListener;
70 
import com.electric.chargingpile.util.MeSandboxFileEngine;
63 71 
import com.electric.chargingpile.util.OkHttpUtil;
64 72 
import com.electric.chargingpile.util.PhotoUtils;
73 
import com.electric.chargingpile.util.PictureUtlis;
65 74 
import com.electric.chargingpile.util.StatusConstants;
66 75 
import com.electric.chargingpile.util.ToastUtil;
67 76 
import com.electric.chargingpile.util.UploadUtil;
 
@ -69,10 +78,15 @@ import com.electric.chargingpile.util.Util;
69 78 
import com.electric.chargingpile.view.CustomProgressDialog;
70 79 
import com.electric.chargingpile.view.RoundImageView;
71 80 
import com.google.gson.Gson;
72 
import com.luck.picture.lib.PictureSelector;
81
82 
import com.hjq.permissions.OnPermissionCallback;
83 
import com.hjq.permissions.XXPermissions;
73 84 
import com.luck.picture.lib.animators.AnimationType;
85 
import com.luck.picture.lib.basic.PictureSelector;
74 86 
import com.luck.picture.lib.config.PictureConfig;
75 87 
import com.luck.picture.lib.config.PictureMimeType;
88 
import com.luck.picture.lib.config.SelectMimeType;
89 
import com.luck.picture.lib.config.SelectModeConfig;
76 90 
import com.luck.picture.lib.entity.LocalMedia;
77 91 
import com.squareup.okhttp.Request;
78 92 
import com.squareup.okhttp.Response;
 
@ -104,7 +118,7 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
104 118 
import pub.devrel.easypermissions.EasyPermissions;
105 119
106 120
107 
public class UserInfoActivity extends Activity implements View.OnClickListener, EasyPermissions.PermissionCallbacks {
121 
public class UserInfoActivity extends Activity implements View.OnClickListener {
108 122 
    private static final String TAG = "UserInfoActivity";
109 123 
    private ImageView back;
110 124 
    private EditText et_nickName;
 
@ -322,15 +336,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
322 336 
        spinnerCity.setOnItemSelectedListener(new CityAdapter());
323 337 
    }
324 338
325 
    @Override
326 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
327
328 
    }
329
330 
    @Override
331 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
332
333 
    }
334 339
335 340 
    class ProvinceAdapter implements AdapterView.OnItemSelectedListener {
336 341 
@ -579,71 +584,101 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
579 584 
     * @param view
580 585 
     */
581 586 
    public void takePhoto(View view) {
582
583 587 
        PictureSelector.create(this)
584 
                .openCamera(PictureMimeType.ofImage())
585 
                .selectionMode(PictureConfig.SINGLE)
586 
                .isSingleDirectReturn(true)
587 
                .isCompress(true)//是否压缩
588 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
589 
                .isGif(false)//是否显示gif
590 
                .isAndroidQTransform(true)
591 
                .imageEngine(GlideEngine.createGlideEngine())
592 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
593 
                .isUseCustomCamera(false)// 是否使用自定义相机
594 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
595 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
596 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
597 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
598 
                .imageSpanCount(4)// 每行显示个数
599 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
600 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
601 
                .isEnableCrop(true)
602 
                .rotateEnabled(false)//裁剪是否可旋转图片
603 
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
604 
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
605 
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
606 
                .circleDimmedLayer(true)// 是否开启圆形裁剪
607 
                .isDragFrame(true)//是否可拖动裁剪框(固定)
608 
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
609 
                .showCropGrid(false)//是否显示裁剪矩形网格 圆形裁剪时建议设为false
588 
                .openGallery(SelectMimeType.ofImage())
589 
                .setSelectorUIStyle(PictureUtlis.getStyle())
590 
                .setImageEngine(GlideEngine.createGlideEngine())
591 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
592 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
593 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
594 
                .setSelectionMode(SelectModeConfig.SINGLE)
595 
                .setMaxSelectNum(1)
596 
                .isEmptyResultReturn(true) //支持未选择返回
597 
                .setImageSpanCount(4)
598 
                .isPageStrategy(true)   // 是否开启分页模式
599 
                .isDisplayCamera(true) //是否显示相机入口
600 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
601 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
602 
                .isEmptyResultReturn(true)//支持未选择返回
603 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
604 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
605 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
606 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
607 
                .isGif(false)// 是否显示gif文件
608 
                .isWebp(true)// 是否显示webp文件
609 
                .isBmp(true)//是否显示bmp文件
610 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
611 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
612 
                .isFastSlidingSelect(true) //快速滑动选择
613 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
614 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
615 
                .isPreviewImage(true)//是否预览图片
616 
                .setCropEngine(new ImageCropEngine(1F,1F,true))
617 
                .setFilterMinFileSize(1) //过滤最小文件
610 618 
                .forResult(2);
611 619 
    }
612 620 
    private void openPhotoAlbum() {
613 
        PictureSelector.create(UserInfoActivity.this)
614 
                .openGallery(PictureMimeType.ofImage())
615 
                .isCamera(false)//列表是否显示拍照按钮
616 
                .selectionMode(PictureConfig.SINGLE)
617 
                .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
618 
                .isCompress(true)//是否压缩
619 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
620 
                .isGif(false)//是否显示gif
621 
                .isAndroidQTransform(true)
622 
                .imageEngine(GlideEngine.createGlideEngine())
623 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
624 
                .isUseCustomCamera(false)// 是否使用自定义相机
625 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
626 
                .setPictureStyle(Util.getWhiteStyle(UserInfoActivity.this))// 动态自定义相册主题
627 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
628 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
629 
                .imageSpanCount(4)// 每行显示个数
630 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
631 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
632 
                .rotateEnabled(false)//裁剪是否可旋转图片
633 
                .isEnableCrop(true)
634 
                .rotateEnabled(false)//裁剪是否可旋转图片
635 
                .setCircleStrokeWidth(8)//设置圆形裁剪边框粗细
636 
                 .freeStyleCropEnabled(true)// 裁剪框拖动模式
637 
                //.isCropDragSmoothToCenter(true)// 裁剪框拖动时图片自动跟随居中
638 
                .circleDimmedLayer(true)// 是否开启圆形裁剪
639 
                .isDragFrame(true)//是否可拖动裁剪框(固定)
640 
                .showCropFrame(false)// 是否显示裁剪矩形边框 圆形裁剪时建议设为false
641 
                .showCropGrid(false)//是否显示裁剪矩形网格 圆形裁剪时建议设为false
621 
        PictureSelector.create(this)
622 
                .openGallery(SelectMimeType.ofImage())
623 
                .setSelectorUIStyle(PictureUtlis.getStyle())
624 
                .setImageEngine(GlideEngine.createGlideEngine())
625 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
626 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
627 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
628 
                .setSelectionMode(SelectModeConfig.SINGLE)
629 
                .setMaxSelectNum(1)
630 
                .isEmptyResultReturn(true) //支持未选择返回
631 
                .setImageSpanCount(4)
632 
                .isPageStrategy(true)   // 是否开启分页模式
633 
                .isDisplayCamera(true) //是否显示相机入口
634 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
635 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
636 
                .isEmptyResultReturn(true)//支持未选择返回
637 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
638 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
639 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
640 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
641 
                .isGif(false)// 是否显示gif文件
642 
                .isWebp(true)// 是否显示webp文件
643 
                .isBmp(true)//是否显示bmp文件
644 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
645 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
646 
                .isFastSlidingSelect(true) //快速滑动选择
647 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
648 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
649 
                .isPreviewImage(true)//是否预览图片
650 
                .setFilterMinFileSize(1) //过滤最小文件
651 
                .setCropEngine(new ImageCropEngine(1F,1F,true))
642 652 
                .forResult(1);
643 653 
    }
644 654
645 655 
    @AfterPermissionGranted(RC_CAMERA_PERM)
646 656 
    public void cameraTask() {
657 
        String[] callPhone  =
658 
                new String[]{READ_MEDIA_IMAGES, CAMERA};
659 
        XXPermissions.with(this)
660 
                // 申请单个权限
661 
                .permission(callPhone)
662 
                .request(new OnPermissionCallback() {
663 
                    @Override
664 
                    public void onGranted(List<String> permissions, boolean all) {
665 
                        if (all) {
666 
                            showWindow();
667 
                        }else{
668 
                            ToastUtil.showToast(getApplicationContext(), "获取部分权限成功，但部分权限未正常授予", Toast.LENGTH_SHORT);
669 
                        }
670 
                    }
671 
                    @Override
672 
                    public void onDenied(List<String> permissions, boolean never) {
673 
                        if (never) {
674 
                            // 如果是被永久拒绝就跳转到应用权限系统设置页面
675 
                            XXPermissions.startPermissionActivity(UserInfoActivity.this, permissions);
676 
                        } else {
677 
                            ToastUtil.showToast(getApplicationContext(), "获取权限失败", Toast.LENGTH_SHORT);
678 
                        }
679 
                    }
680 
                });
681
647 682 
        if (hasCameraPermission()) {
648 683 
            showWindow();
649 684 
        } else {
 
@ -769,14 +804,9 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
769 804 
    }
770 805
771 806 
    private void activityResult(Intent data) {
772 
        List<LocalMedia> medias = PictureSelector.obtainMultipleResult(data);
807 
        List<LocalMedia> medias = PictureSelector.obtainSelectorList(data);
773 808 
        if (medias != null && medias.size() > 0) {
774 
            String path = "";
775 
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
776 
                path = medias.get(0).getAndroidQToPath();
777 
            } else {
778 
                path = medias.get(0).getPath();
779 
            }
809 
            String path = Util.getCompressAbsolutePath(medias.get(0));
780 810 
            photo = imageZoom(BitmapFactory.decodeFile(path));
781 811 
            if (photo != null) {
782 812 
                iconPic.setImageBitmap(photo);

+ 0 - 232
app/src/main/java/com/electric/chargingpile/activity/VideoCompressionActivity.java
Vedi File 

@ -1,232 +0,0 @@
1 
package com.electric.chargingpile.activity;
2
3
4 
import android.view.View;
5 
import androidx.appcompat.app.AppCompatActivity;
6
7
8 
/*
9 
public class VideoCompressionActivity extends AppCompatActivity implements View.OnClickListener {
10
11 
    private TextView viewById;
12 
    public static final int REQUEST_CODE_CHOOSE = 339;
13 
    @Override
14 
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
15 
        super.onCreate(savedInstanceState);
16 
        setContentView(R.layout.activity_video_compression);
17 
        findViewById(R.id.openPhoto).setOnClickListener(this);
18 
        findViewById(R.id.videoZip).setOnClickListener(this);
19 
        findViewById(R.id.startVideoZip).setOnClickListener(this);
20 
        viewById = findViewById(R.id.progress);
21 
    }
22
23 
    @Override
24 
    public void onClick(View v) {
25 
        switch (v.getId()){
26 
            case R.id.openPhoto:
27 
                PictureSelector.create(this)
28 
                        .openGallery(PictureMimeType.ofVideo())
29 
                        .selectionMode(PictureConfig.SINGLE)
30 
                        .isCompress(true)//是否压缩
31 
                        .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
32 
                        .isGif(true)//是否显示gif
33 
                        .isAndroidQTransform(true)
34 
                        .imageEngine(GlideEngine.createGlideEngine())
35 
                        .isWeChatStyle(false)// 是否开启微信图片选择风格
36 
                        .isUseCustomCamera(false)// 是否使用自定义相机
37 
                        .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
38 
                        .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
39 
                        .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
40 
                        .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
41 
                        .imageSpanCount(4)// 每行显示个数
42 
                        .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
43 
                        .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
44 
                        .forResult(REQUEST_CODE_CHOOSE);
45
46 
                break;
47
48 
            case R.id.videoZip:
49 
                Log.e("TAG", "开始");
50 
                runFFmpegRxJava();
51 
                break;
52
53 
            case R.id.startVideoZip:
54 
                PictureSelector.create(this)
55 
                        .setPictureStyle(Util.getWhiteStyle(this))
56 
                        .externalPictureVideo(mResultPath);
57
58 
                break;
59 
        }
60 
    }
61 
    private String mPath="";
62 
    @Override
63 
    protected void onActivityResult(int requestCode, int resultCode, @Nullable @org.jetbrains.annotations.Nullable Intent data) {
64 
        super.onActivityResult(requestCode, resultCode, data);
65 
        LocalMedia media = PictureSelector.obtainMultipleResult(data).get(0);
66 
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
67 
            mPath= media.getAndroidQToPath();
68 
        }else{
69 
            mPath=media.getPath();
70 
        }
71 
    }
72
73 
    private  MyRxFFmpegSubscriber myRxFFmpegSubscriber=null;
74 
    private  static String mResultPath=null;
75 
    private void runFFmpegRxJava() {
76
77 
        MediaMetadataRetriever retriever =new MediaMetadataRetriever();
78 
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
79 
            Uri newUri  = FileProvider.getUriForFile(
80 
                    this,
81 
                    getPackageName() + ".provider",
82 
                    new File(mPath)
83 
            );
84 
            retriever.setDataSource(this, newUri);
85 
        } else {
86 
            retriever.setDataSource(mPath, new HashMap<String, String>());
87 
        }
88 
        retriever.setDataSource(mPath);
89
90
91 
        String duration_s = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
92 
        long duration = Long.parseLong(duration_s);
93
94 
//获取视频帧数
95 
        String count_s = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_FRAME_COUNT);
96
97 
        long bitrate = Long.parseLong(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_BITRATE));
98 
        long count = Long.parseLong(count_s);
99
100 
//计算帧率
101 
        long dt = duration/count; // 平均每帧的时间间隔，35ms
102
103
104
105 
        Log.e("TAG", "runFFmpegRxJava帧率为: "+dt);
106
107 
        DecimalFormat df = new DecimalFormat("#.00");
108 
        String size="";
109 
        if (bitrate < 1024) {
110 
            size = df.format((double) bitrate) + "BT";
111 
        } else if (bitrate < 1048576) {
112 
            size = df.format((double) bitrate / 1024) + "KB";
113 
        } else if (bitrate < 1073741824) {
114 
            size = df.format((double) bitrate / 1048576) + "MB";
115 
        } else {
116 
            size = df.format((double) bitrate / 1073741824) +"GB";
117 
        }
118
119 
        Log.e("TAG", "runFFmpegRxJava比特率为: "+size);
120
121
122
123
124 
        mResultPath = PhotoUtils.CACHE_DIR + System.currentTimeMillis() + getFileExtension(mPath);
125 
        Log.e("TAG", "runFFmpegRxJava: "+GetFileSize(mPath));
126 
        if (bitrate < 21299200){//21299200 bit 即 2600k  如果小于2600K则
127 
            return;
128 
        }
129 
//        String text = "ffmpeg -y -i "+mPath+" -vf boxblur=25:5 -preset superfast "+mResultPath;
130 
        String text = "ffmpeg -y -i "+mPath+" -b 2600k -r 25 -vcodec libx264 -preset superfast "+mResultPath;
131
132 
        String[] commands = text.split(" ");
133
134 
        myRxFFmpegSubscriber = new MyRxFFmpegSubscriber(this);
135
136 
        //开始执行FFmpeg命令
137 
        RxFFmpegInvoke.getInstance()
138 
                .runCommandRxJava(commands)
139 
                .subscribe(myRxFFmpegSubscriber);
140
141 
    }
142
143 
    public static class MyRxFFmpegSubscriber extends RxFFmpegSubscriber {
144
145 
        private WeakReference<VideoCompressionActivity> mWeakReference;
146
147 
        public MyRxFFmpegSubscriber(VideoCompressionActivity homeFragment) {
148 
            mWeakReference = new WeakReference<>(homeFragment);
149 
        }
150
151 
        @Override
152 
        public void onFinish() {
153 
            final VideoCompressionActivity mHomeFragment = mWeakReference.get();
154 
            if (mHomeFragment != null) {
155 
                Log.e("TAG", "处理成功"+GetFileSize(mResultPath));
156
157 
            }
158 
        }
159
160 
        @Override
161 
        public void onProgress(int progress, long progressTime) {
162 
            final VideoCompressionActivity mHomeFragment = mWeakReference.get();
163 
            if (mHomeFragment != null) {
164 
                //progressTime 可以在结合视频总时长去计算合适的进度值
165 
                Log.e("TAG", "onProgress progress:"+progress+"  progressTime:"+progressTime);
166 
            }
167 
        }
168
169 
        @Override
170 
        public void onCancel() {
171 
            final VideoCompressionActivity mHomeFragment = mWeakReference.get();
172 
            if (mHomeFragment != null) {
173 
                Log.e("TAG", "已取消");
174
175 
            }
176 
        }
177
178 
        @Override
179 
        public void onError(String message) {
180 
            final VideoCompressionActivity mHomeFragment = mWeakReference.get();
181 
            if (mHomeFragment != null) {
182 
                Log.e("TAG", "出错了 onError：" + message);
183 
            }
184 
        }
185 
    }
186
187 
    @Override
188 
    public void onDestroy() {
189 
        super.onDestroy();
190 
        if (myRxFFmpegSubscriber != null) {
191 
            myRxFFmpegSubscriber.dispose();
192 
        }
193 
    }
194
195 
    public String getFileExtension(String path) {
196 
        String extension = "";
197 
        File file = new File(path);
198 
        try {
199 
            if (file != null && file.exists()) {
200 
                String name = file.getName();
201 
                extension = name.substring(name.lastIndexOf("."));
202 
            }
203 
        } catch (Exception e) {
204 
            extension = "";
205 
        }
206 
        return extension;
207 
    }
208
209 
    public static String GetFileSize(String path){
210 
        String size = "";
211 
        File file = new File(path);
212 
        if(file.exists() && file.isFile()){
213 
            long fileS = file.length();
214 
            DecimalFormat df = new DecimalFormat("#.00");
215 
            if (fileS < 1024) {
216 
                size = df.format((double) fileS) + "BT";
217 
            } else if (fileS < 1048576) {
218 
                size = df.format((double) fileS / 1024) + "KB";
219 
            } else if (fileS < 1073741824) {
220 
                size = df.format((double) fileS / 1048576) + "MB";
221 
            } else {
222 
                size = df.format((double) fileS / 1073741824) +"GB";
223 
            }
224 
        }else if(file.exists() && file.isDirectory()){
225 
            size = "";
226 
        }else{
227 
            size = "0BT";
228 
        }
229 
        return size;
230 
    }
231 
}
232 
*/

+ 137 - 131
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java
Vedi File 

@ -13,6 +13,7 @@ import android.os.Bundle;
13 13
14 14 
import android.os.Handler;
15 15 
import android.os.Message;
16 
import android.provider.MediaStore;
16 17 
import android.text.Editable;
17 18 
import android.text.Html;
18 19 
import android.text.TextUtils;
 
@ -31,6 +32,7 @@ import android.widget.Toast;
31 32
32 33 
import androidx.annotation.NonNull;
33 34 
import androidx.appcompat.app.AppCompatActivity;
35 
import androidx.fragment.app.Fragment;
34 36 
import androidx.recyclerview.widget.GridLayoutManager;
35 37 
import androidx.recyclerview.widget.RecyclerView;
36 38 
@ -52,9 +54,14 @@ import com.electric.chargingpile.util.CommonParams;
52 54 
import com.electric.chargingpile.util.DES3;
53 55 
import com.electric.chargingpile.util.DateUtils;
54 56 
import com.electric.chargingpile.util.DensityUtil;
57 
import com.electric.chargingpile.util.IjkPlayerEngine;
58 
import com.electric.chargingpile.util.ImageFileCompressEngine;
55 59 
import com.electric.chargingpile.util.JsonUtils;
56 60 
import com.electric.chargingpile.util.LoadingDialog;
57 61 
import com.electric.chargingpile.util.Md5Util;
62 
import com.electric.chargingpile.util.MeOnCameraInterceptListener;
63 
import com.electric.chargingpile.util.MeSandboxFileEngine;
64 
import com.electric.chargingpile.util.PictureUtlis;
58 65 
import com.electric.chargingpile.util.PublicWayONE;
59 66 
import com.electric.chargingpile.util.Res;
60 67 
import com.electric.chargingpile.util.ScreenUtils;
 
@ -68,13 +75,18 @@ import com.electric.chargingpile.view.RatingBarView;
68 75
69 76 
import com.google.gson.Gson;
70 77 
import com.google.gson.reflect.TypeToken;
71 
import com.luck.picture.lib.PictureSelector;
78 
import com.hjq.permissions.OnPermissionCallback;
79 
import com.hjq.permissions.XXPermissions;
80 
import com.luck.lib.camerax.CameraImageEngine;
81 
import com.luck.lib.camerax.SimpleCameraX;
72 82 
import com.luck.picture.lib.animators.AnimationType;
73 83
74 84
75 
import com.luck.picture.lib.camera.CustomCameraView;
85 
import com.luck.picture.lib.basic.PictureSelector;
76 86 
import com.luck.picture.lib.config.PictureConfig;
77 87 
import com.luck.picture.lib.config.PictureMimeType;
88 
import com.luck.picture.lib.config.SelectMimeType;
89 
import com.luck.picture.lib.config.SelectModeConfig;
78 90 
import com.luck.picture.lib.entity.LocalMedia;
79 91 
import com.upyun.library.common.SerialUploader;
80 92 
import com.upyun.library.listener.UpCompleteListener;
 
@ -105,11 +117,16 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
105 117 
import pub.devrel.easypermissions.EasyPermissions;
106 118
107 119 
import static android.text.Html.FROM_HTML_MODE_LEGACY;
120 
import static com.hjq.permissions.Permission.CAMERA;
121 
import static com.hjq.permissions.Permission.READ_MEDIA_IMAGES;
122 
import static com.hjq.permissions.Permission.READ_MEDIA_VIDEO;
123 
import static com.luck.lib.camerax.CustomCameraConfig.BUTTON_STATE_ONLY_RECORDER;
124
108 125 
/**
109 126 
 * 如果更改此页面，则需要同步更改 ChargingCommentActivity，
110 127 
 * ZhanCommentActivity 该页面为从地图充电icon-> 列表 ->去评论
111 128 
 * */
112 
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener, EasyPermissions.PermissionCallbacks, GridImageAdapter.GridImgListener {
129 
public class ZhanCommentActivity extends AppCompatActivity implements View.OnClickListener,  GridImageAdapter.GridImgListener {
113 130 
    private static final String TAG = "ZhanCommentActivity";
114 131 
    private static final int PIC_NUM = 3;
115 132 
    private ProgressDialog insertDialog;
 
@ -462,12 +479,8 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
462 479 
        for (int i = 0; i < Bimp.tempSelectMedia.size(); i++) {
463 480
464 481 
            LocalMedia media = Bimp.tempSelectMedia.get(i);
465 
            String path = "";
466 
            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
467 
                path = media.getAndroidQToPath();
468 
            else {
469 
                path = media.getPath();
470 
            }
482 
            String path = Util.getCompressAbsolutePath(media);
483
471 484 
            bm = imageZoom(BitmapFactory.decodeFile(path));
472 485 
            String file = bitmapToBase64(bm);
473 486 
            Map<String, String> par = new HashMap<String, String>();
 
@ -518,7 +531,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
518 531 
                    setLayoutHintVisible(1);
519 532 
                    //异步方式插入图片
520 533 
//                    insertImagesSync(data);
521 
                    Bimp.tempSelectMedia = PictureSelector.obtainMultipleResult(data);
534 
                    Bimp.tempSelectMedia = PictureSelector.obtainSelectorList(data);
522 535 
                    mAdapter.setMaxCount(3);
523 536 
                    mInsterType = 1;
524 537 
@ -530,7 +543,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
530 543 
                    setLayoutHintVisible(2);
531 544 
                    mInsterType = 2;
532 545 
                    mAdapter.setMaxCount(1);
533 
                    Bimp.tempSelectMedia = PictureSelector.obtainMultipleResult(data);
546 
                    Bimp.tempSelectMedia = PictureSelector.obtainSelectorList(data);
534 547 
                    mAdapter.setDatas(Bimp.tempSelectMedia);
535 548 
                }
536 549 
            }
 
@ -591,19 +604,16 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
591 604 
                return tv;
592 605 
            }
593 606 
        });
594 
        mFlowLayout.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
595 
            @Override
596 
            public boolean onTagClick(View view, int position, FlowLayout parent) {
597 
                if (select_s.contains(stringArr[position])) {
598 
                    String s = stringArr[position] + ",";
599 
                    select_s = select_s.replaceAll(s, "");
600 
                } else {
601 
                    select_s += stringArr[position] + ",";
602 
                }
603 
                Log.e("select===", select_s);
604
605 
                return true;
607 
        mFlowLayout.setOnTagClickListener((view, position, parent) -> {
608 
            if (select_s.contains(stringArr[position])) {
609 
                String s = stringArr[position] + ",";
610 
                select_s = select_s.replaceAll(s, "");
611 
            } else {
612 
                select_s += stringArr[position] + ",";
606 613 
            }
614 
            Log.e("select===", select_s);
615
616 
            return true;
607 617 
        });
608 618 
    }
609 619 
@ -769,14 +779,7 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
769 779 
                        } else if (Bimp.tempSelectMedia.size() > 0 && mInsterType == 2) {
770 780 
                            //进行视频验证
771 781 
                            LocalMedia media = Bimp.tempSelectMedia.get(0);
772 
                            String path = "";
773 
                            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
774 
                                path = media.getAndroidQToPath();
775 
                            else {
776 
                                path = media.getPath();
777 
                            }
778
779
782 
                            String path = Util.getCompressAbsolutePath(media);
780 783 
                            getYouPaiData(path);
781 784 
                        } else {
782 785 
                            if (containsEmoji(et_pinglun.getText().toString())) {
 
@ -915,118 +918,112 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
915 918 
        String saveKey = jsonObject.optString("save-key");
916 919
917 920 
        serialUploader.upload(
918 
                temp, uri, date, "UPYUN " + operator + ":" + sign, null, new UpCompleteListener() {
919 
                    @Override
920 
                    public void onComplete(boolean isSuccess, String result) {
921 
                        if (isSuccess) {
922 
                            try {
923 
                                ArrayList<String> list = new ArrayList<>();
924 
                                list.add(saveKey);
925 
                                addComment(list, saveKey);
926 
                            } catch (Exception e) {
927 
                                e.printStackTrace();
928 
                            }
929 
                        } else {
930 
                            ToastUtil.showToast(getApplicationContext(), "发布失败，请重试", Toast.LENGTH_SHORT);
931 
                            dialog.dismiss();
921 
                temp, uri, date, "UPYUN " + operator + ":" + sign, null, (isSuccess, result) -> {
922 
                    if (isSuccess) {
923 
                        try {
924 
                            ArrayList<String> list = new ArrayList<>();
925 
                            list.add(saveKey);
926 
                            addComment(list, saveKey);
927 
                        } catch (Exception e) {
928 
                            e.printStackTrace();
932 929 
                        }
933
930 
                    } else {
931 
                        ToastUtil.showToast(getApplicationContext(), "发布失败，请重试", Toast.LENGTH_SHORT);
932 
                        dialog.dismiss();
934 933 
                    }
934
935 935 
                });
936 936 
    }
937 937
938 938 
    private void addImg() {
939 939 
        PictureSelector.create(this)
940 
                .openGallery(PictureMimeType.ofImage())
941 
                .maxSelectNum(PIC_NUM)
942 
                .selectionMode(PictureConfig.MULTIPLE)
943 
                .selectionData(Bimp.tempSelectMedia)//是否传入已选图片
944 
                .isCompress(true)//是否压缩
945 
                .isPreviewEggs(true)//预览图片时是否增强左右滑动图片体验
946 
                .isGif(true)//是否显示gif
947 
                .isAndroidQTransform(true)
948 
                .imageEngine(GlideEngine.createGlideEngine())
949 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
950 
                .isUseCustomCamera(false)// 是否使用自定义相机
951 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
952 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
953 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
954 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
955 
                .imageSpanCount(4)// 每行显示个数
956 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
957 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
940 
                .openGallery(SelectMimeType.ofImage())
941 
                .setSelectorUIStyle(PictureUtlis.getStyle())
942 
                .setImageEngine(GlideEngine.createGlideEngine())
943 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
944 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
945 
                .setCameraInterceptListener(new MeOnCameraInterceptListener())
946 
                .setSelectionMode(SelectModeConfig.MULTIPLE)
947 
                .setMaxSelectNum(PIC_NUM)
948 
                .isEmptyResultReturn(true) //支持未选择返回
949 
                .setImageSpanCount(4)
950 
                .isPageStrategy(true)   // 是否开启分页模式
951 
                .isDisplayCamera(true) //是否显示相机入口
952 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
953 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
954 
                .isEmptyResultReturn(true)//支持未选择返回
955 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
956 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
957 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
958 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
959 
                .isGif(true)// 是否显示gif文件
960 
                .isWebp(true)// 是否显示webp文件
961 
                .isBmp(true)//是否显示bmp文件
962 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
963 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
964 
                .isFastSlidingSelect(true) //快速滑动选择
965 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
966 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
967 
                .isPreviewImage(true)//是否预览图片
968 
                .setFilterMinFileSize(1) //过滤最小文件
958 969 
                .forResult(REQUEST_CODE_CHOOSE);
959 970 
    }
960 971
961 972 
    private void addVideo() {
962 973 
        PictureSelector.create(this)
963 
                .openGallery(PictureMimeType.ofVideo())
964 
               // .selectionMode(PictureConfig.SINGLE)
965 
                .isCompress(true)//是否压缩
966 
                .maxSelectNum(1)
967 
                .isPreviewEggs(true)//图片时是否增强左右滑动图片体验
968 
                .isAndroidQTransform(true)
969 
                .imageEngine(GlideEngine.createGlideEngine())
970 
                .isWeChatStyle(false)// 是否开启微信图片选择风格
971 
                .isUseCustomCamera(false)// 是否使用自定义相机
972 
                .isPageStrategy(true)// 是否开启分页策略 & 每页多少条；默认开启
973 
                .setPictureStyle(Util.getWhiteStyle(this))// 动态自定义相册主题
974 
                .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
975 
                .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
976 
                .imageSpanCount(4)// 每行显示个数
977 
                .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
978 
                .isAutomaticTitleRecyclerTop(true)//图片列表超过一屏连续点击顶部标题栏快速回滚至顶部
979 
                .videoMaxSecond(16)   // 查询多少秒以内的视频
980 
                .videoMinSecond(2)   // 查询多少秒以内的视频
981 
                .recordVideoSecond(16)//录制视频秒数 默认60s
982 
                .isPreviewVideo(true)//是否预览视频
983 
                .setButtonFeatures(CustomCameraView.BUTTON_STATE_ONLY_RECORDER) //自定义按钮样式
984 
                .isUseCustomCamera(true)// 开启自定义相机
985 
               // .isSingleDirectReturn(true)//PictureConfig.SINGLE模式下是否直接返回
986 
                .filterMaxFileSize( 100 * 1024 )//查询指定大小内的图片、视频、音频大小，单位 KB
974 
                .openGallery(SelectMimeType.ofVideo())
975 
                .setSelectorUIStyle(PictureUtlis.getStyle())
976 
                .setImageEngine(GlideEngine.createGlideEngine())
977 
                .setCompressEngine(new ImageFileCompressEngine()) //设置压缩
978 
                .setSandboxFileEngine(new MeSandboxFileEngine()) //设置相册沙盒目录拷贝引擎
979 
                .setSelectionMode(SelectModeConfig.SINGLE) //设置单选
980 
                .isEmptyResultReturn(true) //支持未选择返回
981 
                .setImageSpanCount(3)
982 
                .isPageStrategy(true)   // 是否开启分页模式
983 
                .isDisplayCamera(true) //是否显示相机入口
984 
                .isPreviewFullScreenMode(true)//预览点击全屏效果
985 
                .isEmptyResultReturn(true)//支持未选择返回
986 
                .isWithSelectVideoImage(false)//是否支持视频图片同选
987 
                .isSelectZoomAnim(true)// 选择缩略图缩放效果
988 
                .isCameraAroundState(false)// 是否开启前置摄像头；系统相机 只支持部分机型
989 
                .isCameraRotateImage(true) //拍照是否纠正旋转图片
990 
                .isGif(true)// 是否显示gif文件
991 
                .isWebp(true)// 是否显示webp文件
992 
                .isBmp(true)//是否显示bmp文件
993 
                .isMaxSelectEnabledMask(true)// 达到最大选择数是否开启禁选蒙层
994 
                .isAutomaticTitleRecyclerTop(true) //点击相册标题是否快速回到第一项
995 
                .isFastSlidingSelect(true) //快速滑动选择
996 
                .isDirectReturnSingle(true)//PictureConfig.SINGLE模式下是否直接返回
997 
                .setQuerySortOrder(MediaStore.MediaColumns.DATE_MODIFIED + " DESC")//由远-近 MediaStore.MediaColumns.DATE_MODIFIED + " ASC"
998 
                .isPreviewImage(true)//是否预览图片
999 
                .setMaxSelectNum(1)//最大选择数量,默认9张
1000 
                .setMinSelectNum(1)// 最小选择数量
1001 
                .setRecordVideoMaxSecond(16) //视频录制最大时长
1002 
                .setRecordVideoMinSecond(2) //视频录制最小时长
1003 
                .setFilterVideoMaxSecond(16) //过滤视频最大时长
1004 
                .setFilterVideoMinSecond(2) //过滤视频最小时长
1005 
                .setFilterMinFileSize(1) //过滤最小文件
1006 
                .setVideoQuality(1)
1007 
                .setCameraInterceptListener(new MeOnCameraInterceptListener(){
1008 
                    @Override
1009 
                    public void openCamera(Fragment fragment, int cameraMode, int requestCode) {
1010 
                        SimpleCameraX camera = SimpleCameraX.of();
1011 
                        camera.isAutoRotation(true);
1012 
                        camera.setCameraMode(BUTTON_STATE_ONLY_RECORDER);
1013 
                        camera.setVideoFrameRate(25);
1014 
                        camera.setVideoBitRate(3 * 1024 * 1024);
1015 
                        camera.isDisplayRecordChangeTime(true);
1016 
                        camera.isManualFocusCameraPreview(true);
1017 
                        camera.isZoomCameraPreview(true);
1018 
                        camera.setImageEngine((context, url, imageView) -> Glide.with(context).load(url).into(imageView));
1019 
                        camera.start(fragment.requireActivity(), fragment, requestCode);
1020 
                    }
1021 
                })
1022 
                .isVideoPauseResumePlay(true) //视频支持暂停与播放
987 1023 
                .forResult(REQUEST_VIDEO_CODE_CHOOSE);
988 1024 
    }
989 1025
990 1026 
    @Override
991 
    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
992 
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
993 
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
994 
    }
995
996 
    @Override
997 
    public void onPermissionsGranted(int requestCode, List<String> perms) {
998
999 
    }
1000
1001 
    @Override
1002 
    public void onPermissionsDenied(int requestCode, List<String> perms) {
1003
1004 
    }
1005
1006 
    @AfterPermissionGranted(RC_ALBUM_PERM)
1007 
    public void permissionTask() {
1008 
        if (isPermissionOK()) {
1009 
            addImg();
1010 
        } else {
1011 
            // Ask for one permission
1012 
            EasyPermissions.requestPermissions(
1013 
                    this, "充电桩想要获取您的图片读取权限，是否允许？",
1014 
                    RC_ALBUM_PERM,
1015 
                    Manifest.permission.WRITE_EXTERNAL_STORAGE,
1016 
                    Manifest.permission.READ_EXTERNAL_STORAGE,
1017 
                    Manifest.permission.CAMERA);
1018 
        }
1019 
    }
1020
1021 
    private boolean isPermissionOK() {
1022 
        return EasyPermissions.hasPermissions(this,
1023 
                Manifest.permission.WRITE_EXTERNAL_STORAGE,
1024 
                Manifest.permission.READ_EXTERNAL_STORAGE,
1025 
                Manifest.permission.CAMERA
1026 
        );
1027 
    }
1028
1029 
    @Override
1030 1027 
    public void add() {
1031 1028 
        if (mInsterType == 1) {
1032 1029 
            addImg();
 
@ -1049,10 +1046,19 @@ public class ZhanCommentActivity extends AppCompatActivity implements View.OnCli
1049 1046 
        if (mInsterType == 1) {
1050 1047 
            ImageDisplayActivity.actionStart(this, position);
1051 1048 
        } else if (mInsterType == 2) {
1052 
            PictureSelector.create(ZhanCommentActivity.this)
1053 
                    .themeStyle(com.luck.picture.lib.R.style.picture_default_style)
1054 
                    .setPictureStyle(Util.getWhiteStyle(ZhanCommentActivity.this))// 动态自定义相册主题
1055 
                    .externalPictureVideo(TextUtils.isEmpty(mLocalMedia.getAndroidQToPath()) ? mLocalMedia.getPath() : mLocalMedia.getAndroidQToPath());
1049
1050 
            ArrayList<LocalMedia> list = new ArrayList<>();
1051 
            list.add(mLocalMedia);
1052 
            PictureSelector.create(this)
1053 
                    .openPreview()
1054 
                    .setImageEngine(GlideEngine.createGlideEngine())
1055 
                    .setVideoPlayerEngine(new IjkPlayerEngine())
1056 
                    .setSelectorUIStyle(PictureUtlis.getStyle())
1057 
                    .isPreviewFullScreenMode(false)
1058 
                    .isVideoPauseResumePlay(true)
1059 
                    .isAutoVideoPlay(true)
1060 
                    .isLoopAutoVideoPlay(true)
1061 
                    .startActivityPreview(0,false, list);
1056 1062 
        }
1057 1063 
    }
1058 1064

+ 3 - 7
app/src/main/java/com/electric/chargingpile/adapter/GridImageAdapter.java
Vedi File 

@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView;
12 12
13 13 
import com.bumptech.glide.Glide;
14 14 
import com.electric.chargingpile.R;
15 
import com.electric.chargingpile.util.Util;
15 16 
import com.luck.picture.lib.entity.LocalMedia;
16 17 
import com.luck.picture.lib.entity.MediaData;
17 18 
@ -90,14 +91,9 @@ public class GridImageAdapter extends RecyclerView.Adapter<GridImageAdapter.View
90 91 
//            holder.imageView.setImageResource(R.drawable.addpic65);
91 92 
            holder.remove.setVisibility( View.GONE);
92 93 
        } else {
93
94 
            String path="";
95 94 
            LocalMedia data = mDatas.get(position);
96 
            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q)
97 
                path= data.getAndroidQToPath();
98 
            else {
99 
                path= data.getPath();
100 
            }
95
96 
            String path = Util.getCompressAbsolutePath(data);
101 97
102 98
103 99 
            Glide.with(context)

+ 6 - 6
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
Vedi File 

@ -103,13 +103,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
103 103 
    public static String firstPoint = "";
104 104 
    public static Boolean firstSsyd;
105 105 
    public static String password = "";
106 
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
107 
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
108 
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
109 
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
106 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
107 
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
108 
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
109 
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
110 110
111 
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
112 
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
111 
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
112 
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
113 113
114 114 
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
115 115 
    public static String CDN = "https://cdn-fs.d1ev.com";

+ 49 - 169
app/src/main/java/com/electric/chargingpile/engine/GlideEngine.java
Vedi File 

@ -1,197 +1,68 @@
1 1 
package com.electric.chargingpile.engine;
2 2
3 3 
import android.content.Context;
4 
import android.graphics.Bitmap;
5 
import android.graphics.PointF;
6 
import android.graphics.drawable.Drawable;
7 
import android.view.View;
8 4 
import android.widget.ImageView;
9 5
10 
import androidx.annotation.NonNull;
11 
import androidx.annotation.Nullable;
12 
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
13 
import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
14
15 6 
import com.bumptech.glide.Glide;
16 
import com.bumptech.glide.request.RequestOptions;
17 
import com.bumptech.glide.request.target.BitmapImageViewTarget;
18 
import com.bumptech.glide.request.target.ImageViewTarget;
7 
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
8 
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
19 9 
import com.electric.chargingpile.R;
20 10 
import com.luck.picture.lib.engine.ImageEngine;
21 
import com.luck.picture.lib.listener.OnImageCompleteCallback;
22 
import com.luck.picture.lib.tools.MediaUtils;
23 
import com.luck.picture.lib.widget.longimage.ImageSource;
24 
import com.luck.picture.lib.widget.longimage.ImageViewState;
25 
import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView;
11 
import com.luck.picture.lib.utils.ActivityCompatHelper;
26 12
27 
/**
28 
 * @author：luck
29 
 * @date：2019-11-13 17:02
30 
 * @describe：Glide加载引擎
31 
 */
32 13 
public class GlideEngine implements ImageEngine {
33 14
15 
    public static GlideEngine createGlideEngine() {
16 
        return InstanceHolder.instance;
17 
    }
18
34 19 
    /**
35 20 
     * 加载图片
36 21 
     *
37 
     * @param context
38 
     * @param url
39 
     * @param imageView
22 
     * @param context   上下文
23 
     * @param url       资源url
24 
     * @param imageView 图片承载控件
40 25 
     */
41 26 
    @Override
42 
    public void loadImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
27 
    public void loadImage(Context context, String url, ImageView imageView) {
28 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
29 
            return;
30 
        }
43 31 
        Glide.with(context)
44 32 
                .load(url)
45 33 
                .into(imageView);
46 34 
    }
47 35
48 
    /**
49 
     * 加载网络图片适配长图方案
50 
     * # 注意：此方法只有加载网络图片才会回调
51 
     *
52 
     * @param context
53 
     * @param url
54 
     * @param imageView
55 
     * @param longImageView
56 
     * @param callback      网络图片加载回调监听 {link after version 2.5.1 Please use the #OnImageCompleteCallback#}
57 
     */
58 36 
    @Override
59 
    public void loadImage(@NonNull Context context, @NonNull String url,
60 
                          @NonNull ImageView imageView,
61 
                          SubsamplingScaleImageView longImageView, OnImageCompleteCallback callback) {
62 
        Glide.with(context)
63 
                .asBitmap()
64 
                .load(url)
65 
                .into(new ImageViewTarget<Bitmap>(imageView) {
66 
                    @Override
67 
                    public void onLoadStarted(@Nullable Drawable placeholder) {
68 
                        super.onLoadStarted(placeholder);
69 
                        if (callback != null) {
70 
                            callback.onShowLoading();
71 
                        }
72 
                    }
73
74 
                    @Override
75 
                    public void onLoadFailed(@Nullable Drawable errorDrawable) {
76 
                        super.onLoadFailed(errorDrawable);
77 
                        if (callback != null) {
78 
                            callback.onHideLoading();
79 
                        }
80 
                    }
81
82 
                    @Override
83 
                    protected void setResource(@Nullable Bitmap resource) {
84 
                        if (callback != null) {
85 
                            callback.onHideLoading();
86 
                        }
87 
                        if (resource != null) {
88 
                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
89 
                                    resource.getHeight());
90 
                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
91 
                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
92 
                            if (eqLongImage) {
93 
                                // 加载长图
94 
                                longImageView.setQuickScaleEnabled(true);
95 
                                longImageView.setZoomEnabled(true);
96 
                                longImageView.setPanEnabled(true);
97 
                                longImageView.setDoubleTapZoomDuration(100);
98 
                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
99 
                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
100 
                                longImageView.setImage(ImageSource.bitmap(resource),
101 
                                        new ImageViewState(0, new PointF(0, 0), 0));
102 
                            } else {
103 
                                // 普通图片
104 
                                imageView.setImageBitmap(resource);
105 
                            }
106 
                        }
107 
                    }
108 
                });
109 
    }
110
111 
    /**
112 
     * 加载网络图片适配长图方案
113 
     * # 注意：此方法只有加载网络图片才会回调
114 
     *
115 
     * @param context
116 
     * @param url
117 
     * @param imageView
118 
     * @param longImageView
119 
     * @ 已废弃
120 
     */
121 
    public void loadImage(@NonNull Context context, @NonNull String url,
122 
                          @NonNull ImageView imageView,
123 
                          SubsamplingScaleImageView longImageView) {
37 
    public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) {
38 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
39 
            return;
40 
        }
124 41 
        Glide.with(context)
125 
                .asBitmap()
126 42 
                .load(url)
127 
                .into(new ImageViewTarget<Bitmap>(imageView) {
128 
                    @Override
129 
                    protected void setResource(@Nullable Bitmap resource) {
130 
                        if (resource != null) {
131 
                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
132 
                                    resource.getHeight());
133 
                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
134 
                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
135 
                            if (eqLongImage) {
136 
                                // 加载长图
137 
                                longImageView.setQuickScaleEnabled(true);
138 
                                longImageView.setZoomEnabled(true);
139 
                                longImageView.setPanEnabled(true);
140 
                                longImageView.setDoubleTapZoomDuration(100);
141 
                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
142 
                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
143 
                                longImageView.setImage(ImageSource.bitmap(resource),
144 
                                        new ImageViewState(0, new PointF(0, 0), 0));
145 
                            } else {
146 
                                // 普通图片
147 
                                imageView.setImageBitmap(resource);
148 
                            }
149 
                        }
150 
                    }
151 
                });
43 
                .override(maxWidth, maxHeight)
44 
                .into(imageView);
152 45 
    }
153 46
154 47 
    /**
155 
     * 加载相册目录
48 
     * 加载相册目录封面
156 49 
     *
157 50 
     * @param context   上下文
158 51 
     * @param url       图片路径
159 52 
     * @param imageView 承载图片ImageView
160 53 
     */
161 54 
    @Override
162 
    public void loadFolderImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
55 
    public void loadAlbumCover(Context context, String url, ImageView imageView) {
56 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
57 
            return;
58 
        }
163 59 
        Glide.with(context)
164 60 
                .asBitmap()
165 61 
                .load(url)
166 62 
                .override(180, 180)
167 
                .centerCrop()
168 63 
                .sizeMultiplier(0.5f)
169 
                .apply(new RequestOptions().placeholder(R.drawable.picture_image_placeholder))
170 
                .into(new BitmapImageViewTarget(imageView) {
171 
                    @Override
172 
                    protected void setResource(Bitmap resource) {
173 
                        RoundedBitmapDrawable circularBitmapDrawable =
174 
                                RoundedBitmapDrawableFactory.
175 
                                        create(context.getResources(), resource);
176 
                        circularBitmapDrawable.setCornerRadius(8);
177 
                        imageView.setImageDrawable(circularBitmapDrawable);
178 
                    }
179 
                });
180 
    }
181
182
183 
    /**
184 
     * 加载gif
185 
     *
186 
     * @param context   上下文
187 
     * @param url       图片路径
188 
     * @param imageView 承载图片ImageView
189 
     */
190 
    public void loadAsGifImage(@NonNull Context context, @NonNull String url,
191 
                               @NonNull ImageView imageView) {
192 
        Glide.with(context)
193 
                .asGif()
194 
                .load(url)
64 
                .transform(new CenterCrop(), new RoundedCorners(8))
65 
                .placeholder(R.drawable.ps_image_placeholder)
195 66 
                .into(imageView);
196 67 
    }
197 68 
@ -203,29 +74,38 @@ public class GlideEngine implements ImageEngine {
203 74 
     * @param imageView 承载图片ImageView
204 75 
     */
205 76 
    @Override
206 
    public void loadGridImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
77 
    public void loadGridImage(Context context, String url, ImageView imageView) {
78 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
79 
            return;
80 
        }
207 81 
        Glide.with(context)
208 82 
                .load(url)
209 83 
                .override(200, 200)
210 84 
                .centerCrop()
211 
                .apply(new RequestOptions().placeholder(R.drawable.picture_image_placeholder))
85 
                .placeholder(R.drawable.ps_image_placeholder)
212 86 
                .into(imageView);
213 87 
    }
214 88
89 
    @Override
90 
    public void pauseRequests(Context context) {
91 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
92 
            return;
93 
        }
94 
        Glide.with(context).pauseRequests();
95 
    }
215 96
216 97 
    private GlideEngine() {
217 98 
    }
218 99
219 
    private static GlideEngine instance;
220
221 
    public static GlideEngine createGlideEngine() {
222 
        if (null == instance) {
223 
            synchronized (GlideEngine.class) {
224 
                if (null == instance) {
225 
                    instance = new GlideEngine();
226 
                }
227 
            }
100 
    @Override
101 
    public void resumeRequests(Context context) {
102 
        if (!ActivityCompatHelper.assertValidRequest(context)) {
103 
            return;
228 104 
        }
229 
        return instance;
105 
        Glide.with(context).resumeRequests();
106 
    }
107
108 
    private static final class InstanceHolder {
109 
        static final GlideEngine instance = new GlideEngine();
230 110 
    }
231 
}
111 
}

+ 7 - 8
app/src/main/java/com/electric/chargingpile/fragment/ChatRecommendFragment.java
Vedi File 

@ -19,7 +19,6 @@ import com.andview.refreshview.XRefreshView;
19 19 
import com.electric.chargingpile.R;
20 20 
import com.electric.chargingpile.activity.ChatContentListActivity;
21 21 
import com.electric.chargingpile.activity.LoginActivity;
22 
import com.electric.chargingpile.activity.PublishItemsActivity;
23 22 
import com.electric.chargingpile.adapter.ChatRecommendAdapter;
24 23 
import com.electric.chargingpile.adapter.TopicDetailAdapter;
25 24 
import com.electric.chargingpile.application.MainApplication;
 
@ -42,7 +41,7 @@ import java.util.HashMap;
42 41 
import java.util.Map;
43 42
44 43 
import okhttp3.Call;
45
44 
@Deprecated
46 45 
public class ChatRecommendFragment extends Fragment implements View.OnClickListener {
47 46 
    private static final String TAG = "ChatRecommendFragment";
48 47 
    private View view;
 
@ -228,12 +227,12 @@ public class ChatRecommendFragment extends Fragment implements View.OnClickListe
228 227 
                String code = JsonUtils.getKeyResult(response, "code");
229 228 
                String desc = JsonUtils.getKeyResult(response, "desc");
230 229 
                if ("1000".equals(code)) {
231 
                    MobclickAgent.onEvent(getContext(), "1004");
232 
                    Intent intent = new Intent(getActivity(), PublishItemsActivity.class);
233 
                    PublishItemSerializable intentData = new PublishItemSerializable();
234 
                    intentData.setFrom(PublishItemsActivity.FROM_CHAT_HOME);
235 
                    intent.putExtra("intent_data", intentData);
236 
                    startActivity(intent);
230 
//                    MobclickAgent.onEvent(getContext(), "1004");
231 
//                    Intent intent = new Intent(getActivity(), PublishItemsActivity.class);
232 
//                    PublishItemSerializable intentData = new PublishItemSerializable();
233 
//                    intentData.setFrom(PublishItemsActivity.FROM_CHAT_HOME);
234 
//                    intent.putExtra("intent_data", intentData);
235 
//                    startActivity(intent);
237 236 
                } else if ("8010".equals(code)) {
238 237 
                    startActivity(new Intent(getContext(), LoginActivity.class));
239 238 
                    ToastUtil.showToast(getContext(), desc, Toast.LENGTH_LONG);

+ 2 - 3
app/src/main/java/com/electric/chargingpile/fragment/TalkRecommendFragment.java
Vedi File 

@ -19,7 +19,6 @@ import com.andview.refreshview.XRefreshView;
19 19 
import com.andview.refreshview.XRefreshView.SimpleXRefreshListener;
20 20 
import com.electric.chargingpile.R;
21 21 
import com.electric.chargingpile.activity.PersonalPageActivity;
22 
import com.electric.chargingpile.activity.PublishItemsActivity;
23 22 
import com.electric.chargingpile.activity.TopicDetailActivity;
24 23 
import com.electric.chargingpile.activity.VideoDetaislActivity;
25 24 
import com.electric.chargingpile.adapter.LayoutAdapter;
 
@ -47,7 +46,7 @@ import io.reactivex.functions.Consumer;
47 46 
import io.reactivex.functions.Predicate;
48 47 
import io.reactivex.schedulers.Schedulers;
49 48 
import okhttp3.Call;
50
49 
@Deprecated
51 50 
public class TalkRecommendFragment extends Fragment implements View.OnClickListener {
52 51 
    RecyclerView recyclerView;
53 52 
    LayoutAdapter layoutAdapter;
 
@ -249,7 +248,7 @@ public class TalkRecommendFragment extends Fragment implements View.OnClickListe
249 248 
    public void onClick(View v) {
250 249 
        switch (v.getId()) {
251 250 
            case R.id.iv_ask:
252 
                startActivity(new Intent(getActivity(), PublishItemsActivity.class));
251 
//                startActivity(new Intent(getActivity(), PublishItemsActivity.class));
253 252 
//                Toast.makeText(getActivity(), "分享", Toast.LENGTH_SHORT).show();
254 253 
                break;
255 254 
        }

+ 114 - 0
app/src/main/java/com/electric/chargingpile/util/IjkPlayerEngine.java
Vedi File 

@ -0,0 +1,114 @@
1 
package com.electric.chargingpile.util;
2
3 
import android.content.Context;
4 
import android.view.View;
5
6 
import com.electric.chargingpile.view.IjkPlayerView;
7
8 
import com.luck.picture.lib.config.SelectorConfig;
9 
import com.luck.picture.lib.config.SelectorProviders;
10 
import com.luck.picture.lib.engine.VideoPlayerEngine;
11 
import com.luck.picture.lib.entity.LocalMedia;
12 
import com.luck.picture.lib.interfaces.OnPlayerListener;
13
14 
import java.util.concurrent.CopyOnWriteArrayList;
15
16
17 
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
18
19 
public class IjkPlayerEngine implements VideoPlayerEngine<IjkPlayerView> {
20 
    /**
21 
     * 播放状态监听器集
22 
     */
23 
    private final CopyOnWriteArrayList<OnPlayerListener> listeners = new CopyOnWriteArrayList<>();
24
25
26 
    @Override
27 
    public View onCreateVideoPlayer(Context context) {
28 
        return new IjkPlayerView(context);
29 
    }
30
31 
    @Override
32 
    public void onStarPlayer(IjkPlayerView player, LocalMedia media) {
33 
        IjkMediaPlayer mediaPlayer = player.getMediaPlayer();
34 
        SelectorConfig config = SelectorProviders.getInstance().getSelectorConfig();
35 
        mediaPlayer.setLooping(config.isLoopAutoPlay);
36 
        player.start(media.getAvailablePath());
37 
    }
38
39 
    @Override
40 
    public void onResume(IjkPlayerView player) {
41 
        IjkMediaPlayer mediaPlayer = player.getMediaPlayer();
42 
        if (mediaPlayer != null) {
43 
            mediaPlayer.start();
44 
        }
45 
    }
46
47 
    @Override
48 
    public void onPause(IjkPlayerView player) {
49 
        IjkMediaPlayer mediaPlayer = player.getMediaPlayer();
50 
        if (mediaPlayer != null) {
51 
            mediaPlayer.pause();
52 
        }
53 
    }
54
55 
    @Override
56 
    public boolean isPlaying(IjkPlayerView player) {
57 
        IjkMediaPlayer mediaPlayer = player.getMediaPlayer();
58 
        return mediaPlayer != null && mediaPlayer.isPlaying();
59 
    }
60
61 
    @Override
62 
    public void addPlayListener(OnPlayerListener playerListener) {
63 
        if (!listeners.contains(playerListener)) {
64 
            listeners.add(playerListener);
65 
        }
66 
    }
67
68 
    @Override
69 
    public void removePlayListener(OnPlayerListener playerListener) {
70 
        if (playerListener != null) {
71 
            listeners.remove(playerListener);
72 
        } else {
73 
            listeners.clear();
74 
        }
75 
    }
76
77 
    @Override
78 
    public void onPlayerAttachedToWindow(IjkPlayerView player) {
79 
        IjkMediaPlayer mediaPlayer = player.initMediaPlayer();
80 
        mediaPlayer.setOnPreparedListener(it -> {
81 
            it.start();
82 
            for (int i = 0; i < listeners.size(); i++) {
83 
                OnPlayerListener playerListener = listeners.get(i);
84 
                playerListener.onPlayerReady();
85 
            }
86 
        });
87 
        mediaPlayer.setOnCompletionListener(it -> {
88 
            it.reset();
89 
            for (int i = 0; i < listeners.size(); i++) {
90 
                OnPlayerListener playerListener = listeners.get(i);
91 
                playerListener.onPlayerEnd();
92 
            }
93 
            player.clearCanvas();
94 
        });
95
96 
        mediaPlayer.setOnErrorListener((it, what, extra) -> {
97 
            for (int i = 0; i < listeners.size(); i++) {
98 
                OnPlayerListener playerListener = listeners.get(i);
99 
                playerListener.onPlayerError();
100 
            }
101 
            return false;
102 
        });
103 
    }
104
105 
    @Override
106 
    public void onPlayerDetachedFromWindow(IjkPlayerView player) {
107 
        player.release();
108 
    }
109
110 
    @Override
111 
    public void destroy(IjkPlayerView player) {
112 
        player.release();
113 
    }
114 
}

+ 111 - 0
app/src/main/java/com/electric/chargingpile/util/ImageCropEngine.java
Vedi File 

@ -0,0 +1,111 @@
1 
package com.electric.chargingpile.util;
2
3 
import static com.electric.chargingpile.util.PhotoUtils.CACHE_DIR;
4
5 
import android.content.Context;
6 
import android.graphics.Bitmap;
7 
import android.net.Uri;
8 
import android.widget.ImageView;
9
10 
import androidx.fragment.app.Fragment;
11
12 
import com.bumptech.glide.Glide;
13 
import com.luck.picture.lib.config.PictureMimeType;
14 
import com.luck.picture.lib.engine.CropEngine;
15 
import com.luck.picture.lib.entity.LocalMedia;
16 
import com.yalantis.ucrop.UCrop;
17 
import com.yalantis.ucrop.UCropImageEngine;
18 
import com.luck.picture.lib.utils.DateUtils;
19 
import java.io.File;
20 
import java.util.ArrayList;
21
22 
public class ImageCropEngine implements CropEngine {
23 
    //长宽比
24 
    private float x = 0F;
25 
    //长宽比
26 
    private float y = 0F;
27 
    //是否为圆
28 
    private boolean isCirCle = false;
29
30 
    public ImageCropEngine(float x, float y, boolean isCirCle) {
31 
        this.x = x;
32 
        this.y = y;
33 
        this.isCirCle = isCirCle;
34 
    }
35
36 
    @Override
37 
    public void onStartCrop(Fragment fragment, LocalMedia currentLocalMedia, ArrayList<LocalMedia> dataSource, int requestCode) {
38 
        String currentCropPath = currentLocalMedia.getAvailablePath();
39 
        Uri inputUri ;
40 
        if (PictureMimeType.isContent(currentCropPath) || PictureMimeType.isHasHttp(currentCropPath)) {
41 
            inputUri= Uri.parse(currentCropPath);
42 
        } else {
43 
            inputUri = Uri.fromFile(new File(currentCropPath));
44 
        }
45 
        String fileName = DateUtils.getCreateFileName("CROP_") + ".jpg";
46 
        Uri destinationUri = Uri.fromFile(new File(PhotoUtils.CACHE_DIR, fileName));
47 
        UCrop.Options options;
48 
         if (isCirCle){
49 
             options = buildCircleOptions();
50 
        }else{
51 
             options = buildRatioOptions();
52 
        }
53 
        ArrayList<String> dataCropSource =new ArrayList<String>();
54
55 
        for (LocalMedia media : dataSource) {
56 
            dataCropSource.add(media.getAvailablePath());
57 
        }
58
59 
        UCrop uCrop = UCrop.of(inputUri, destinationUri, dataCropSource);
60 
        uCrop.withOptions(options);
61 
        uCrop.setImageEngine(new UCropImageEngine(){
62
63 
            @Override
64 
            public void loadImage(Context context, String url, ImageView imageView) {
65 
                Glide.with(context).load(url).into(imageView);
66
67 
            }
68
69 
            @Override
70 
            public void loadImage(Context context, Uri url, int maxWidth, int maxHeight, OnCallbackListener<Bitmap> call) {
71
72 
            }
73 
        });
74 
        uCrop.start(fragment.requireActivity(), fragment, requestCode);
75 
    }
76
77 
    private UCrop.Options buildRatioOptions()  {
78 
        UCrop.Options options = new UCrop.Options();
79 
        // 长宽比
80 
        options.withAspectRatio(x, y);
81 
        //是否为圆
82 
        options.setCircleDimmedLayer(false);
83
84 
        // 是否让用户调整范围(默认false)，如果开启，可能会造成剪切的图片的长宽比不是设定的
85 
        // 如果不开启，用户不能拖动选框，只能缩放图片
86 
        options.setFreeStyleCropEnabled(true);
87
88 
        options.isCropDragSmoothToCenter(false);
89 
        options.setSkipCropMimeType(PictureMimeType.ofGIF(), PictureMimeType.ofWEBP());
90 
        options.isForbidCropGifWebp(false);
91 
        options.isForbidSkipMultipleCrop(true);
92 
        options.setMaxScaleMultiplier(100f);
93 
        return options;
94 
    }
95 
    private UCrop.Options buildCircleOptions() {
96 
        UCrop.Options options = new UCrop.Options();
97 
        // 长宽比
98 
        options.withAspectRatio(x, y);
99 
        //是否为圆
100 
        options.setCircleDimmedLayer(true);
101 
        // 是否让用户调整范围(默认false)，如果开启，可能会造成剪切的图片的长宽比不是设定的
102 
        // 如果不开启，用户不能拖动选框，只能缩放图片
103 
        options.setFreeStyleCropEnabled(true);
104 
        options.isCropDragSmoothToCenter(false);
105 
        options.setSkipCropMimeType(PictureMimeType.ofGIF(), PictureMimeType.ofWEBP());
106 
        options.isForbidCropGifWebp(false);
107 
        options.isForbidSkipMultipleCrop(true);
108 
        options.setMaxScaleMultiplier(100f);
109 
        return options;
110 
    }
111 
}

+ 56 - 0
app/src/main/java/com/electric/chargingpile/util/ImageFileCompressEngine.java
Vedi File 

@ -0,0 +1,56 @@
1 
package com.electric.chargingpile.util;
2
3 
import android.content.Context;
4 
import android.net.Uri;
5
6 
import com.luck.picture.lib.config.PictureMimeType;
7 
import com.luck.picture.lib.engine.CompressFileEngine;
8 
import com.luck.picture.lib.interfaces.OnKeyValueResultCallbackListener;
9 
import com.luck.picture.lib.utils.DateUtils;
10
11 
import java.io.File;
12 
import java.util.ArrayList;
13
14 
import top.zibin.luban.Luban;
15 
import top.zibin.luban.OnCompressListener;
16 
import top.zibin.luban.OnNewCompressListener;
17
18
19 
/**
20 
 * 自定义压缩
21 
 */
22 
public class ImageFileCompressEngine implements CompressFileEngine {
23
24 
    @Override
25 
    public void onStartCompress(Context context, ArrayList<Uri> source, OnKeyValueResultCallbackListener call) {
26 
        Luban.with(context).load(source).ignoreBy(0).setRenameListener(filePath -> {
27 
            int indexOf = filePath.lastIndexOf(".");
28 
            String postfix = indexOf != -1 ? filePath.substring(indexOf) : ".jpg";
29 
            return DateUtils.getCreateFileName("CMP_") + postfix;
30 
        }).filter(path -> {
31 
            if (PictureMimeType.isUrlHasImage(path) && !PictureMimeType.isHasHttp(path)) {
32 
                return true;
33 
            }
34 
            return !PictureMimeType.isUrlHasGif(path);
35 
        }).setCompressListener(new OnNewCompressListener() {
36 
            @Override
37 
            public void onStart() {
38
39 
            }
40
41 
            @Override
42 
            public void onSuccess(String source, File compressFile) {
43 
                if (call != null) {
44 
                    call.onCallback(source, compressFile.getAbsolutePath());
45 
                }
46 
            }
47
48 
            @Override
49 
            public void onError(String source, Throwable e) {
50 
                if (call != null) {
51 
                    call.onCallback(source, null);
52 
                }
53 
            }
54 
        }).launch();
55 
    }
56 
}

+ 35 - 0
app/src/main/java/com/electric/chargingpile/util/MeOnCameraInterceptListener.java
Vedi File 

@ -0,0 +1,35 @@
1 
package com.electric.chargingpile.util;
2
3 
import android.content.Context;
4 
import android.widget.ImageView;
5
6 
import androidx.fragment.app.Fragment;
7
8 
import com.bumptech.glide.Glide;
9 
import com.luck.lib.camerax.CameraImageEngine;
10 
import com.luck.lib.camerax.SimpleCameraX;
11 
import com.luck.picture.lib.interfaces.OnCameraInterceptListener;
12
13 
public class MeOnCameraInterceptListener implements OnCameraInterceptListener {
14 
    @Override
15 
    public void openCamera(Fragment fragment, int cameraMode, int requestCode) {
16 
        SimpleCameraX camera = SimpleCameraX.of();
17 
        camera.isAutoRotation(true);
18 
        camera.setCameraMode(cameraMode);
19 
        camera.setVideoFrameRate(25);
20 
        camera.setVideoBitRate(3 * 1024 * 1024);
21 
        camera.isDisplayRecordChangeTime(true);
22 
        camera.isManualFocusCameraPreview(true);
23 
        camera.isZoomCameraPreview(true);
24 
//        camera.setOutputPathDir(getSandboxCameraOutputPath())
25 
//        camera.setPermissionDeniedListener(getSimpleXPermissionDeniedListener())
26 
//        camera.setPermissionDescriptionListener(getSimpleXPermissionDescriptionListener())
27 
        camera.setImageEngine(new CameraImageEngine() {
28 
            @Override
29 
            public void loadImage(Context context, String url, ImageView imageView) {
30 
                Glide.with(context).load(url).into(imageView);
31 
            }
32 
        });
33 
        camera.start(fragment.requireActivity(),fragment, requestCode);
34 
    }
35 
}

+ 16 - 0
app/src/main/java/com/electric/chargingpile/util/MeSandboxFileEngine.java
Vedi File 

@ -0,0 +1,16 @@
1 
package com.electric.chargingpile.util;
2
3 
import android.content.Context;
4
5 
import com.luck.picture.lib.engine.UriToFileTransformEngine;
6 
import com.luck.picture.lib.interfaces.OnKeyValueResultCallbackListener;
7 
import com.luck.picture.lib.utils.SandboxTransformUtils;
8
9 
public class MeSandboxFileEngine implements UriToFileTransformEngine {
10 
    @Override
11 
    public void onUriToFileAsyncTransform(Context context, String srcPath, String mineType, OnKeyValueResultCallbackListener call) {
12 
        if (call != null) {
13 
            call.onCallback(srcPath, SandboxTransformUtils.copyPathToSandbox(context, srcPath, mineType));
14 
        }
15 
    }
16 
}

+ 116 - 0
app/src/main/java/com/electric/chargingpile/util/PictureUtlis.java
Vedi File 

@ -0,0 +1,116 @@
1 
package com.electric.chargingpile.util;
2
3 
import androidx.core.content.ContextCompat;
4
5 
import com.electric.chargingpile.R;
6 
import com.electric.chargingpile.application.MainApplication;
7 
import com.luck.picture.lib.style.BottomNavBarStyle;
8 
import com.luck.picture.lib.style.PictureSelectorStyle;
9 
import com.luck.picture.lib.style.SelectMainStyle;
10 
import com.luck.picture.lib.style.TitleBarStyle;
11
12 
public class PictureUtlis {
13
14 
    public static PictureSelectorStyle getStyle(){
15 
        TitleBarStyle blueTitleBarStyle = new TitleBarStyle();
16
17
18 
        //标题栏左边关闭样式
19 
        blueTitleBarStyle.setTitleLeftBackResource(R.drawable.ps_ic_black_back);
20 
        //预览标题栏左边关闭样式
21 
        blueTitleBarStyle.setPreviewTitleLeftBackResource(R.drawable.ps_ic_black_back);
22 
        //标题栏字体色值
23 
        blueTitleBarStyle.setTitleTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_black));
24 
        //标题栏右边文本字体色值
25 
        blueTitleBarStyle.setTitleCancelTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_black));
26 
        blueTitleBarStyle.setTitleBackgroundColor(ContextCompat.getColor(MainApplication.context, R.color.color_white));
27 
        //预览标题栏背景
28 
        blueTitleBarStyle.setPreviewTitleBackgroundColor(ContextCompat.getColor(MainApplication.context, R.color.color_white));
29 
        //标题栏高度
30 
        blueTitleBarStyle.setTitleBarHeight(DensityUtil.dip2px(MainApplication.context,48));
31 
        // 标题栏右边向上图标
32 
        blueTitleBarStyle.setTitleDrawableRightResource(R.drawable.ic_orange_arrow_up);
33 
        // 是否隐藏取消按钮
34 
        blueTitleBarStyle.setHideCancelButton(false);
35
36
37 
        BottomNavBarStyle numberBlueBottomNavBarStyle = new BottomNavBarStyle();
38 
        //预览颜色
39 
        numberBlueBottomNavBarStyle.setBottomPreviewNormalTextColor(ContextCompat.getColor(MainApplication.context, R.color.ps_color_9b));
40 
        //预览颜色选中
41 
        numberBlueBottomNavBarStyle.setBottomPreviewSelectTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_accent));
42
43 
        //底部导航栏背景色
44 
        numberBlueBottomNavBarStyle.setBottomNarBarBackgroundColor(ContextCompat.getColor(MainApplication.context, R.color.color_white));
45 
        //已选数量背景样式
46 
        numberBlueBottomNavBarStyle.setBottomSelectNumResources( R.drawable.pic_select);
47 
        //底部编辑文字色值
48 
        numberBlueBottomNavBarStyle.setBottomEditorTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_accent));
49
50 
        //底部原图文字色值
51 
        numberBlueBottomNavBarStyle.setBottomOriginalTextColor( ContextCompat.getColor(MainApplication.context, R.color.color_accent));
52
53
54
55 
        SelectMainStyle numberBlueSelectMainStyle =new  SelectMainStyle();
56 
        //状态栏背景色
57 
        numberBlueSelectMainStyle.setStatusBarColor(ContextCompat.getColor(MainApplication.context, R.color.color_white));
58
59 
        //导航栏背景色
60 
        numberBlueSelectMainStyle.setNavigationBarColor(ContextCompat.getColor(MainApplication.context, R.color.color_white));
61
62 
        //状态栏字体颜色，非黑即白
63 
        numberBlueSelectMainStyle.setDarkStatusBarBlack(true);
64 
        //完成按钮从底部放在右上角
65 
        numberBlueSelectMainStyle.setCompleteSelectRelativeTop(false);
66 
        //预览页选择按钮从顶部放在右下角
67 
        numberBlueSelectMainStyle.setPreviewSelectRelativeBottom(false);
68 
        //预览页是否显示选择画廊
69 
        numberBlueSelectMainStyle.setPreviewDisplaySelectGallery(true);
70 
        //预览页选择按钮MarginRight
71 
//        numberBlueSelectMainStyle.previewSelectMarginRight = true
72 
        //预览背景色
73 
        numberBlueSelectMainStyle.setPreviewBackgroundColor( ContextCompat.getColor(MainApplication.context, R.color.color_white));
74 
        //预览页选择按钮字体颜色
75 
        numberBlueSelectMainStyle.setPreviewSelectTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_black));
76 
        //预览页选择按钮文本
77 
        numberBlueSelectMainStyle.setPreviewSelectText("");
78 
        //预览页勾选样式是否使用数量类型
79 
        numberBlueSelectMainStyle.setPreviewSelectNumberStyle(true);
80 
        //预览页勾选样式
81 
        numberBlueSelectMainStyle.setPreviewSelectBackground(R.drawable.pic_select);
82
83 
        //画廊大小
84 
        numberBlueSelectMainStyle.setAdapterPreviewGalleryItemSize(DensityUtil.dip2px(MainApplication.context,60));
85 
        //勾选样式
86 
        numberBlueSelectMainStyle.setSelectBackground(R.drawable.app_preview_select);
87
88 
        //勾选样式是否使用数量类型
89 
        numberBlueSelectMainStyle.setSelectNumberStyle(true);
90
91 
        //列表背景色
92 
        numberBlueSelectMainStyle.setMainListBackgroundColor( ContextCompat.getColor(MainApplication.context, R.color.color_white));
93 
        //选择按钮默认文本字体色值
94 
//        numberBlueSelectMainStyle.selectNormalTextColor = true
95 
        //选择按钮默认背景
96 
//        numberBlueSelectMainStyle.selectNormalBackgroundResources = R.drawable.app_preview_select
97
98 
        // 列表背景色
99 
        numberBlueSelectMainStyle.setMainListBackgroundColor(ContextCompat.getColor(MainApplication.context, R.color.ps_color_white));
100
101 
        //选择按钮默认文本字体色值
102 
        numberBlueSelectMainStyle.setSelectNormalTextColor(ContextCompat.getColor(MainApplication.context, R.color.ps_color_9b));
103
104 
        //选择按钮文本字体色值
105 
        numberBlueSelectMainStyle.setSelectTextColor(ContextCompat.getColor(MainApplication.context, R.color.color_accent));
106
107 
        numberBlueSelectMainStyle.setSelectText(R.string.ps_completed);
108
109
110 
        PictureSelectorStyle selectorStyle = new PictureSelectorStyle();
111 
        selectorStyle.setTitleBarStyle(blueTitleBarStyle);
112 
        selectorStyle.setBottomBarStyle(numberBlueBottomNavBarStyle);
113 
        selectorStyle.setSelectMainStyle(numberBlueSelectMainStyle);
114 
        return selectorStyle;
115 
    }
116 
}

+ 30 - 75
app/src/main/java/com/electric/chargingpile/util/Util.java
Vedi File 

@ -21,7 +21,8 @@ import com.electric.chargingpile.data.RedEnvelopeBean;
21 21 
import com.electric.chargingpile.data.Zhan;
22 22 
import com.electric.chargingpile.data.Zhuang;
23 23 
import com.electric.chargingpile.manager.ProfileManager;
24 
import com.luck.picture.lib.style.PictureParameterStyle;
24
25 
import com.luck.picture.lib.entity.LocalMedia;
25 26 
import com.tencent.mm.opensdk.openapi.IWXAPI;
26 27 
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
27 28 


@ -492,80 +493,6 @@ public class Util {
492 493 
//    }
493 494 
//
494 495
495 
    public static PictureParameterStyle getWhiteStyle(Context context) {
496 
        // 相册主题
497 
        PictureParameterStyle style = new PictureParameterStyle();
498 
        // 是否改变状态栏字体颜色(黑白切换)
499 
        style.isChangeStatusBarFontColor = true;
500 
        // 是否开启右下角已完成(0/9)风格
501 
        style.isOpenCompletedNumStyle = false;
502 
        // 是否开启类似QQ相册带数字选择风格
503 
        style.isOpenCheckNumStyle = false;
504 
        // 相册状态栏背景色
505 
        style.pictureStatusBarColor = Color.parseColor("#FFFFFF");
506 
        // 相册列表标题栏背景色
507 
        style.pictureTitleBarBackgroundColor = Color.parseColor("#FFFFFF");
508 
        // 相册列表标题栏右侧上拉箭头
509 
        style.pictureTitleUpResId = R.drawable.ic_orange_arrow_up;
510 
        // 相册列表标题栏右侧下拉箭头
511 
        style.pictureTitleDownResId = R.drawable.ic_orange_arrow_down;
512 
        // 相册文件夹列表选中圆点
513 
        style.pictureFolderCheckedDotStyle = com.luck.picture.lib.R.drawable.picture_orange_oval;
514 
        // 相册返回箭头
515 
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
516 
        // 标题栏字体颜色
517 
        style.pictureTitleTextColor = ContextCompat.getColor(context, R.color.app_color_black);
518 
        // 相册右侧取消按钮字体颜色  废弃 改用.pictureRightDefaultTextColor和.pictureRightDefaultTextColor
519 
        style.pictureCancelTextColor = ContextCompat.getColor(context, R.color.app_color_black);
520 
        // 选择相册目录背景样式
521 
        style.pictureAlbumStyle = R.drawable.picture_new_item_select_bg;
522 
        // 相册列表勾选图片样式
523 
        style.pictureCheckedStyle = com.luck.picture.lib.R.drawable.picture_checkbox_selector;
524 
        // 相册列表底部背景色
525 
        style.pictureBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa);
526 
        // 已选数量圆点背景样式
527 
        style.pictureCheckNumBgStyle = com.luck.picture.lib.R.drawable.picture_num_oval;
528 
        // 相册列表底下预览文字色值(预览按钮可点击时的色值)
529 
        style.picturePreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
530 
        // 相册列表底下不可预览文字色值(预览按钮不可点击时的色值)
531 
        style.pictureUnPreviewTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
532 
        // 相册列表已完成色值(已完成 可点击色值)
533 
        style.pictureCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_fa632d);
534 
        // 相册列表未完成色值(请选择 不可点击色值)
535 
        style.pictureUnCompleteTextColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_9b);
536 
        // 预览界面底部背景色
537 
        style.picturePreviewBottomBgColor = ContextCompat.getColor(context, com.luck.picture.lib.R.color.picture_color_white);
538 
        // 原图按钮勾选样式  需设置.isOriginalImageControl(true); 才有效
539 
        style.pictureOriginalControlStyle = com.luck.picture.lib.R.drawable.picture_original_checkbox;
540 
        // 原图文字颜色 需设置.isOriginalImageControl(true); 才有效
541 
        style.pictureOriginalFontColor = ContextCompat.getColor(context, R.color.app_color_53575e);
542 
        // 外部预览界面删除按钮样式
543 
        style.pictureExternalPreviewDeleteStyle = com.luck.picture.lib.R.drawable.picture_icon_black_delete;
544 
        // 外部预览界面是否显示删除按钮
545 
        style.pictureExternalPreviewGonePreviewDelete = true;
546 
//        // 自定义相册右侧文本内容设置
547 
//        mPictureParameterStyle.pictureRightDefaultText = "";
548 
//        // 自定义相册未完成文本内容
549 
//        mPictureParameterStyle.pictureUnCompleteText = "";
550 
//        // 自定义相册完成文本内容
551 
//        mPictureParameterStyle.pictureCompleteText = "";
552 
//        // 自定义相册列表不可预览文字
553 
//        mPictureParameterStyle.pictureUnPreviewText = "";
554 
//        // 自定义相册列表预览文字
555 
//        mPictureParameterStyle.picturePreviewText = "";
556
557 
//        // 自定义相册标题字体大小
558 
//        mPictureParameterStyle.pictureTitleTextSize = 18;
559 
//        // 自定义相册右侧文字大小
560 
//        mPictureParameterStyle.pictureRightTextSize = 14;
561 
//        // 自定义相册预览文字大小
562 
//        mPictureParameterStyle.picturePreviewTextSize = 14;
563 
//        // 自定义相册完成文字大小
564 
//        mPictureParameterStyle.pictureCompleteTextSize = 14;
565 
//        // 自定义原图文字大小
566 
//        mPictureParameterStyle.pictureOriginalTextSize = 14;
567 
        return style;
568 
    }
569 496
570 497 
    /**
571 498 
     * 判断手机是否安装微信

@ -660,4 +587,32 @@ public class Util {
660 587 
        }
661 588 
        return builder.toString();
662 589 
    }
590
591 
    public static String getCompressAbsolutePath(LocalMedia localMedia){
592 
        String path = "";
593 
         if (localMedia.isCompressed()){
594 
            String compressPath = localMedia.getCompressPath();
595 
            if (compressPath == null || compressPath .equals("") ){
596 
                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
597 
                    path = localMedia.getSandboxPath();
598 
                } else {
599 
                    path = localMedia.getRealPath();
600 
                }
601 
            }else{
602 
                path = compressPath;
603 
            }
604 
        }else{
605 
            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
606 
                path = localMedia.getSandboxPath();
607 
            } else {
608 
                path =  localMedia.getRealPath();
609 
            }
610 
        }
611 
        if (path == null || path.equals("")){
612 
            path = localMedia.getAvailablePath();
613 
        }
614 
        return path;
615
616 
    }
617
663 618 
}

+ 220 - 0
app/src/main/java/com/electric/chargingpile/view/IjkPlayerView.java
Vedi File 

@ -0,0 +1,220 @@
1 
package com.electric.chargingpile.view;
2
3 
import android.content.Context;
4 
import android.graphics.SurfaceTexture;
5 
import android.net.Uri;
6 
import android.util.AttributeSet;
7 
import android.view.Gravity;
8 
import android.view.Surface;
9 
import android.view.TextureView;
10 
import android.widget.FrameLayout;
11
12 
import androidx.annotation.NonNull;
13
14 
import com.luck.picture.lib.config.PictureMimeType;
15
16 
import java.io.IOException;
17
18 
import tv.danmaku.ijk.media.player.IMediaPlayer;
19 
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
20
21 
public class IjkPlayerView extends FrameLayout implements TextureView.SurfaceTextureListener {
22 
    private IjkVideoTextureView textureView;
23 
    private IjkMediaPlayer mediaPlayer;
24 
    private int mVideoRotation;
25
26 
    public IjkPlayerView(@NonNull Context context) {
27 
        super(context);
28 
        init();
29 
    }
30
31 
    public IjkPlayerView(@NonNull Context context, AttributeSet attrs) {
32 
        super(context, attrs);
33 
        init();
34 
    }
35
36 
    public IjkPlayerView(@NonNull Context context, AttributeSet attrs, int defStyleAttr) {
37 
        super(context, attrs, defStyleAttr);
38 
        init();
39 
    }
40
41 
    public static int[] scaleSize(int textureWidth, int textureHeight, int realWidth, int realHeight) {
42 
        float deviceRate = (float) textureWidth / (float) textureHeight;
43 
        float rate = (float) realWidth / (float) realHeight;
44 
        int width;
45 
        int height;
46 
        if (rate < deviceRate) {
47 
            height = textureHeight;
48 
            width = (int) (textureHeight * rate);
49 
        } else {
50 
            width = textureWidth;
51 
            height = (int) (textureWidth / rate);
52 
        }
53 
        return new int[]{width, height};
54 
    }
55
56 
    private void init() {
57 
        textureView = new IjkVideoTextureView(getContext());
58 
        textureView.setSurfaceTextureListener(this);
59 
        LayoutParams layoutParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
60 
        layoutParams.gravity = Gravity.CENTER;
61 
        textureView.setLayoutParams(layoutParams);
62 
        addView(textureView);
63 
    }
64
65 
    public IjkMediaPlayer initMediaPlayer() {
66 
        if (mediaPlayer == null) {
67 
            mediaPlayer = new IjkMediaPlayer();
68 
        }
69 
        mediaPlayer.setOnVideoSizeChangedListener(new IMediaPlayer.OnVideoSizeChangedListener() {
70 
            @Override
71 
            public void onVideoSizeChanged(IMediaPlayer mediaPlayer, int width, int height, int sar_num, int sar_den) {
72 
                textureView.adjustVideoSize(width, height, mVideoRotation);
73 
            }
74 
        });
75 
        mediaPlayer.setOnInfoListener(new IMediaPlayer.OnInfoListener() {
76 
            @Override
77 
            public boolean onInfo(IMediaPlayer mp, int what, int extra) {
78 
                if (what == 10001) {
79 
                    mVideoRotation = extra;
80 
                }
81 
                return false;
82 
            }
83 
        });
84 
        mediaPlayer.setOption(IjkMediaPlayer.OPT_CATEGORY_PLAYER, "mediacodec", 1);
85 
        return mediaPlayer;
86 
    }
87
88 
    public IjkMediaPlayer getMediaPlayer() {
89 
        return mediaPlayer;
90 
    }
91
92 
    public void start(String path) {
93 
        try {
94 
            if (PictureMimeType.isContent(path)) {
95 
                mediaPlayer.setDataSource(getContext(), Uri.parse(path));
96 
            } else {
97 
                mediaPlayer.setDataSource(path);
98 
            }
99 
            SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
100 
            if (surfaceTexture != null) {
101 
                mediaPlayer.setSurface(new Surface(surfaceTexture));
102 
            }
103 
            mediaPlayer.prepareAsync();
104 
        } catch (IOException e) {
105 
            e.printStackTrace();
106 
        }
107 
    }
108
109 
    @Override
110 
    public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width, int height) {
111 
        mediaPlayer.setSurface(new Surface(surface));
112 
    }
113
114 
    @Override
115 
    public void onSurfaceTextureSizeChanged(@NonNull SurfaceTexture surface, int width, int height) {
116 
    }
117
118 
    @Override
119 
    public boolean onSurfaceTextureDestroyed(@NonNull SurfaceTexture surface) {
120 
        return false;
121 
    }
122
123 
    @Override
124 
    public void onSurfaceTextureUpdated(@NonNull SurfaceTexture surface) {
125
126 
    }
127
128 
    public void release() {
129 
        if (mediaPlayer != null) {
130 
            mediaPlayer.release();
131 
            mediaPlayer.setOnPreparedListener(null);
132 
            mediaPlayer.setOnCompletionListener(null);
133 
            mediaPlayer.setOnErrorListener(null);
134 
            mediaPlayer.setOnInfoListener(null);
135 
            mediaPlayer = null;
136 
        }
137 
    }
138
139 
    public void clearCanvas() {
140 
    }
141
142 
    public static class IjkVideoTextureView extends TextureView {
143 
        /**
144 
         * 视频宽度
145 
         */
146 
        private int mVideoWidth;
147 
        /**
148 
         * 视频高度
149 
         */
150 
        private int mVideoHeight;
151
152 
        /**
153 
         * 视频旋转角度
154 
         */
155 
        private int mVideoRotation;
156
157 
        public IjkVideoTextureView(@NonNull Context context) {
158 
            super(context);
159 
        }
160
161 
        public void adjustVideoSize(int videoWidth, int videoHeight, int videoRotation) {
162 
            this.mVideoWidth = videoWidth;
163 
            this.mVideoHeight = videoHeight;
164 
            this.mVideoRotation = videoRotation;
165 
            this.setRotation(mVideoRotation);
166 
            this.requestLayout();
167 
        }
168
169 
        @Override
170 
        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
171 
            int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
172 
            int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
173 
            int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
174 
            int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
175 
            int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
176 
            int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
177 
            if (mVideoWidth > 0 && mVideoHeight > 0) {
178 
                if (widthSpecMode == MeasureSpec.EXACTLY && heightSpecMode == MeasureSpec.EXACTLY) {
179 
                    width = widthSpecSize;
180 
                    height = heightSpecSize;
181
182 
                    if (mVideoWidth * height < width * mVideoHeight) {
183 
                        width = height * mVideoWidth / mVideoHeight;
184 
                    } else if (mVideoWidth * height > width * mVideoHeight) {
185 
                        height = width * mVideoHeight / mVideoWidth;
186 
                    }
187 
                } else if (widthSpecMode == MeasureSpec.EXACTLY) {
188 
                    width = widthSpecSize;
189 
                    height = width * mVideoHeight / mVideoWidth;
190 
                    if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
191 
                        height = heightSpecSize;
192 
                    }
193 
                } else if (heightSpecMode == MeasureSpec.EXACTLY) {
194 
                    height = heightSpecSize;
195 
                    width = height * mVideoWidth / mVideoHeight;
196 
                    if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
197 
                        width = widthSpecSize;
198 
                    }
199 
                } else {
200 
                    width = mVideoWidth;
201 
                    height = mVideoHeight;
202 
                    if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
203 
                        height = heightSpecSize;
204 
                        width = height * mVideoWidth / mVideoHeight;
205 
                    }
206 
                    if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
207 
                        width = widthSpecSize;
208 
                        height = width * mVideoHeight / mVideoWidth;
209 
                    }
210 
                }
211 
            }
212 
            setMeasuredDimension(width, height);
213 
            if ((mVideoRotation + 180) % 180 != 0) {
214 
                int[] size = scaleSize(widthSpecSize, heightSpecSize, height, width);
215 
                setScaleX(size[0] / ((float) height));
216 
                setScaleY(size[1] / ((float) width));
217 
            }
218 
        }
219 
    }
220 
}

BIN
app/src/main/res/drawable-xxhdpi/app_back_black.png
Vedi File


+ 11 - 0
app/src/main/res/drawable/app_preview_select.xml
Vedi File 

@ -0,0 +1,11 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:shape="oval"
4 
    android:useLevel="false">
5
6 
    <solid android:color="@color/color_transparent" />
7 
    <size
8 
        android:width="18dp"
9 
        android:height="18dp" />
10 
    <stroke android:width="1dp" android:color="@color/color_accent"/>
11 
</shape>

BIN
app/src/main/res/drawable/img.png
Vedi File


BIN
app/src/main/res/drawable/img_1.png
Vedi File


+ 11 - 0
app/src/main/res/drawable/pic_select.xml
Vedi File 

@ -0,0 +1,11 @@
1 
<?xml version="1.0" encoding="utf-8"?>
2 
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3 
    android:shape="oval"
4 
    android:useLevel="false">
5
6 
    <solid android:color="@color/color_accent" />
7 
    <size
8 
        android:width="18dp"
9 
        android:height="18dp" />
10 
    <stroke android:width="1dp" android:color="@color/color_accent"/>
11 
</shape>

+ 2 - 1
app/src/main/res/values/color.xml
Vedi File 

@ -18,7 +18,8 @@
18 18 
    <color name="bkg_button_green">#39c663</color>
19 19 
    <color name="ui_green">#39C663</color>
20 20 
    <color name="title_background">#FCFCFC</color>
21
21 
    <color name="color_accent">#ff6600</color>
22 
    <color name="color_transparent">#00FFFFFF</color>
22 23 
    <!-- PictureSelector -->
23 24 
    <color name="app_color_grey">#393a3e</color>
24 25 
    <color name="app_color_black">#000000</color>

+ 0 - 52
app/src/main/res/values/styles.xml
Vedi File 

@ -303,58 +303,6 @@
303 303
304 304 
    <style name="BaseNoActionBarTheme" parent="Theme.AppCompat.Light.NoActionBar" />
305 305 
    <!--白色主题样式，，注意每一项都不能少-->
306 
    <style name="picture.white.style" parent="BaseNoActionBarTheme">
307 
        <!-- Customize your theme here. -->
308 
        <!--标题栏背景色-->
309 
        <item name="colorPrimary">@color/app_color_white</item>
310 
        <!--状态栏背景色-->
311 
        <item name="colorPrimaryDark">@color/app_color_white</item>
312 
        <!--是否改变图片列表界面状态栏字体颜色为黑色-->
313 
        <item name="picture.statusFontColor">true</item>
314 
        <!--返回键图标-->
315 
        <item name="picture.leftBack.icon">@drawable/ic_back_arrow</item>
316 
        <!--标题下拉箭头-->
317 
        <item name="picture.arrow_down.icon">@drawable/ic_orange_arrow_down</item>
318 
        <!--标题上拉箭头-->
319 
        <item name="picture.arrow_up.icon">@drawable/ic_orange_arrow_up</item>
320 
        <!--标题文字颜色-->
321 
        <item name="picture.title.textColor">@color/app_color_black</item>
322 
        <!--标题栏右边文字-->
323 
        <item name="picture.right.textColor">@color/app_color_black</item>
324 
        <!--图片列表勾选样式-->
325 
        <item name="picture.checked.style">@drawable/picture_checkbox_selector</item>
326 
        <!--开启图片列表勾选数字模式,开启的话勾选样式要换-->
327 
        <item name="picture.style.checkNumMode">false</item>
328 
        <!--选择图片样式0/9-->
329 
        <item name="picture.style.numComplete">true</item>
330 
        <!--图片列表底部背景色-->
331 
        <item name="picture.bottom.bg">@color/app_color_fa</item>
332 
        <!--图片列表预览文字颜色-->
333 
        <item name="picture.preview.textColor">@color/picture_list_sina_text_color</item>
334 
        <!--图片列表已完成文字颜色-->
335 
        <item name="picture.complete.textColor">@color/picture_list_sina_text_color</item>
336 
        <!--图片已选数量圆点背景色-->
337 
        <item name="picture.num.style">@drawable/picture_num_oval</item>
338 
        <!--预览界面标题栏背景色-->
339 
        <item name="picture.ac_preview.title.bg">@color/app_color_white</item>
340 
        <!--预览界面标题文字颜色-->
341 
        <item name="picture.ac_preview.title.textColor">@color/app_color_black</item>
342 
        <!--预览界面已完成文字颜色-->
343 
        <item name="picture.ac_preview.complete.textColor">@color/picture_list_sina_text_color
344 
        </item>
345 
        <!--预览界面底部背景色-->
346 
        <item name="picture.ac_preview.bottom.bg">@color/picture_color_fa</item>
347 
        <!--预览界面返回箭头-->
348 
        <item name="picture.preview.leftBack.icon">@drawable/ic_back_arrow</item>
349 
        <!--裁剪页面标题背景色-->
350 
        <item name="picture.crop.toolbar.bg">@color/app_color_white</item>
351 
        <!--裁剪页面状态栏颜色-->
352 
        <item name="picture.crop.status.color">@color/app_color_white</item>
353 
        <!--裁剪页面标题文字颜色-->
354 
        <item name="picture.crop.title.color">@color/app_color_black</item>
355 
        <!--相册文件夹列表选中图标-->
356 
        <item name="picture.folder_checked_dot">@drawable/picture_orange_oval</item>
357 
    </style>
358 306
359 307 
    <declare-styleable name="TextImageView">
360 308 
        <attr name="drawableLeftWidth" format="dimension" />

+ 2 - 2
config.gradle
Vedi File 

@ -1,9 +1,9 @@
1 1 
ext{
2 2 
    android = [
3 
            compileSdkVersion: 31,
3 
            compileSdkVersion: 33,
4 4 
            applicationId    : "com.electric.chargingpile",
5 5 
            minSdkVersion    : 24,
6 
            targetSdkVersion : 31,
6 
            targetSdkVersion : 33,
7 7 
    ]
8 8
9 9 
    manifestPlaceholders= [

优化我的页面的UI · ba28557434 - Gogs: Go Git Service
Startseite Erkunden Hilfe
Registrieren Anmelden
dudu
/
cdzApp
Beobachten 2
Favorit hinzufügen 1
Fork 0
Code Issues 0 Pull-Requests 0 Commits 445 Releases 18 Wiki
Quellcode durchsuchen

优化我的页面的UI

hy vor 4 Jahren
Ursprung
ab3b7cad20
Commit
ba28557434
3 geänderte Dateien mit 27 neuen und 23 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. BIN
      app/src/main/res/drawable-xhdpi/icon_qiandaohavegift.png
  2. BIN
      app/src/main/res/drawable-xhdpi/icon_signined.png
  3. 27 23
      app/src/main/res/layout/activity_user_center.xml

BIN
app/src/main/res/drawable-xhdpi/icon_qiandaohavegift.png
Datei anzeigen


BIN
app/src/main/res/drawable-xhdpi/icon_signined.png
Datei anzeigen


+ 27 - 23
app/src/main/res/layout/activity_user_center.xml
Datei anzeigen 

@ -29,7 +29,7 @@
29 29 
        android:fitsSystemWindows="true"
30 30 
        android:clipToPadding="true"
31 31 
        android:layout_width="match_parent"
32 
        android:layout_height="237dp"
32 
        android:layout_height="250dp"
33 33 
        android:layout_centerHorizontal="true"
34 34 
        android:background="@drawable/bg_center">
35 35 
        <TextView
 
@ -59,13 +59,14 @@
59 59 
                android:id="@+id/user"
60 60 
                android:layout_width="67dp"
61 61 
                android:layout_height="67dp"
62 
                android:layout_centerVertical="true"
63 62 
                android:scaleType="fitXY"
64 63 
                android:layout_gravity="center"
65 64 
                app:type="circle"
66 65 
                android:background="@drawable/icon_user1118" />
67 66
68 67 
            <TextView
68 
                android:layout_alignTop="@+id/user"
69 
                android:layout_alignBottom="@id/user"
69 70 
                android:id="@+id/show_username"
70 71 
                android:layout_width="wrap_content"
71 72 
                android:layout_height="wrap_content"
 
@ -80,12 +81,11 @@
80 81
81 82
82 83 
            <ImageView
84 
                android:layout_marginTop="20dp"
83 85 
                android:id="@+id/iv_qiandao"
84 86 
                android:layout_width="wrap_content"
85 87 
                android:layout_height="wrap_content"
86 
                android:layout_alignBottom="@+id/user"
87 
                android:layout_toRightOf="@+id/user"
88 
                android:layout_marginLeft="36px"
88 
                android:layout_below="@+id/user"
89 89 
                android:layout_marginBottom="4px"
90 90 
                android:src="@drawable/icon_user_member"/>
91 91 
@ -93,7 +93,8 @@
93 93 
                android:id="@+id/iv_paihang"
94 94 
                android:layout_width="wrap_content"
95 95 
                android:layout_height="wrap_content"
96 
                android:layout_alignBottom="@+id/user"
96 
                android:layout_alignTop="@+id/iv_qiandao"
97 
                android:layout_alignBottom="@+id/iv_qiandao"
97 98 
                android:layout_toRightOf="@+id/iv_qiandao"
98 99 
                android:layout_marginLeft="28px"
99 100 
                android:layout_marginBottom="4px"
 
@ -148,6 +149,7 @@
148 149 
            android:visibility="gone" />
149 150
150 151 
        <ImageView
152 
            android:layout_alignTop="@+id/ll_noLogin"
151 153 
            android:id="@+id/iv_gift"
152 154 
            android:layout_width="wrap_content"
153 155 
            android:layout_height="wrap_content"
 
@ -158,7 +160,7 @@
158 160
159 161
160 162 
        <com.zhy.autolayout.AutoRelativeLayout
161 
            android:layout_marginTop="22px"
163 
            android:layout_marginTop="22dp"
162 164 
            android:id="@+id/ll_noLogin"
163 165 
            android:layout_below="@+id/tv_mine"
164 166 
            android:layout_width="wrap_content"
 
@ -172,11 +174,12 @@
172 174 
                android:id="@+id/user_default"
173 175 
                android:layout_width="67dp"
174 176 
                android:layout_height="67dp"
175 
                android:layout_centerVertical="true"
176 
                android:scaleType="fitXY"
177 
                android:layout_alignParentTop="true"
178 
                android:layout_alignParentStart="true"
177 179 
                android:layout_gravity="center"
178 
                app:type="circle"
179 
                android:background="@drawable/icon_user1118" />
180 
                android:background="@drawable/icon_user1118"
181 
                android:scaleType="fitXY"
182 
                app:type="circle" />
180 183
181 184 
            <com.zhy.autolayout.AutoLinearLayout
182 185 
                android:id="@+id/ll_userLogin"
 
@ -184,6 +187,8 @@
184 187 
                android:layout_height="wrap_content"
185 188 
                android:orientation="horizontal"
186 189 
                android:paddingTop="32px"
190 
                android:layout_alignTop="@+id/user_default"
191 
                android:layout_alignBottom="@id/user_default"
187 192 
                android:textColor="@color/white"
188 193 
                android:layout_toRightOf="@+id/user_default"
189 194 
                android:layout_marginLeft="36px"
 
@ -191,27 +196,28 @@
191 196 
                android:visibility="visible">
192 197
193 198 
                <TextView
199 
                    android:gravity="center"
194 200 
                    android:id="@+id/userLogin"
195 201 
                    android:layout_width="wrap_content"
196 
                    android:layout_height="wrap_content"
202 
                    android:layout_height="match_parent"
197 203 
                    android:text="登录"
198 204 
                    android:textAppearance="?android:attr/textAppearanceSmall"
199 205 
                    android:textColor="@color/white"
200 206 
                    android:textSize="16sp" />
201 207
202 
                <View
208 
                <TextView
209 
                    android:gravity="center"
203 210 
                    android:layout_width="1dp"
204 
                    android:layout_height="match_parent"
205 
                    android:layout_marginBottom="3dp"
211 
                    android:layout_height="wrap_content"
206 212 
                    android:layout_marginLeft="16dp"
207 213 
                    android:layout_marginRight="16dp"
208 
                    android:layout_marginTop="3dp"
209 214 
                    android:background="@color/white" />
210 215
211 216 
                <TextView
217 
                    android:gravity="center"
212 218 
                    android:id="@+id/userRegister"
213 219 
                    android:layout_width="wrap_content"
214 
                    android:layout_height="wrap_content"
220 
                    android:layout_height="match_parent"
215 221 
                    android:text="注册"
216 222 
                    android:textAppearance="?android:attr/textAppearanceSmall"
217 223 
                    android:textColor="@color/white"
 
@ -223,17 +229,15 @@
223 229 
                android:id="@+id/iv_qiandao_default"
224 230 
                android:layout_width="wrap_content"
225 231 
                android:layout_height="wrap_content"
226 
                android:layout_alignBottom="@+id/user_default"
227 
                android:layout_toRightOf="@+id/user_default"
228 
                android:layout_marginLeft="36px"
229 
                android:layout_marginBottom="4px"
232 
                android:layout_below="@+id/user_default"
233 
                android:layout_marginTop="20dp"
230 234 
                android:src="@drawable/icon_user_member"/>
231 235
232 236 
            <ImageView
233 237 
                android:id="@+id/iv_paihang_default"
234 238 
                android:layout_width="wrap_content"
235 239 
                android:layout_height="wrap_content"
236 
                android:layout_alignBottom="@+id/user_default"
240 
                android:layout_alignTop="@+id/iv_qiandao_default"
237 241 
                android:layout_toRightOf="@+id/iv_qiandao_default"
238 242 
                android:layout_marginLeft="28px"
239 243 
                android:layout_marginBottom="4px"
 
@ -249,7 +253,7 @@
249 253
250 254
251 255 
        <LinearLayout
252 
            android:layout_marginTop="-30dp"
256 
            android:layout_marginTop="-20dp"
253 257 
            android:layout_width="match_parent"
254 258 
            android:layout_height="wrap_content"
255 259 
            android:orientation="vertical"