[重构]

1. 修改宏定义顺序
GameFrameX · Jul 21, 2023 · efd7119 · efd7119
1 parent 85d9efa
commit efd7119
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE → LICENSE.md b/LICENSE → LICENSE.md
diff --git a/LICENSE.md.meta b/LICENSE.md.meta
diff --git a/Plugins.meta b/Plugins.meta
diff --git a/README.md.meta b/README.md.meta
diff --git a/BlankGetChannel.meta → Runtime.meta b/BlankGetChannel.meta → Runtime.meta
diff --git a/Runtime/BlankGetChannel.Runtime.asmdef b/Runtime/BlankGetChannel.Runtime.asmdef
@@ -0,0 +1,13 @@
+{
+    "name": "BlankGetChannel.Runtime",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Runtime/BlankGetChannel.Runtime.asmdef.meta b/Runtime/BlankGetChannel.Runtime.asmdef.meta
diff --git a/BlankGetChannel.cs → Runtime/BlankGetChannel.cs b/BlankGetChannel.cs → Runtime/BlankGetChannel.cs
@@ -1,16 +1,14 @@
 #if UNITY_IOS
 using System.Runtime.InteropServices;
 #endif
-using System;
 using System.IO;
-using LuaInterface;
 using UnityEngine;
 
 /// <summary>
 /// 获取渠道名称
 /// Android:
 ///         需要在主启动的Activity 中添加
-/// <meta-data android:name="appchannel" android:value="android_cn_yyyl" />
+/// <meta-data android:name="channel" android:value="android_cn_taptap" />
 ///
 /// iOS :
 ///         需要在Info.plist中添加
@@ -20,31 +18,36 @@
 /// </summary>
 public sealed class BlankGetChannel
 {
-
 #if UNITY_IOS
-
 	[DllImport("__Internal")]
 	private static extern string getChannelName(string channelKey);
 
 #endif
     /// <summary>
     /// 获取渠道值
     /// </summary>
-    public static string GetChannelName(string channelKey)
+    public static string GetChannelName(string channelKey = "channel")
     {
         string channelName = "unknown";
 #if UNITY_STANDALONE || UNITY_EDITOR
-        string channel = File.ReadAllText(Application.streamingAssetsPath + "/channel.txt");
-        if (!string.IsNullOrEmpty(channel))
+        string path = Application.streamingAssetsPath + "/channel.txt";
+        if (File.Exists(path))
         {
-            channelName = channel;
+            string channel = File.ReadAllText(Application.streamingAssetsPath + "/channel.txt");
+            if (!string.IsNullOrEmpty(channel))
+            {
+                channelName = channel;
+            }
         }
+
 #elif UNITY_ANDROID
-        AndroidJavaClass androidJavaClass = new AndroidJavaClass("com.alianhome.getchannel.MainActivity");
-        channelName = androidJavaClass.CallStatic<string>("GetChannel", channelKey);
+        using (AndroidJavaClass androidJavaClass = new AndroidJavaClass("com.alianhome.getchannel.MainActivity"))
+        {
+            channelName = androidJavaClass.CallStatic<string>("GetChannel", channelKey);
+        }
 #elif UNITY_IOS
-        channelName= getChannelName(channelKey);
+        channelName = getChannelName(channelKey);
 #endif
         return channelName;
     }
-}
+}
diff --git a/BlankGetChannel.cs.meta → Runtime/BlankGetChannel.cs.meta b/BlankGetChannel.cs.meta → Runtime/BlankGetChannel.cs.meta
diff --git a/com.alianhome.getchannel.zip → Runtime/com.alianhome.getchannel.zip b/com.alianhome.getchannel.zip → Runtime/com.alianhome.getchannel.zip
diff --git a/com.alianhome.getchannel.zip.meta → Runtime/com.alianhome.getchannel.zip.meta b/com.alianhome.getchannel.zip.meta → Runtime/com.alianhome.getchannel.zip.meta
diff --git a/Runtime/link.xml b/Runtime/link.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<linker>
+    <assembly fullname="BlankGetChannel.Runtime" preserve="all"/>
+</linker>
diff --git a/Runtime/link.xml.meta b/Runtime/link.xml.meta
diff --git a/Sample.meta b/Sample.meta
diff --git a/Sample/BlankGetChannel.Sample.asmdef b/Sample/BlankGetChannel.Sample.asmdef
@@ -0,0 +1,15 @@
+{
+    "name": "BlankGetChannel.Sample",
+    "references": [
+        "BlankGetChannel.Runtime"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Sample/BlankGetChannel.Sample.asmdef.meta b/Sample/BlankGetChannel.Sample.asmdef.meta
diff --git a/BlankGetChannelExample.cs → Sample/BlankGetChannelExample.cs b/BlankGetChannelExample.cs → Sample/BlankGetChannelExample.cs
diff --git a/BlankGetChannelExample.cs.meta → Sample/BlankGetChannelExample.cs.meta b/BlankGetChannelExample.cs.meta → Sample/BlankGetChannelExample.cs.meta
diff --git a/BlankGetChannelExample.unity → Sample/BlankGetChannelExample.unity b/BlankGetChannelExample.unity → Sample/BlankGetChannelExample.unity
diff --git a/BlankGetChannelExample.unity.meta → Sample/BlankGetChannelExample.unity.meta b/BlankGetChannelExample.unity.meta → Sample/BlankGetChannelExample.unity.meta
diff --git a/package.json b/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "com.alianblank.blankgetchannel",
+  "displayName": "Blank Get Channel",
+  "version": "1.0.0",
+  "unity": "2017.1",
+  "description": "获取渠道信息",
+  "author": {
+    "name": "alianblank",
+    "url": "https://github.com/AlianBlank/BlankGetChannel"
+  },
+  "samples": [
+    {
+      "displayName": "Samples",
+      "description": "Samples",
+      "path": "Samples~"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/AlianBlank/BlankGetChannel.git"
+  },
+  "relatedPackages": {},
+  "type": "library"
+}
diff --git a/package.json.meta b/package.json.meta