Obsolete: Device.GetCountryCode()

增加：Device.GetLocaleISOCode() 以及 Device.GetLanguageISOCode()

Author: Aaron8052

Plugins/CS/Device.cs

@@ -8,32 +8,16 @@ namespace iOSNativePlugin
 {
     public static class Device
     {
-        [DllImport("__Internal")]
-        static extern bool Device_IsIPhoneNotchScreen();
-
-        [DllImport("__Internal")]
-        static extern bool Device_IsIPad();
-
-        [DllImport("__Internal")]
-        static extern int Device_GetDeviceOrientation();
-            
-        [DllImport("__Internal")]
-        static extern bool Audio_IsBluetoothHeadphonesConnected();
-            
-        [DllImport("__Internal")]
-        static extern bool Device_IsMacCatalyst();
-            
-        [DllImport("__Internal")]
-        static extern bool Device_IsSuperuser();
-            
-        [DllImport("__Internal")]
-        static extern void Audio_SetAudioExclusive(bool exclusive);
-            
-        [DllImport("__Internal")]
-        static extern void Device_PlayHaptics(int style, float intensity);
-                
-        [DllImport("__Internal")]
-        static extern string Device_GetCountryCode();
+        [DllImport("__Internal")] static extern bool Device_IsIPhoneNotchScreen();
+        [DllImport("__Internal")] static extern bool Device_IsIPad();
+        [DllImport("__Internal")] static extern int Device_GetDeviceOrientation();
+        [DllImport("__Internal")] static extern bool Audio_IsBluetoothHeadphonesConnected();
+        [DllImport("__Internal")] static extern bool Device_IsMacCatalyst();
+        [DllImport("__Internal")] static extern bool Device_IsSuperuser();
+        [DllImport("__Internal")] static extern void Audio_SetAudioExclusive(bool exclusive);
+        [DllImport("__Internal")] static extern void Device_PlayHaptics(int style, float intensity);
+        [DllImport("__Internal")] static extern string Device_GetLocaleISOCode();
+        [DllImport("__Internal")] static extern string Device_GetLanguageISOCode();
 
         public static Version GetIOSVersion()
         {
@@ -112,6 +96,19 @@ public static void PlayHaptics(UIImpactFeedbackStyle style, float intensity)
         /// 获取当前设备的ISO地区码（ISO 3166-1 alpha-2）
         /// </summary>
         /// <returns>ISO 3166-1 alpha-2</returns>
-        public static string GetCountryCode() => Device_GetCountryCode();
+        [Obsolete("Use Device.GetLocaleISOCode() instead")]
+        public static string GetCountryCode() => GetLocaleISOCode();
+
+        /// <summary>
+        /// 获取当前设备的ISO地区码（ISO 3166-1 alpha-2）
+        /// </summary>
+        /// <returns>ISO 3166-1 alpha-2</returns>
+        public static string GetLocaleISOCode() => Device_GetLocaleISOCode();
+
+        /// <summary>
+        /// 获取当前设备语言的ISO码（ISO 3166-1 alpha-2）
+        /// </summary>
+        /// <returns>ISO 3166-1 alpha-2</returns>
+        public static string GetLanguageISOCode() => Device_GetLanguageISOCode();
     }
 }

Plugins/Native/Headers/Device.h

@@ -7,7 +7,8 @@
 +(BOOL)IsMacCatalyst;
 +(BOOL)IsSuperuser;
 +(void)PlayHaptics:(int)style _intensity:(float)intensity;
-+(NSString *)GetCountryCode;
++(NSString *)GetLocaleISOCode;
++(NSString *)GetLanguageISOCode;
 
 @end
 
@@ -30,10 +31,13 @@ extern "C"
     bool Device_IsSuperuser(){
         return [Device IsSuperuser];
     }
-    const char* Device_GetCountryCode(){
-        return StringCopy([[Device GetCountryCode] UTF8String]);
-    }
     void Device_PlayHaptics(int style, float intensity){
         [Device PlayHaptics:style _intensity:intensity];
     }
+    const char* Device_GetLocaleISOCode(){
+        return StringCopy([[Device GetLocaleISOCode] UTF8String]);
+    }
+    const char* Device_GetLanguageISOCode(){
+        return StringCopy([[Device GetLanguageISOCode] UTF8String]);
+    }
 }

Plugins/Native/Implementations/Device.mm

@@ -72,10 +72,17 @@ +(void)PlayHaptics:(int)style _intensity:(float)intensity//参数int style，flo
 
 }
 
-+(NSString *)GetCountryCode{
++(NSString *)GetLocaleISOCode{
     NSLocale *currentLocale = [NSLocale currentLocale];
     NSString *countryCode = [currentLocale countryCode];
     return countryCode;
 }
 
++(NSString *)GetLanguageISOCode
+{
+    NSString *lang = [NSLocale preferredLanguages].firstObject;
+    NSLocale *locale = [NSLocale localeWithLocaleIdentifier:lang];
+    NSString *languageCode = [locale languageCode];
+    return languageCode;
+}
 @end