com.typhoon.unitysdk 1.0.3 → 1.0.5

package/Editor/PublishVivoBatSetting.cs

@@ -7,7 +7,9 @@ namespace TyphoonUnitySDK
     public class PublishVivoBatSetting : ScriptableObject
     {
         [Header("安卓发布工具项目路径")] public string AndroidPublishProj;
-        [Header("基本参数")] public string GameName;
+        [Header("基本参数")] public bool DebugMode = true;
+        public bool OrientationPortrait = true;
+        public string GameName;
         public Texture Icon;
         public string PackageName;
         public string AppId;
@@ -27,7 +29,7 @@ namespace TyphoonUnitySDK
         public string BannerID;
 
         [Header("版本号")] public string Version = "1.0.0.0";
-
+        public int VersionCode = 1000000;
         private static string PATH = "Assets/Editor/PublishVivoBatSetting.asset";
 
         public static PublishVivoBatSetting _default = null;

package/Editor/PublishVivoBatSettingInspector.cs

@@ -17,9 +17,10 @@ namespace TyphoonUnitySDK
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 30
     buildToolsVersion '30.0.3'
 
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -47,15 +48,17 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 30
+        versionCode $VERSION_CODE
+        versionName '$VERSION_NAME'
         applicationId '$APPLICATION_ID'
+        consumerProguardFiles ""consumer-rules.pro""
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'
         }
-        versionCode $VERSION_CODE
-        versionName '$VERSION_NAME'
     }
 
