[修改]1. 修改SDK异常

AlianBlank · AlianBlank · commit 4926b6c52809 · 2025-05-15T15:48:24.000+08:00
diff --git a/Runtime/TalkingDataOrder.cs b/Runtime/TalkingDataOrder.cs
@@ -68,4 +68,4 @@ public override string ToString()
     }
 #endif
 }
-#endif
+#endif
diff --git a/Runtime/TalkingDataProfile.cs b/Runtime/TalkingDataProfile.cs
@@ -1,33 +1,39 @@
 using UnityEngine;
 
 
+/// <summary>
+/// 用户类型
+/// </summary>
 public enum TalkingDataProfileType
 {
-    ANONYMOUS   = 0,
-    REGISTERED  = 1,
-    SINA_WEIBO  = 2,
-    QQ          = 3,
-    QQ_WEIBO    = 4,
-    ND91        = 5,
-    WEIXIN      = 6,
-    TYPE1       = 11,
-    TYPE2       = 12,
-    TYPE3       = 13,
-    TYPE4       = 14,
-    TYPE5       = 15,
-    TYPE6       = 16,
-    TYPE7       = 17,
-    TYPE8       = 18,
-    TYPE9       = 19,
-    TYPE10      = 20
+    ANONYMOUS = 0,
+    REGISTERED = 1,
+    SINA_WEIBO = 2,
+    QQ = 3,
+    QQ_WEIBO = 4,
+    ND91 = 5,
+    WEIXIN = 6,
+    TYPE1 = 11,
+    TYPE2 = 12,
+    TYPE3 = 13,
+    TYPE4 = 14,
+    TYPE5 = 15,
+    TYPE6 = 16,
+    TYPE7 = 17,
+    TYPE8 = 18,
+    TYPE9 = 19,
+    TYPE10 = 20
 }
 
 
+/// <summary>
+/// 性别
+/// </summary>
 public enum TalkingDataGender
 {
-    UNKNOWN     = 0,
-    MALE        = 1,
-    FEMALE      = 2
+    UNKNOWN = 0,
+    MALE = 1,
+    FEMALE = 2
 }
 
 
@@ -65,6 +71,7 @@ public static TalkingDataProfile CreateProfile()
 #endif
             return profile;
         }
+
         return null;
     }
 
@@ -83,6 +90,7 @@ public TalkingDataProfile SetName(string name)
             this.name = name;
 #endif
         }
+
         return this;
     }
 
@@ -103,6 +111,7 @@ public TalkingDataProfile SetType(TalkingDataProfileType type)
             this.type = type;
 #endif
         }
+
         return this;
     }
 
@@ -123,6 +132,7 @@ public TalkingDataProfile SetGender(TalkingDataGender gender)
             this.gender = gender;
 #endif
         }
+
         return this;
     }
 
@@ -141,6 +151,7 @@ public TalkingDataProfile SetAge(int age)
             this.age = age;
 #endif
         }
+
         return this;
     }
 
@@ -160,6 +171,7 @@ public TalkingDataProfile SetProperty1(object property)
             this.property1 = property;
 #endif
         }
+
         return this;
     }
 
@@ -179,6 +191,7 @@ public TalkingDataProfile SetProperty2(object property)
             this.property2 = property;
 #endif
         }
+
         return this;
     }
 
@@ -198,6 +211,7 @@ public TalkingDataProfile SetProperty3(object property)
             this.property3 = property;
 #endif
         }
+
         return this;
     }
 
@@ -217,6 +231,7 @@ public TalkingDataProfile SetProperty4(object property)
             this.property4 = property;
 #endif
         }
+
         return this;
     }
 
@@ -236,6 +251,7 @@ public TalkingDataProfile SetProperty5(object property)
             this.property5 = property;
 #endif
         }
+
         return this;
     }
 
@@ -255,6 +271,7 @@ public TalkingDataProfile SetProperty6(object property)
             this.property6 = property;
 #endif
         }
+
         return this;
     }
 
@@ -274,6 +291,7 @@ public TalkingDataProfile SetProperty7(object property)
             this.property7 = property;
 #endif
         }
