huyuguo 4 年 前
コミット
ebd55df6f1

+ 45 - 0
.idea/jarRepositories.xml

@ -0,0 +1,45 @@
1
<?xml version="1.0" encoding="UTF-8"?>
2
<project version="4">
3
  <component name="RemoteRepositoriesConfiguration">
4
    <remote-repository>
5
      <option name="id" value="central" />
6
      <option name="name" value="Maven Central repository" />
7
      <option name="url" value="https://repo1.maven.org/maven2" />
8
    </remote-repository>
9
    <remote-repository>
10
      <option name="id" value="jboss.community" />
11
      <option name="name" value="JBoss Community repository" />
12
      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
13
    </remote-repository>
14
    <remote-repository>
15
      <option name="id" value="BintrayJCenter" />
16
      <option name="name" value="BintrayJCenter" />
17
      <option name="url" value="https://jcenter.bintray.com/" />
18
    </remote-repository>
19
    <remote-repository>
20
      <option name="id" value="maven" />
21
      <option name="name" value="maven" />
22
      <option name="url" value="https://jitpack.io" />
23
    </remote-repository>
24
    <remote-repository>
25
      <option name="id" value="Google" />
26
      <option name="name" value="Google" />
27
      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
28
    </remote-repository>
29
    <remote-repository>
30
      <option name="id" value="maven2" />
31
      <option name="name" value="maven2" />
32
      <option name="url" value="https://maven.google.com" />
33
    </remote-repository>
34
    <remote-repository>
35
      <option name="id" value="MavenRepo" />
36
      <option name="name" value="MavenRepo" />
37
      <option name="url" value="https://repo.maven.apache.org/maven2/" />
38
    </remote-repository>
39
    <remote-repository>
40
      <option name="id" value="MobSDK" />
41
      <option name="name" value="MobSDK" />
42
      <option name="url" value="http://mvn.mob.com/android" />
43
    </remote-repository>
44
  </component>
45
</project>

BIN
app/.DS_Store


+ 1 - 1
app/build.gradle

