Merge branch 'master' of https://git.starwin.tech/sikang/lib_base

python/func.py

@@ -178,7 +178,8 @@ class Function:
         if command == 1:
             shutil.copy(img_path+"logo_main.png", img_path+"logo.png")
             # 主包混淆文件
-            os.remove("%s/script/api_mapping" % config['root'])
+            if os.path.exists("%s/script/api_mapping" % config['root']):
+                os.remove("%s/script/api_mapping" % config['root'])
             shutil.copy("%s/script/api_mapping_main" %
                         config['root'], "%s/script/api_mapping" % config['root'])
 
@@ -195,7 +196,8 @@ class Function:
         elif command == 2:
             shutil.copy(img_path+"logo_majia.png", img_path+"logo.png")
             # 马甲混淆文件替换
-            os.remove("%s/script/api_mapping" % config['root'])
+            if os.path.exists("%s/script/api_mapping" % config['root']):
+                os.remove("%s/script/api_mapping" % config['root'])
             shutil.copy("%s/script/api_mapping_majia" %
                         config['root'], "%s/script/api_mapping" % config['root'])
 

src/main/java/com/common/Collector.java → src/main/java/com/common/utils/Collector.java

-package com.common;
+package com.common.utils;
 
 import android.Manifest;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.text.TextUtils;
 import android.util.Log;
-import android.util.Pair;
 
 import com.annimon.stream.Stream;
 import com.annimon.stream.function.BiFunction;
@@ -21,12 +19,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
-import io.reactivex.Observable;
-import io.reactivex.ObservableSource;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Predicate;
 import tech.starwin.database.DataBaseHelper;
 import tech.starwin.database.entity.CallLogEntity;
 
@@ -34,7 +27,6 @@ import com.common.bean.CollectInfoEntity;
 
 import tech.starwin.database.entity.ContactEntity;
 import tech.starwin.database.entity.SmsEntity;
-import tech.starwin.utils.collection.UploadManager;
 
 public class Collector {
     enum InfoType {

src/main/java/tech/starwin/mvp/presenter/UploadPresenter.java

@@ -7,7 +7,7 @@ import android.text.TextUtils;
 import android.util.Base64;
 
 import com.annimon.stream.Stream;
-import com.common.Collector;
+import com.common.utils.Collector;
 import com.common.bean.BasicAck;
 import com.common.bean.CollectInfoEntity;
 import com.common.bean.OcrResultBean;

src/main/java/tech/starwin/utils/collection/UploadManager.java

@@ -30,7 +30,7 @@ import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 import tech.starwin.LibConfig;
 
-import com.common.Collector;
+import com.common.utils.Collector;
 
 import tech.starwin.database.DataBaseHelper;