+
         return this;
     }
 
@@ -293,6 +311,7 @@ public TalkingDataProfile SetProperty8(object property)
             this.property8 = property;
 #endif
         }
+
         return this;
     }
 
@@ -312,6 +331,7 @@ public TalkingDataProfile SetProperty9(object property)
             this.property9 = property;
 #endif
         }
+
         return this;
     }
 
@@ -331,6 +351,7 @@ public TalkingDataProfile SetProperty10(object property)
             this.property10 = property;
 #endif
         }
+
         return this;
     }
 
@@ -366,6 +387,7 @@ private AndroidJavaObject AndroidJavaObjectFromObject(object parameter)
         {
             androidObject = new AndroidJavaObject("java.lang.Double", parameter);
         }
+
         return androidObject;
     }
 #endif
@@ -465,4 +487,4 @@ public override string ToString()
         return null;
     }
 #endif
-}
+}
diff --git a/Runtime/TalkingDataSDK.cs b/Runtime/TalkingDataSDK.cs
@@ -10,8 +10,6 @@
 using System.Runtime.InteropServices;
 using System.Collections;
 #endif
-
-
 public static class TalkingDataSDK
 {
 #if UNITY_ANDROID
diff --git a/Runtime/TalkingDataSDKConfig.cs b/Runtime/TalkingDataSDKConfig.cs
@@ -7,74 +7,75 @@ public class TalkingDataSDKConfig
 
     public static TalkingDataSDKConfig CreateConfig()
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-            TalkingDataSDKConfig config = new TalkingDataSDKConfig();
-#if UNITY_ANDROID
-            config.javaObj = new AndroidJavaObject("com.tendcloud.tenddata.TalkingDataSDKConfig");
+        var config = new TalkingDataSDKConfig();
+#if UNITY_ANDROID || !UNITY_EDITOR
+        config.javaObj = new AndroidJavaObject("com.tendcloud.tenddata.TalkingDataSDKConfig");
 #endif
-            return config;
-        }
-        return null;
+        return config;
     }
 
+    /// <summary>
+    /// 是否 允许收集IMEI和MEID
+    /// </summary>
+    /// <param name="enabled"></param>
+    /// <returns></returns>
     public TalkingDataSDKConfig SetIMEIAndMEIDEnabled(bool enabled)
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-#if UNITY_ANDROID
-            javaObj.Call<AndroidJavaObject>("setIMEIAndMEIDEnabled", enabled);
+#if UNITY_ANDROID || !UNITY_EDITOR
+        javaObj.Call<AndroidJavaObject>("setIMEIAndMEIDEnabled", enabled);
 #endif
-            return this;
-        }
-        return null;
+        return this;
     }
 
+    /// <summary>
+    /// 是否 允许收集MAC
+    /// </summary>
+    /// <param name="enabled"></param>
+    /// <returns></returns>
     public TalkingDataSDKConfig SetMACEnabled(bool enabled)
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-#if UNITY_ANDROID
-            javaObj.Call<AndroidJavaObject>("setMACEnabled", enabled);
+#if UNITY_ANDROID || !UNITY_EDITOR
+        javaObj.Call<AndroidJavaObject>("setMACEnabled", enabled);
 #endif
-            return this;
-        }
-        return null;
+        return this;
     }
 
+    /// <summary>
+    /// 是否 允许收集应用列表
+    /// </summary>
+    /// <param name="enabled"></param>
+    /// <returns></returns>
     public TalkingDataSDKConfig SetAppListEnabled(bool enabled)
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-#if UNITY_ANDROID
-            javaObj.Call<AndroidJavaObject>("setAppListEnabled", enabled);
+#if UNITY_ANDROID || !UNITY_EDITOR
+        javaObj.Call<AndroidJavaObject>("setAppListEnabled", enabled);
 #endif
-            return this;
-        }
-        return null;
+        return this;
     }
 