@ -200,7 +200,7 @@ dependencies {
200 200
    //    compile 'com.github.bumptech.glide:glide:4.1.1'
201 201
    implementation 'com.github.bumptech.glide:glide:4.11.0'
202 202
    // 停更过期库,用zhihu/Matisse
203
    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
203
//    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
204 204
    // 为了兼容Android10 使用beta版本
205 205
    implementation 'com.zhihu.android:matisse:0.5.3-beta3'
206 206
    implementation 'top.zibin:Luban:1.1.2'

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/AlterOneActivity.java

@ -87,7 +87,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
87 87
import io.reactivex.functions.Consumer;
88 88
import io.reactivex.functions.Function;
89 89
import io.reactivex.schedulers.Schedulers;
90
import me.iwf.photopicker.PhotoPicker;
91 90
import pub.devrel.easypermissions.AfterPermissionGranted;
92 91
import pub.devrel.easypermissions.EasyPermissions;
93 92


+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/ChargingCommentActivity.java

@ -108,7 +108,6 @@ import io.reactivex.Observer;
108 108
import io.reactivex.android.schedulers.AndroidSchedulers;
109 109
import io.reactivex.disposables.Disposable;
110 110
import io.reactivex.schedulers.Schedulers;
111
import me.iwf.photopicker.PhotoPicker;
112 111
import okhttp3.Call;
113 112
import pub.devrel.easypermissions.AfterPermissionGranted;
114 113
import pub.devrel.easypermissions.EasyPermissions;

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/EditAnswerActivity.java

@ -64,7 +64,6 @@ import io.reactivex.Observer;
64 64
import io.reactivex.android.schedulers.AndroidSchedulers;
65 65
import io.reactivex.disposables.Disposable;
66 66
import io.reactivex.schedulers.Schedulers;
67
import me.iwf.photopicker.PhotoPicker;
68 67
import okhttp3.Call;
69 68
import pub.devrel.easypermissions.AfterPermissionGranted;
70 69
import pub.devrel.easypermissions.EasyPermissions;

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/EditQuestionTwoActivity.java

@ -61,7 +61,6 @@ import io.reactivex.Observer;
61 61
import io.reactivex.android.schedulers.AndroidSchedulers;
62 62
import io.reactivex.disposables.Disposable;
63 63
import io.reactivex.schedulers.Schedulers;
64
import me.iwf.photopicker.PhotoPicker;
65 64
import okhttp3.Call;
66 65
import pub.devrel.easypermissions.AfterPermissionGranted;
67 66
import pub.devrel.easypermissions.EasyPermissions;

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/FeedbackActivity.java

@ -80,7 +80,6 @@ import io.reactivex.Observer;
80 80
import io.reactivex.android.schedulers.AndroidSchedulers;
81 81
import io.reactivex.disposables.Disposable;
82 82
import io.reactivex.schedulers.Schedulers;
83
import me.iwf.photopicker.PhotoPicker;
84 83
import okhttp3.Call;
85 84
import pub.devrel.easypermissions.AfterPermissionGranted;
86 85
import pub.devrel.easypermissions.EasyPermissions;

+ 0 - 40
app/src/main/java/com/electric/chargingpile/activity/FindActivity.java

@ -83,7 +83,6 @@ import cn.sharesdk.framework.ShareSDK;
83 83
import cn.sharesdk.tencent.qq.QQ;
84 84
import cn.sharesdk.wechat.friends.Wechat;
85 85
import cn.sharesdk.wechat.moments.WechatMoments;
86
import me.iwf.photopicker.PhotoPicker;
87 86
import okhttp3.Call;
88 87
import pub.devrel.easypermissions.AfterPermissionGranted;
89 88
import pub.devrel.easypermissions.AppSettingsDialog;
@ -767,45 +766,6 @@ public class FindActivity extends AppCompatActivity implements View.OnClickListe
767 766
            if (data != null) {
768 767
                if (requestCode == 1) {
769 768
                    //处理调用系统图库
770
                } else if (requestCode == PhotoPicker.REQUEST_CODE) {
771
                    //异步方式插入图片
772
//                    insertImagesSync(data);
773
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
774
                    for (int i = 0; i < photos.size(); i++) {
775
776
//                        Log.e(TAG, "onActivityResult: "+photos.get(i).toString() );
777
                        File file = new File(photos.get(i).toString());
778
                        Log.e(TAG, "onActivityResult: " + i + "=" + file.length() / 1024 + "kb");
779
                        final int finalI = i;
780
                        Luban.with(this)
781
                                .load(file)                     //传人要压缩的图片
782
                                .setCompressListener(new OnCompressListener() { //设置回调
783
                                    @Override
784
                                    public void onStart() {
785
                                        // TODO 压缩开始前调用,可以在方法内启动 loading UI
786
                                    }
787
788
                                    @Override
789
                                    public void onSuccess(File file) {
790
                                        // TODO 压缩成功后调用,返回压缩后的图片文件
791
                                        Log.e(TAG, "onSuccess: " + finalI + "=" + file.length() / 1024 + "kb");
792
                                        Log.e(TAG, "onSuccess: " + file.getPath());
793
                                        Bitmap bmp = BitmapFactory.decodeFile(file.getPath());
794
                                        String storePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "cdz_android";
795
//                                        ImageTools.savePhotoToSDCard(bmp,storePath,"user_icon");
796
                                        ImageTools.saveImageToGallery(getApplicationContext(), bmp, "user_icon");
797
798
                                        Log.e(TAG, "onSuccess: " + ImageTools.findPhotoFromSDCard(storePath, "user_icon") + "");
799
800
                                    }
801
802
                                    @Override
803
                                    public void onError(Throwable e) {
804
                                        // TODO 当压缩过程出现问题时调用
805
                                    }
806
                                }).launch();
807
                    }
808
809 769
                }
810 770
            }
811 771
        }

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/PrivateZhuangInfoActivity.java

@ -99,7 +99,6 @@ import io.reactivex.Observer;
99 99
import io.reactivex.android.schedulers.AndroidSchedulers;
100 100
import io.reactivex.disposables.Disposable;
101 101
import io.reactivex.schedulers.Schedulers;
102
import me.iwf.photopicker.PhotoPicker;
103 102
import pub.devrel.easypermissions.AfterPermissionGranted;
104 103
import pub.devrel.easypermissions.EasyPermissions;
105 104

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@ -97,7 +97,6 @@ import io.reactivex.Observer;
97 97
import io.reactivex.android.schedulers.AndroidSchedulers;
98 98
import io.reactivex.disposables.Disposable;
99 99
import io.reactivex.schedulers.Schedulers;
100
import me.iwf.photopicker.PhotoPicker;
101 100
import okhttp3.Call;
102 101
import pub.devrel.easypermissions.AfterPermissionGranted;
103 102
import pub.devrel.easypermissions.EasyPermissions;

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/ShareTwoActivity.java

