Sfoglia il codice sorgente

可以传入小绵羊的截图来选择的功能

zengjiebin 7 anni fa
parent
commit
b6f190944f

+ 5 - 4
app/build.gradle

@@ -118,7 +118,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:design:27.1.0'
+    compile "com.android.support:design:$supportLibVersion"
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     compile 'com.google.code.gson:gson:2.8.2'
@@ -221,15 +221,16 @@ dependencies {
 
     //    compile 'com.kf.framework:volleyplus:latest.integration@aar'
     compile 'com.kf.framework:volleyplus:1.4.5@aar'
-    compile 'com.android.support:support-annotations:27.1.0'
-    compile 'com.android.support:recyclerview-v7:27.1.0'
+    compile "com.android.support:support-annotations:$supportLibVersion"
+    compile "com.android.support:recyclerview-v7:$supportLibVersion"
     compile project(':datashare')
     compile files('libs/jackson-core-2.2.1.jar')
     compile files('libs/jackson-dataformat-xml-2.1.2.jar')
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.github.ithedan:TextViewDrawable:v1.0'
 //    compile 'com.github.zhangkexpz:LayoutScroll:v1.0'
-    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
+//    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
+    compile(name: 'PhotoPicker-release', ext: 'aar')
     compile 'com.github.bumptech.glide:glide:4.1.1'
 
     //    compile 'com.github.yalantis:ucrop:2.2.1-native'

BIN
app/libs/PhotoPicker-release.aar


+ 6 - 1
app/src/main/java/com/sheep/gamegroup/absBase/AbsChooseImageActivity.java

@@ -50,11 +50,16 @@ public abstract class AbsChooseImageActivity extends BaseActivity implements UpF
         this.urls.clear();
         PhotoPicker.builder()
                 .setPhotoCount(photoCount)
-                .setShowCamera(true)
+                .setShowCamera(showCamera)
                 .setShowGif(false)
                 .setPreviewEnabled(true)
                 .start(this, PhotoPicker.REQUEST_CODE);
     }
+    private boolean showCamera = false;
+
+    public void setShowCamera(boolean showCamera) {
+        this.showCamera = showCamera;
+    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {

+ 2 - 1
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -517,7 +517,8 @@ public class CommonUtil {
      * 添加应用自动审核任务
      */
     public void setTAskEnty(TaskEty tAskEnty){
-        if(AutoTaskListUtil.getInstance().addTask(tAskEnty)){//添加任务时
+        if(tAskEnty != null){
+            AutoTaskListUtil.getInstance().addTask(tAskEnty);//添加任务时
             AutoTaskListUtil.getInstance().resetReceiveTaskTime();//重置比对时间  5.1及以上使用
             AppUsageManager.getInstance().tryOpenLookAppUsageStatsPermisson(true);//尝试打开权限对话框 5.1及以上使用
         } else {//每次取消任务都重置记录

+ 21 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -111,6 +111,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import me.iwf.photopicker.PhotoPicker;
 import me.iwf.photopicker.PhotoPreview;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -971,6 +972,26 @@ public class Jump2View {
             }
         }, files));
     }
+    /**
+     * 提供多张图片给用户选择
+     * @param activity
+     * @param photoCount
+     * @param files
+     */
+    public void selectImgFiles(Activity activity, int photoCount, File...files) {
+        PhotoPicker.builder()
+                .setPhotoCount(photoCount)
+                .setShowCamera(false)
+                .setShowGif(false)
+                .setPreviewEnabled(true)
+                .setPicker(ListUtil.asList(new ListUtil.CallBack<File, String>() {
+                    @Override
+                    public String call(File file) {
+                        return file.getAbsolutePath();
+                    }
+                }, files))
+                .start(activity, PhotoPicker.REQUEST_CODE);
+    }
 
 
 

+ 1 - 2
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -46,7 +46,6 @@ import java.io.File;
 import java.util.List;
 import java.util.Locale;
 
-import me.iwf.photopicker.PhotoPicker;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
@@ -303,7 +302,7 @@ public class TestUtil {
                                     G.showToast("截图目录不存在");
                                 }
                                 if(dir.list().length > 0)
-                                    Jump2View.getInstance().showImgFiles(activity, 0, dir.listFiles());
+                                    Jump2View.getInstance().selectImgFiles(activity, 7, dir.listFiles());
                                 break;
                             case "小米游戏":
                                 Jump2View.getInstance().goXiaomiGameList(activity, null);

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -70,6 +70,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     @Override
     public void initView() {
         activity = this;
+        setShowCamera(false);
         ButterKnife.bind(this);
         TitleBarUtils
                 .getInstance()

+ 3 - 9
build.gradle

@@ -1,6 +1,9 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext {
+        supportLibVersion = "27.1.0"
+    }
     repositories {
         jcenter()
         google()
@@ -45,15 +48,6 @@ task clean(type: Delete) {
 
 
 ext{
-    //aria使用本地library时添加的
-    userOrg = 'arialyy'
-    groupId = 'com.arialyy.aria'
-    publishVersion = '3.4.1'
-//  publishVersion = '1.0.3'  //FTP插件
-    repoName='maven'
-    desc = 'android 下载框架'
-    website = 'https://github.com/AriaLyy/Aria'
-    licences = ['Apache-2.0']
 
     android = [
             compileSdkVersion:27,

+ 1 - 1
datashare/build.gradle

@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:27.1.0'
+    compile "com.android.support:support-v4:$supportLibVersion"
     compile 'org.greenrobot:greendao:3.2.2'
 }
 

+ 2 - 2
view/build.gradle

@@ -28,8 +28,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:27.1.0'
-    compile 'com.android.support:support-v4:27.1.0'
+    compile "com.android.support:appcompat-v7:$supportLibVersion"
+    compile "com.android.support:support-v4:$supportLibVersion"
 //    compile 'com.github.bumptech.glide:glide:3.7.0'
 //    compile ('jp.wasabeef:glide-transformations:2.0.2'){
 //        exclude group: 'com.github.bumptech.glide', module: 'glide'