+    /// <summary>
+    /// 是否 允许收集位置信息
+    /// </summary>
+    /// <param name="enabled"></param>
+    /// <returns></returns>
     public TalkingDataSDKConfig SetLocationEnabled(bool enabled)
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-#if UNITY_ANDROID
-            javaObj.Call<AndroidJavaObject>("setLocationEnabled", enabled);
+#if UNITY_ANDROID || !UNITY_EDITOR
+        javaObj.Call<AndroidJavaObject>("setLocationEnabled", enabled);
 #endif
-            return this;
-        }
-        return null;
+        return this;
     }
 
+    /// <summary>
+    /// 是否 允许收集网络信息
+    /// </summary>
+    /// <param name="enabled"></param>
+    /// <returns></returns>
     public TalkingDataSDKConfig SetWifiEnabled(bool enabled)
     {
-        if (Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.WindowsEditor)
-        {
-#if UNITY_ANDROID
-            javaObj.Call<AndroidJavaObject>("setWifiEnabled", enabled);
+#if UNITY_ANDROID || !UNITY_EDITOR
+        javaObj.Call<AndroidJavaObject>("setWifiEnabled", enabled);
 #endif
-            return this;
-        }
-        return null;
+        return this;
     }
-}
+}
diff --git a/Runtime/TalkingDataSearch.cs b/Runtime/TalkingDataSearch.cs
@@ -33,6 +33,7 @@ public static TalkingDataSearch CreateSearch()
 #endif
             return search;
         }
+
         return null;
     }
 
@@ -51,6 +52,7 @@ public TalkingDataSearch SetCategory(string category)
             this.category = category;
 #endif
         }
+
         return this;
     }
 
@@ -69,6 +71,7 @@ public TalkingDataSearch SetContent(string content)
             this.content = content;
 #endif
         }
+
         return this;
     }
 
@@ -207,4 +210,4 @@ public override string ToString()
         return null;
     }
 #endif
-}
+}
diff --git a/Runtime/TalkingDataShoppingCart.cs b/Runtime/TalkingDataShoppingCart.cs
@@ -60,4 +60,4 @@ public override string ToString()
     }
 #endif
 }
-#endif
+#endif
diff --git a/Runtime/TalkingDataTransaction.cs b/Runtime/TalkingDataTransaction.cs
@@ -217,4 +217,4 @@ public override string ToString()
     }
 #endif
 }
-#endif
+#endif

Original file line number	Diff line number	Diff line change
`@@ -68,4 +68,4 @@ public override string ToString()`
`68`	`68`	`}`
`69`	`69`	`#endif`
`70`	`70`	`}`
`71`		`-#endif`
	`71`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -1,33 +1,39 @@`
`1`	`1`	`using UnityEngine;`
`2`	`2`
`3`	`3`
	`4`	`+/// <summary>`
	`5`	`+/// 用户类型`
	`6`	`+/// </summary>`
`4`	`7`	`public enum TalkingDataProfileType`
`5`	`8`	`{`
`6`		`- ANONYMOUS = 0,`
`7`		`- REGISTERED = 1,`
`8`		`- SINA_WEIBO = 2,`
`9`		`- QQ = 3,`
`10`		`- QQ_WEIBO = 4,`
`11`		`- ND91 = 5,`
`12`		`- WEIXIN = 6,`
`13`		`- TYPE1 = 11,`
`14`		`- TYPE2 = 12,`
`15`		`- TYPE3 = 13,`
`16`		`- TYPE4 = 14,`
`17`		`- TYPE5 = 15,`
`18`		`- TYPE6 = 16,`
`19`		`- TYPE7 = 17,`
`20`		`- TYPE8 = 18,`
`21`		`- TYPE9 = 19,`
`22`		`- TYPE10 = 20`
	`9`	`+ ANONYMOUS = 0,`
	`10`	`+ REGISTERED = 1,`
	`11`	`+ SINA_WEIBO = 2,`
	`12`	`+ QQ = 3,`
	`13`	`+ QQ_WEIBO = 4,`
	`14`	`+ ND91 = 5,`
	`15`	`+ WEIXIN = 6,`
	`16`	`+ TYPE1 = 11,`
	`17`	`+ TYPE2 = 12,`
	`18`	`+ TYPE3 = 13,`
	`19`	`+ TYPE4 = 14,`
	`20`	`+ TYPE5 = 15,`
	`21`	`+ TYPE6 = 16,`
	`22`	`+ TYPE7 = 17,`
	`23`	`+ TYPE8 = 18,`
	`24`	`+ TYPE9 = 19,`
	`25`	`+ TYPE10 = 20`
