diff --git a/SwiftProject/Pods/Pods.xcodeproj/xcuserdata/zhihaizhu.xcuserdatad/xcschemes/xcschememanagement.plist b/SwiftProject/Pods/Pods.xcodeproj/xcuserdata/zhihaizhu.xcuserdatad/xcschemes/xcschememanagement.plist
index a3f6772..9e83b58 100644
--- a/SwiftProject/Pods/Pods.xcodeproj/xcuserdata/zhihaizhu.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/SwiftProject/Pods/Pods.xcodeproj/xcuserdata/zhihaizhu.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,47 +12,47 @@
DeviceKit.xcscheme_^#shared#^_
orderHint
- 2
+ 9
FBSDKCoreKit.xcscheme_^#shared#^_
orderHint
- 31
+ 17
FacebookCore.xcscheme_^#shared#^_
orderHint
- 21
+ 26
Firebase.xcscheme_^#shared#^_
orderHint
- 15
+ 21
FirebaseABTesting-FirebaseABTesting_Privacy.xcscheme_^#shared#^_
orderHint
- 26
+ 7
FirebaseABTesting.xcscheme_^#shared#^_
orderHint
- 16
+ 6
FirebaseAnalytics.xcscheme_^#shared#^_
orderHint
- 33
+ 16
FirebaseCore-FirebaseCore_Privacy.xcscheme_^#shared#^_
orderHint
- 11
+ 10
FirebaseCore.xcscheme_^#shared#^_
orderHint
- 29
+ 13
FirebaseCoreExtension.xcscheme_^#shared#^_
@@ -62,12 +62,12 @@
FirebaseCoreInternal-FirebaseCoreInternal_Privacy.xcscheme_^#shared#^_
orderHint
- 27
+ 25
FirebaseCoreInternal.xcscheme_^#shared#^_
orderHint
- 14
+ 8
FirebaseCrashlytics.xcscheme_^#shared#^_
@@ -77,12 +77,12 @@
FirebaseInstallations-FirebaseInstallations_Privacy.xcscheme_^#shared#^_
orderHint
- 12
+ 28
FirebaseInstallations.xcscheme_^#shared#^_
orderHint
- 20
+ 24
FirebaseMessaging.xcscheme_^#shared#^_
@@ -92,17 +92,17 @@
FirebaseRemoteConfig-FirebaseRemoteConfig_Privacy.xcscheme_^#shared#^_
orderHint
- 6
+ 12
FirebaseRemoteConfig.xcscheme_^#shared#^_
orderHint
- 10
+ 20
FirebaseRemoteConfigInterop.xcscheme_^#shared#^_
orderHint
- 7
+ 27
FirebaseSessions.xcscheme_^#shared#^_
@@ -112,12 +112,12 @@
FirebaseSharedSwift.xcscheme_^#shared#^_
orderHint
- 9
+ 1
GoogleAppMeasurement.xcscheme_^#shared#^_
orderHint
- 34
+ 11
GoogleDataTransport.xcscheme_^#shared#^_
@@ -127,47 +127,47 @@
GoogleUtilities-GoogleUtilities_Privacy.xcscheme_^#shared#^_
orderHint
- 28
+ 2
GoogleUtilities.xcscheme_^#shared#^_
orderHint
- 4
+ 15
KeychainAccess.xcscheme_^#shared#^_
orderHint
- 17
+ 14
Kingfisher-Kingfisher.xcscheme_^#shared#^_
orderHint
- 32
+ 18
Kingfisher.xcscheme_^#shared#^_
orderHint
- 24
+ 31
LLCycleScrollView.xcscheme_^#shared#^_
orderHint
- 25
+ 32
Pods-SwiftProject.xcscheme_^#shared#^_
orderHint
- 3
+ 23
PromisesObjC-FBLPromises_Privacy.xcscheme_^#shared#^_
orderHint
- 30
+ 29
PromisesObjC.xcscheme_^#shared#^_
orderHint
- 19
+ 34
PromisesSwift.xcscheme_^#shared#^_
@@ -177,37 +177,37 @@
SDWebImage-SDWebImage.xcscheme_^#shared#^_
orderHint
- 23
+ 30
SDWebImage.xcscheme_^#shared#^_
orderHint
- 1
+ 4
SVProgressHUD.xcscheme_^#shared#^_
orderHint
- 18
+ 5
SnapKit.xcscheme_^#shared#^_
orderHint
- 13
+ 22
TZImagePickerController.xcscheme_^#shared#^_
orderHint
- 8
+ 19
nanopb-nanopb_Privacy.xcscheme_^#shared#^_
orderHint
- 22
+ 3
nanopb.xcscheme_^#shared#^_
orderHint
- 5
+ 33
diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate
index 5712780..ffb224f 100644
Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..5dd8e74
--- /dev/null
+++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/zhihaizhu.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+
+
+
diff --git a/SwiftProject/SwiftProject/Project/Util/ZZHHelper.swift b/SwiftProject/SwiftProject/Project/Util/ZZHHelper.swift
index d769842..5b8b403 100644
--- a/SwiftProject/SwiftProject/Project/Util/ZZHHelper.swift
+++ b/SwiftProject/SwiftProject/Project/Util/ZZHHelper.swift
@@ -120,13 +120,20 @@ class ZZHHelper {
// 返回设备曾使用过的语言列表
let languages: [String] = UserDefaults.standard.object(forKey: "AppleLanguages") as! [String]
// 当前使用的语言排在第一
- let currentLanguage = languages.first
- return currentLanguage ?? "en-CN"
+ if let currentLanguage = languages.first {
+ let firstStr = currentLanguage.components(separatedBy: "-").first
+ return firstStr ?? "Unknown"
+ }
+ else {
+ return "Unknown"
+ }
+
}
/// 获取系统当前地区 en_CN/en_GB
class func getCurrentRegion() -> String {
- return NSLocale.current.identifier
+ let lastStr = NSLocale.current.identifier.components(separatedBy: "_").last
+ return lastStr ?? "Unknown"
}
//判断是否为用户首次启动