配置调整

app/build.gradle

@@ -271,7 +271,7 @@ android.applicationVariants.all {
             output ->
                 if(buildType.name == "release") {
                     if (productFlavors[0].name == "sheep") {
-                        output.outputFile = new File(output.outputFile.parent, productFlavors[0].name + "_" + buildType.name + "_v" + android.defaultConfig.versionName + "_" + android.defaultConfig.versionCode + "-${releaseTime()}.apk")
+//                        output.outputFile = new File(output.outputFile.parent, productFlavors[0].name + "_" + buildType.name + "_v" + android.defaultConfig.versionName + "_" + android.defaultConfig.versionCode + "-${releaseTime()}.apk")
                     } else {
                         output.outputFile = new File(output.outputFile.parent, productFlavors[0].name + "_" + buildType.name +".apk")
                     }

app/src/main/java/com/kfzs/duanduan/react/ReactUtil.java

@@ -15,7 +15,7 @@ import java.util.Map;
 
 public class ReactUtil {
     /**
-     * 是否进入rn调试模式
+     * 是否进入调试模式
      */
     public static final boolean isSmallDebug() {
         File sdDir = null;
@@ -26,86 +26,6 @@ public class ReactUtil {
         }
         return sdDir != null && new File(sdDir, "smallSheep.debug").exists();
     }
-    /**
-     * 是否进入rn调试模式
-     */
-    public static final boolean isRnDebug() {
-        File sdDir = null;
-        boolean sdCardExist = Environment.getExternalStorageState()
-                .equals(android.os.Environment.MEDIA_MOUNTED); //判断sd卡是否存在
-        if (sdCardExist) {
-            sdDir = Environment.getExternalStorageDirectory();//获取跟目录
-        }
-        return sdDir != null && new File(sdDir, "duanduanReactNative.debug").exists();
-    }
-
-    /**
-     * 是否加载rn
-     */
-    public static final boolean isLoadRn() {
-        File sdDir = null;
-        boolean sdCardExist = Environment.getExternalStorageState()
-                .equals(android.os.Environment.MEDIA_MOUNTED); //判断sd卡是否存在
-        if (sdCardExist) {
-            sdDir = Environment.getExternalStorageDirectory();//获取跟目录
-        }
-        return sdDir != null && new File(sdDir, "duanduanReactNative.load").exists();
-    }
-
-    /**
-     * 是否加载rn_BorrowPlay
-     */
-    public static final boolean isLoadRn_BorrowPlay() {
-        File sdDir = null;
-        boolean sdCardExist = Environment.getExternalStorageState()
-                .equals(android.os.Environment.MEDIA_MOUNTED); //判断sd卡是否存在
-        if (sdCardExist) {
-            sdDir = Environment.getExternalStorageDirectory();//获取跟目录
-        }
-        return sdDir != null && new File(sdDir, "duanduanReactNative.load_bp").exists();
-    }
-
-    /**
-     * 是否包含用户名密码文件
-     */
-    public static final boolean isHasUserFile() {
-        File sdDir = null;
-        boolean sdCardExist = Environment.getExternalStorageState()
-                .equals(android.os.Environment.MEDIA_MOUNTED); //判断sd卡是否存在
-        if (sdCardExist) {
-            sdDir = Environment.getExternalStorageDirectory();//获取跟目录
-        }
-        return sdDir != null && new File(sdDir, "duanduan.zh").exists();
-    }
-
-    public static Map<String, String> MAP_PWD;
-
-    public static List<String> initArr() {
-        File sdDir = null;
-        boolean sdCardExist = Environment.getExternalStorageState()
-                .equals(android.os.Environment.MEDIA_MOUNTED); //判断sd卡是否存在
-        if (sdCardExist) {
-            sdDir = Environment.getExternalStorageDirectory();//获取跟目录
-        }
-        if (sdDir != null && new File(sdDir, "duanduan.zh").exists()) {
-            List<String> list = FileUtil.readLines(new File(sdDir, "duanduan.zh").getAbsolutePath());
-            if (list != null && !list.isEmpty()) {
-                List<String> arr = new ArrayList<>();
-                MAP_PWD = new HashMap<>(list.size());
-                int i = 0;
-                for (String line : list) {
-                    if (line.contains("\t")) {
-                        String[] items = line.split("\t");
-                        arr.add(items[0]);
-                        MAP_PWD.put(items[0], items[1]);
-                    }
-                    i++;
-                }
-                return arr;
-            }
-        }
-        return new ArrayList<>();
-    }
 
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -8,6 +8,7 @@ import android.util.DisplayMetrics;
 
 import com.appsee.Appsee;
 import com.kfzs.duanduan.ActMain;
+import com.kfzs.duanduan.react.ReactUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.sheep.gamegroup.di.components.DaggerNetComponent;
 import com.sheep.gamegroup.di.components.NetComponent;
@@ -97,7 +98,7 @@ public class SheepApp extends BaseApplication {
 //            Beta.autoCheckUpgrade = false;
             Bugly.init(getApplicationContext(), Config.BUGLY_APPID, TestUtil.isTest());
             //开发设备
-            Bugly.setIsDevelopmentDevice(getApplicationContext(), TestUtil.isTest());
+            Bugly.setIsDevelopmentDevice(getApplicationContext(), ReactUtil.isSmallDebug());
         }
     }
 

app/tinker-support.gradle

@@ -5,7 +5,7 @@ def bakPath = file("${buildDir}/bakApk/")
 /**
  * 此处填写每次构建生成的基准包目录
  */
-def baseApkDir = "app-0706-14-28-51"
+def baseApkDir = "app-0716-11-25-52"
 
 /**
  * 对于插件各参数的详细解析请参考
@@ -25,17 +25,17 @@ tinkerSupport {
     // 编译补丁包时，必需指定基线版本的apk，默认值为空
     // 如果为空，则表示不是进行补丁包的编译
     // @{link tinkerPatch.oldApk }
-    baseApk = "${bakPath}/${baseApkDir}/app-sheep-release.apk"
+    baseApk = "${bakPath}/${baseApkDir}/sheep/app-sheep-release.apk"
 
     // 对应tinker插件applyMapping
-    baseApkProguardMapping = "${bakPath}/${baseApkDir}/app-sheep-release-mapping.txt"
+    baseApkProguardMapping = "${bakPath}/${baseApkDir}/sheep/app-sheep-release-mapping.txt"
 
     // 对应tinker插件applyResourceMapping
-    baseApkResourceMapping = "${bakPath}/${baseApkDir}/app-sheep-release-R.txt"
+    baseApkResourceMapping = "${bakPath}/${baseApkDir}/sheep/app-sheep-release-R.txt"
 
     // 构建基准包和补丁包都要指定不同的tinkerId，并且必须保证唯一性(2007000-patch;)
-    tinkerId = "2008000-base"
-//    tinkerId = "2007000-patch"
+//    tinkerId = "2008000-1-base"
+    tinkerId = "2008000-1-patch"
 
     // 构建多渠道补丁时使用
     // buildAllFlavorsDir = "${bakPath}/${baseApkDir}"