`23`	`26`	`}`
`24`	`27`
`25`	`28`
	`29`	`+/// <summary>`
	`30`	`+/// 性别`
	`31`	`+/// </summary>`
`26`	`32`	`public enum TalkingDataGender`
`27`	`33`	`{`
`28`		`- UNKNOWN = 0,`
`29`		`- MALE = 1,`
`30`		`- FEMALE = 2`
	`34`	`+ UNKNOWN = 0,`
	`35`	`+ MALE = 1,`
	`36`	`+ FEMALE = 2`
`31`	`37`	`}`
`32`	`38`
`33`	`39`
`@@ -65,6 +71,7 @@ public static TalkingDataProfile CreateProfile()`
`65`	`71`	`#endif`
`66`	`72`	`return profile;`
`67`	`73`	`}`
	`74`	`+`
`68`	`75`	`return null;`
`69`	`76`	`}`
`70`	`77`
`@@ -83,6 +90,7 @@ public TalkingDataProfile SetName(string name)`
`83`	`90`	`this.name = name;`
`84`	`91`	`#endif`
`85`	`92`	`}`
	`93`	`+`
`86`	`94`	`return this;`
`87`	`95`	`}`
`88`	`96`
`@@ -103,6 +111,7 @@ public TalkingDataProfile SetType(TalkingDataProfileType type)`
`103`	`111`	`this.type = type;`
`104`	`112`	`#endif`
`105`	`113`	`}`
	`114`	`+`
`106`	`115`	`return this;`
`107`	`116`	`}`
`108`	`117`
`@@ -123,6 +132,7 @@ public TalkingDataProfile SetGender(TalkingDataGender gender)`
`123`	`132`	`this.gender = gender;`
`124`	`133`	`#endif`
`125`	`134`	`}`
	`135`	`+`
`126`	`136`	`return this;`
`127`	`137`	`}`
`128`	`138`
`@@ -141,6 +151,7 @@ public TalkingDataProfile SetAge(int age)`
`141`	`151`	`this.age = age;`
`142`	`152`	`#endif`
`143`	`153`	`}`
	`154`	`+`
`144`	`155`	`return this;`
`145`	`156`	`}`
`146`	`157`
`@@ -160,6 +171,7 @@ public TalkingDataProfile SetProperty1(object property)`
`160`	`171`	`this.property1 = property;`
`161`	`172`	`#endif`
`162`	`173`	`}`
	`174`	`+`
`163`	`175`	`return this;`
`164`	`176`	`}`
`165`	`177`
`@@ -179,6 +191,7 @@ public TalkingDataProfile SetProperty2(object property)`
`179`	`191`	`this.property2 = property;`
`180`	`192`	`#endif`
`181`	`193`	`}`
	`194`	`+`
`182`	`195`	`return this;`
`183`	`196`	`}`
`184`	`197`
`@@ -198,6 +211,7 @@ public TalkingDataProfile SetProperty3(object property)`
`198`	`211`	`this.property3 = property;`
`199`	`212`	`#endif`
`200`	`213`	`}`
	`214`	`+`
`201`	`215`	`return this;`
`202`	`216`	`}`
`203`	`217`
`@@ -217,6 +231,7 @@ public TalkingDataProfile SetProperty4(object property)`
`217`	`231`	`this.property4 = property;`
`218`	`232`	`#endif`
`219`	`233`	`}`
	`234`	`+`
`220`	`235`	`return this;`
`221`	`236`	`}`
`222`	`237`
`@@ -236,6 +251,7 @@ public TalkingDataProfile SetProperty5(object property)`
`236`	`251`	`this.property5 = property;`
`237`	`252`	`#endif`
`238`	`253`	`}`
	`254`	`+`