+
     //发布的包名
     applicationVariants.all { variant ->
         variant.outputs.all {
@@ -68,6 +71,7 @@ android {
     }
 
 
+
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
@@ -87,15 +91,15 @@ android {
         debug {
             minifyEnabled false
             useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro',getDefaultProguardFile('proguard-android-optimize.txt')
             signingConfig signingConfigs.debug
             jniDebuggable true
         }
         release {
             minifyEnabled false
             useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-           signingConfig signingConfigs.release
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro',getDefaultProguardFile('proguard-android-optimize.txt')
+            signingConfig signingConfigs.release
 
         }
     }
@@ -104,6 +108,9 @@ android {
         doNotStrip '*/armeabi-v7a/*.so'
         doNotStrip '*/arm64-v8a/*.so'
     }
+    packagingOptions { doNotStrip ""*/armeabi/libvsecbox.so"" }
+    packagingOptions { doNotStrip ""*/armeabi-v7a/libvsecbox.so"" }
+    packagingOptions { doNotStrip ""*/arm64-v8a/libvsecbox.so"" }
 
     bundle {
         language {
@@ -117,15 +124,18 @@ android {
         }
     }
 
-
 }
 
 dependencies {
-    implementation fileTree(includes: ['*.jar', '*.aar'], dir: 'libs')
-    implementation project(':unity_app')
-    implementation project(':vivo_union')
-    implementation project(':test_demo')
-    implementation project(':sdk_plug')
+    api ""com.android.support:support-v4:28.0.0""
+    api ""com.android.support:recyclerview-v7:28.0.0""
+    api ""com.android.support:appcompat-v7:28.0.0""
+    api fileTree(includes: ['*.jar', '*.aar'], dir: 'libs')
+    api project(':sdk_plug')
+    api project(':unity_app')
+
+
+
 }";
 
         public PublishVivoBatSetting Target => target as PublishVivoBatSetting;
@@ -140,9 +150,14 @@ dependencies {
             // }
 
             var publish = GUILayout.Button("发布vivo", GUILayout.Height(32));
+
             if (publish)
             {
-                Publish(Target);
+                var sure = EditorUtility.DisplayDialog("提示", "发布？", "是");
+                if (sure)
+                {
+                    Publish(Target);
+                }
             }
         }
 
@@ -198,7 +213,9 @@ dependencies {
             Debug.Log("修改游戏名");
             var publishProj = setting.AndroidPublishProj;
             {
-                var strings_xml = $"{publishProj}/publish_unity_vivo_union/src/main/res/values/strings.xml";
+                //
+
+                var strings_xml = $@"{publishProj}\vivo_union\src\main\res\values\strings.xml";
                 var input =
                     $"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n  <string name=\"app_name\">{setting.GameName}</string>\n  <string name=\"game_view_content_description\">Game view</string>\n</resources>";
                 File.WriteAllText(strings_xml, input);
@@ -208,41 +225,24 @@ dependencies {
                 Debug.Log("更换icon");
                 var iconPath = AssetDatabase.GetAssetPath(setting.Icon);
                 File.Copy(iconPath,
-                    $"{publishProj}\\publish_unity_vivo_union\\src\\main\\res\\mipmap-mdpi\\app_icon.png", true);
+                    $@"{publishProj}\vivo_union\src\main\res\mipmap-mdpi\app_icon.png", true);
             }
 
 
             {
                 Debug.Log("更换包名等信息");
-                var build_gardle = $"{publishProj}/publish_unity_vivo_union/build.gradle";
+                var build_gardle = $"{publishProj}/vivo_union/build.gradle";
                 var code = build_garde_template;
-                var str = setting.Version.Split('.');
-                var sb = new StringBuilder();
-                var index = 0;
-                foreach (var s in str)
-                {
-                    if (index != 0)
-                    {
-                        sb.Append(s.PadLeft(2, '0'));
-                    }
-                    else
-                    {
-                        sb.Append(s);
-                    }
-
-                    index += 1;
-                }
-
-
+                
                 code = code.Replace("$APPLICATION_ID", setting.PackageName);
-                code = code.Replace("$VERSION_CODE", sb.ToString());
+                code = code.Replace("$VERSION_CODE", setting.VersionCode.ToString());
                 code = code.Replace("$VERSION_NAME", setting.Version);
                 File.WriteAllText(build_gardle, code);
             }
 
             {
                 Debug.Log("更换AppId");
-               var supplierconfig = $"{publishProj}/vivo_union/src/main/assets/supplierconfig.json";
+                var supplierconfig = $"{publishProj}/vivo_union/src/main/assets/supplierconfig.json";
                 var input =
                     $"{{\n  \"supplier\":{{\n    \"vivo\":{{\n      \"appid\":\"{setting.AppId}\"\n    }},\n    \"xiaomi\":{{\n\n    }},\n    \"huawei\":{{\n\n    }},\n    \"oppo\":{{\n\n    }}\n  }}\n\n}}\n";
                 File.WriteAllText(supplierconfig, input);
@@ -252,7 +252,37 @@ dependencies {
                 Debug.Log("更换代码参数");
                 var config = $@"{publishProj}\vivo_union\src\main\java\com\typhoon\vivo_union\Config.java";
                 var input =
-                    $"package com.typhoon.vivo_union;\n\n/*打包配置*/\npublic  class Config {{\n    /*Debug 模式开关*/\n    public static  boolean DEBUG_MODE=false;\n    /*隐藏政策URL*/\n    public static  String PRIVACY_POLICY_URL=\"{setting.PrivacyPolicyYNoteUrl}\";\n    /*VIVO-联运 参数*/\n    public static String APP_ID = \"{setting.AppId}\";//appid(看后台）\n    /*VIVO-广告联盟 参数*/\n    public static String MEDIA_ID = \"{setting.MediaID}\";//Media ID\n    public static String INTER_UNIT_ID = \"{setting.IntersID}\"; //插页广告\n    public static String VIDEO_UNIT_ID = \"{setting.VideoID}\"; //视频广告\n    public static String SPLASH_UNIT_ID = \"{setting.SplashID}\";//开屏广告\n    public static String FLOAT_ICON_UNIT_ID = \"{setting.FloatIconID}\"; //悬浮icon\n    public static String NATIVE_UNIT_ID = \"{setting.NativeID}\";//原生广告\n    public static String BANNER_UNIT_ID = \"{setting.BannerID}\";//banner广告\n\n}}\n";
+                    $@"package com.typhoon.vivo_union;
+
+/*打包配置*/
+public class Config {{
+    /*Debug 模式开关*/
+    public static boolean DEBUG_MODE = {setting.DebugMode};
+
+    /*竖屏模式为true,横屏模式为false*/
+    public static boolean ORIENTATION_PORTRAIT = {setting.PrivacyPolicyYNoteUrl};
+
+    /*隐藏政策URL*/
+    public static String PRIVACY_POLICY_URL = ""{setting.PrivacyPolicyYNoteUrl}"";
+    /*VIVO-联运 参数*/
+    public static String APP_ID = ""{setting.AppId}"";//appid(看后台）
+    /*VIVO-广告联盟 参数*/
+    public static String MEDIA_ID = ""{setting.MediaID}"";//Media ID
+    public static String VIDEO_UNIT_ID = ""{setting.VideoID}""; //视频广告
+    public static String SPLASH_UNIT_ID = ""{setting.SplashID}"";//开屏广告
+    public static String INTER_IMAGE_UNIT_ID = ""{setting.IntersID}""; //图片类插页广告
+    public static String INTER_VIDEO_UNIT_ID = """"; //视频类插页广告
+    public static String FLOAT_ICON_UNIT_ID = ""{setting.FloatIconID}""; //悬浮icon
+    public static String NATIVE_UNIT_ID = ""{setting.NativeID}"";//原生广告
+    public static String BANNER_UNIT_ID = ""{setting.BannerID}"";//banner广告
+    public static String WX_APP_ID = """";//后台申请的媒体微信APPID
+    public static int SPLASH_FETCH_TIMEOUT = 3000;//开屏广告拉取最大超时时间，单位毫秒
+    public static int SPLASH_FLOOR_PRICE=-1;//开屏广告底价，-1为不设定
+    public static int INTERS_IMAGE_FLOOR_PRICE=-1;//图片类插屏广告底价，-1为不设定
+    public static int INTERS_VIDEO_FLOOR_PRICE=-1;//视频类插屏广告底价，-1为不设定
+
+}}
+";
                 File.WriteAllText(config, input);
             }
             {
@@ -261,7 +291,7 @@ dependencies {
                 var manifest = $"{unityProj}/unityLibrary/src/main/AndroidManifest.xml";
                 var xml = File.ReadAllText(manifest);
                 // string pattern = @"(?s)<intent-filter\b[^>]*>(.*?)<\/intent-filter>";
-                // string result = Regex.Replace(xml, pattern, "");
+                // string result = Regex.Replace(xml, pattern, "");f
                 xml = xml.Replace("<intent-filter>", "");
                 xml = xml.Replace("<action android:name=\"android.intent.action.MAIN\" />", "");
                 xml = xml.Replace("<category android:name=\"android.intent.category.LAUNCHER\" />", "");

package/package.json

@@ -1 +1 @@
-{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.3","description":"unity端个汇总渠道的sdk,统一接口,一键发布","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}
+{"name":"com.typhoon.unitysdk","displayName":"typhoon unity sdk","version":"1.0.5","description":"unity端个汇总渠道的sdk,统一接口,一键发布","unity":"2018.1","type":"tool","hideInEditor":false,"author":{"name":"Jan Zhang","email":"","url":""},"changelogUrl":"","documentationUrl":"","keywords":["typhoon"],"license":"","licensesUrl":"","customDependencies":[{"PackageName":"com.unity.nuget.newtonsoft-json","Value":"2.0.0"}],"dependencies":{"com.unity.nuget.newtonsoft-json":"2.0.0"}}