@ -95,7 +95,6 @@ import io.reactivex.Observer;
95 95
import io.reactivex.android.schedulers.AndroidSchedulers;
96 96
import io.reactivex.disposables.Disposable;
97 97
import io.reactivex.schedulers.Schedulers;
98
import me.iwf.photopicker.PhotoPicker;
99 98
import pub.devrel.easypermissions.AfterPermissionGranted;
100 99
import pub.devrel.easypermissions.EasyPermissions;
101 100

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/ShareTwoEditActivity.java

@ -100,7 +100,6 @@ import io.reactivex.Observer;
100 100
import io.reactivex.android.schedulers.AndroidSchedulers;
101 101
import io.reactivex.disposables.Disposable;
102 102
import io.reactivex.schedulers.Schedulers;
103
import me.iwf.photopicker.PhotoPicker;
104 103
import okhttp3.Call;
105 104
import pub.devrel.easypermissions.AfterPermissionGranted;
106 105
import pub.devrel.easypermissions.EasyPermissions;

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

@ -83,7 +83,6 @@ import java.util.HashMap;
83 83
import java.util.List;
84 84
import java.util.Map;
85 85
86
import me.iwf.photopicker.PhotoPicker;
87 86
import pub.devrel.easypermissions.AfterPermissionGranted;
88 87
import pub.devrel.easypermissions.EasyPermissions;
89 88
@ -851,44 +850,6 @@ public class UserInfoActivity extends Activity implements View.OnClickListener,
851 850
                car_brand = select_pinpai;
852 851
                car_type = select_chexing;
853 852
                break;
854
            case PhotoPicker.REQUEST_CODE:
855
                if (data != null) {
856
                    data.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
857
                    ArrayList<String> photos = data.getStringArrayListExtra(PhotoPicker.KEY_SELECTED_PHOTOS);
858
859
//                    for (String imagePath : photos) {
860
//
861
//                    }
862
//                    }
863
864
865
//                    startPhotoZoom(data.getData());
866
                    //可以同时插入多张图片
867
                    for (String imagePath : photos) {
868
                        File file = new File(imagePath);
869
                        com.blankj.utilcode.util.LogUtils.e(file.length());
870
                        Uri fileUri = FileProvider.getUriForFile(getApplicationContext(),
871
                                getApplicationContext().getPackageName() + ".provider", file);
872
//设置权限
873
874
                        com.blankj.utilcode.util.LogUtils.e(fileUri);
875
                        startPhotoZoom(fileUri);
876
877
//                        Log.e(TAG, "call: imagePath "+imagePath );
878
//                        photo = BitmapFactory.decodeFile(imagePath);//压缩图片
879
//                        if (ImageUtils.readPictureDegree(imagePath) != 0 ){
880
//                            photo = imageZoom(ImageUtils.toturn(photo));
881
//                        }else {
882
//                            photo = imageZoom(photo);
883
//                        }
884
//                        if (photo != null) {
885
//                            iconPic.setImageBitmap(photo);
886
//                        }
887
                    }
888
                } else {
889
                    ToastUtil.showToast(getApplicationContext(), "data为null", Toast.LENGTH_SHORT);
890
                }
891
                break;
892 853
            case 1:
893 854
                if (SDCardUtil.hasSdcard()) {
894 855
                    cropImageUri = Uri.fromFile(fileCropUri);

+ 0 - 1
app/src/main/java/com/electric/chargingpile/activity/ZhanCommentActivity.java

@ -96,7 +96,6 @@ import io.reactivex.Observer;
96 96
import io.reactivex.android.schedulers.AndroidSchedulers;
97 97
import io.reactivex.disposables.Disposable;
98 98
import io.reactivex.schedulers.Schedulers;
99
import me.iwf.photopicker.PhotoPicker;
100 99
import okhttp3.Call;
101 100
import pub.devrel.easypermissions.AfterPermissionGranted;
102 101
import pub.devrel.easypermissions.EasyPermissions;

+ 1 - 1
app/src/main/res/layout/activity_talk.xml

@ -35,7 +35,7 @@
35 35
                <View
36 36
                    android:layout_width="0.5dp"
37 37
                    android:layout_height="15dp"
38
                    android:background="@color/__picker_black_40"/>
38
                    android:background="@color/black"/>
39 39
40 40
                <TextView
41 41
                    android:id="@+id/textview_hd"

+ 1 - 1
library/build.gradle

@ -1,6 +1,6 @@
1 1
apply plugin: 'com.android.library'
2 2
android {
3
    compileSdkVersion 26
3
    compileSdkVersion 29
4 4
    buildToolsVersion '29.0.0'
5 5
6 6
    defaultConfig {