`239`	`255`	`return this;`
`240`	`256`	`}`
`241`	`257`
`@@ -255,6 +271,7 @@ public TalkingDataProfile SetProperty6(object property)`
`255`	`271`	`this.property6 = property;`
`256`	`272`	`#endif`
`257`	`273`	`}`
	`274`	`+`
`258`	`275`	`return this;`
`259`	`276`	`}`
`260`	`277`
`@@ -274,6 +291,7 @@ public TalkingDataProfile SetProperty7(object property)`
`274`	`291`	`this.property7 = property;`
`275`	`292`	`#endif`
`276`	`293`	`}`
	`294`	`+`
`277`	`295`	`return this;`
`278`	`296`	`}`
`279`	`297`
`@@ -293,6 +311,7 @@ public TalkingDataProfile SetProperty8(object property)`
`293`	`311`	`this.property8 = property;`
`294`	`312`	`#endif`
`295`	`313`	`}`
	`314`	`+`
`296`	`315`	`return this;`
`297`	`316`	`}`
`298`	`317`
`@@ -312,6 +331,7 @@ public TalkingDataProfile SetProperty9(object property)`
`312`	`331`	`this.property9 = property;`
`313`	`332`	`#endif`
`314`	`333`	`}`
	`334`	`+`
`315`	`335`	`return this;`
`316`	`336`	`}`
`317`	`337`
`@@ -331,6 +351,7 @@ public TalkingDataProfile SetProperty10(object property)`
`331`	`351`	`this.property10 = property;`
`332`	`352`	`#endif`
`333`	`353`	`}`
	`354`	`+`
`334`	`355`	`return this;`
`335`	`356`	`}`
`336`	`357`
`@@ -366,6 +387,7 @@ private AndroidJavaObject AndroidJavaObjectFromObject(object parameter)`
`366`	`387`	`{`
`367`	`388`	`androidObject = new AndroidJavaObject("java.lang.Double", parameter);`
`368`	`389`	`}`
	`390`	`+`
`369`	`391`	`return androidObject;`
`370`	`392`	`}`
`371`	`393`	`#endif`
`@@ -465,4 +487,4 @@ public override string ToString()`
`465`	`487`	`return null;`
`466`	`488`	`}`
`467`	`489`	`#endif`
`468`		`-}`
	`490`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`using System.Runtime.InteropServices;`
`11`	`11`	`using System.Collections;`
`12`	`12`	`#endif`
`13`		`-`
`14`		`-`
`15`	`13`	`public static class TalkingDataSDK`
`16`	`14`	`{`
`17`	`15`	`#if UNITY_ANDROID`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public static TalkingDataSearch CreateSearch()`
`33`	`33`	`#endif`
`34`	`34`	`return search;`
`35`	`35`	`}`
	`36`	`+`
`36`	`37`	`return null;`
`37`	`38`	`}`
`38`	`39`
`@@ -51,6 +52,7 @@ public TalkingDataSearch SetCategory(string category)`
`51`	`52`	`this.category = category;`
`52`	`53`	`#endif`
`53`	`54`	`}`
	`55`	`+`
`54`	`56`	`return this;`
`55`	`57`	`}`
`56`	`58`
`@@ -69,6 +71,7 @@ public TalkingDataSearch SetContent(string content)`
`69`	`71`	`this.content = content;`
`70`	`72`	`#endif`
`71`	`73`	`}`
	`74`	`+`
`72`	`75`	`return this;`
`73`	`76`	`}`
`74`	`77`
`@@ -207,4 +210,4 @@ public override string ToString()`
`207`	`210`	`return null;`
`208`	`211`	`}`
`209`	`212`	`#endif`
`210`		`-}`
	`213`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ public override string ToString()`
`60`	`60`	`}`
`61`	`61`	`#endif`
`62`	`62`	`}`
`63`		`-#endif`
	`63`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -217,4 +217,4 @@ public override string ToString()`
`217`	`217`	`}`
`218`	`218`	`#endif`
`219`	`219`	`}`
`220`		`-#endif`
	`220`	`+#endif`