diff --git a/.gitignore b/.gitignore index db190391..77a5a6af 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,70 @@ npm-debug.log *.png.orig *.jpg.orig screenshot/ +.opencode/skills/README.md +.opencode/skills/ask-matt/SKILL.md +.opencode/skills/ask-matt/agents/openai.yaml +.opencode/skills/code-review/SKILL.md +.opencode/skills/code-review/agents/openai.yaml +.opencode/skills/codebase-design/DEEPENING.md +.opencode/skills/codebase-design/DESIGN-IT-TWICE.md +.opencode/skills/codebase-design/SKILL.md +.opencode/skills/codebase-design/agents/openai.yaml +.opencode/skills/diagnosing-bugs/SKILL.md +.opencode/skills/diagnosing-bugs/agents/openai.yaml +.opencode/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +.opencode/skills/domain-modeling/ADR-FORMAT.md +.opencode/skills/domain-modeling/CONTEXT-FORMAT.md +.opencode/skills/domain-modeling/SKILL.md +.opencode/skills/domain-modeling/agents/openai.yaml +.opencode/skills/grill-me/SKILL.md +.opencode/skills/grill-me/agents/openai.yaml +.opencode/skills/grill-with-docs/SKILL.md +.opencode/skills/grill-with-docs/agents/openai.yaml +.opencode/skills/grilling/SKILL.md +.opencode/skills/grilling/agents/openai.yaml +.opencode/skills/handoff/SKILL.md +.opencode/skills/handoff/agents/openai.yaml +.opencode/skills/implement/SKILL.md +.opencode/skills/implement/agents/openai.yaml +.opencode/skills/improve-codebase-architecture/HTML-REPORT.md +.opencode/skills/improve-codebase-architecture/SKILL.md +.opencode/skills/improve-codebase-architecture/agents/openai.yaml +.opencode/skills/prototype/LOGIC.md +.opencode/skills/prototype/SKILL.md +.opencode/skills/prototype/UI.md +.opencode/skills/prototype/agents/openai.yaml +.opencode/skills/research/SKILL.md +.opencode/skills/research/agents/openai.yaml +.opencode/skills/resolving-merge-conflicts/SKILL.md +.opencode/skills/resolving-merge-conflicts/agents/openai.yaml +.opencode/skills/setup-matt-pocock-skills/domain.md +.opencode/skills/setup-matt-pocock-skills/issue-tracker-github.md +.opencode/skills/setup-matt-pocock-skills/issue-tracker-gitlab.md +.opencode/skills/setup-matt-pocock-skills/issue-tracker-local.md +.opencode/skills/setup-matt-pocock-skills/SKILL.md +.opencode/skills/setup-matt-pocock-skills/triage-labels.md +.opencode/skills/setup-matt-pocock-skills/agents/openai.yaml +.opencode/skills/tdd/mocking.md +.opencode/skills/tdd/SKILL.md +.opencode/skills/tdd/tests.md +.opencode/skills/tdd/agents/openai.yaml +.opencode/skills/teach/GLOSSARY-FORMAT.md +.opencode/skills/teach/LEARNING-RECORD-FORMAT.md +.opencode/skills/teach/MISSION-FORMAT.md +.opencode/skills/teach/RESOURCES-FORMAT.md +.opencode/skills/teach/SKILL.md +.opencode/skills/teach/agents/openai.yaml +.opencode/skills/to-spec/SKILL.md +.opencode/skills/to-spec/agents/openai.yaml +.opencode/skills/to-tickets/SKILL.md +.opencode/skills/to-tickets/agents/openai.yaml +.opencode/skills/triage/AGENT-BRIEF.md +.opencode/skills/triage/OUT-OF-SCOPE.md +.opencode/skills/triage/SKILL.md +.opencode/skills/triage/agents/openai.yaml +.opencode/skills/wayfinder/SKILL.md +.opencode/skills/wayfinder/agents/openai.yaml +.opencode/skills/writing-great-skills/GLOSSARY.md +.opencode/skills/writing-great-skills/SKILL.md +.opencode/skills/writing-great-skills/agents/openai.yaml diff --git a/Podfile b/Podfile index fdf3545d..b8c985bc 100644 --- a/Podfile +++ b/Podfile @@ -64,6 +64,11 @@ target 'QuickLocation' do pod 'AMapLocation-NO-IDFA' #定位SDK pod 'AMapSearch-NO-IDFA' #搜索SDK + #友盟 + pod 'UMCommon' #必须集成 + pod 'UMDevice' #必须集成 + pod 'UMAPM' + end post_install do |installer| diff --git a/Podfile.lock b/Podfile.lock index 342dc8ae..3273693d 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -170,6 +170,11 @@ PODS: - SwiftyJSON (5.0.2) - SwiftyUserDefaults (5.3.0) - TagListView (1.4.1) + - UMAPM (2.0.7): + - UMCommon + - UMCommon (7.5.11): + - UMDevice + - UMDevice (3.6.0) - URLNavigator (2.5.1) - WechatOpenSDK-XCFramework (2.0.5) - YBImageBrowser (3.0.9): @@ -220,6 +225,9 @@ DEPENDENCIES: - SwiftyJSON - SwiftyUserDefaults - TagListView (~> 1.0) + - UMAPM + - UMCommon + - UMDevice - URLNavigator - WechatOpenSDK-XCFramework - YBImageBrowser @@ -279,6 +287,9 @@ SPEC REPOS: - SwiftyJSON - SwiftyUserDefaults - TagListView + - UMAPM + - UMCommon + - UMDevice - URLNavigator - WechatOpenSDK-XCFramework - YBImageBrowser @@ -346,12 +357,15 @@ SPEC CHECKSUMS: SwiftyJSON: f5b1bf1cd8dd53cd25887ac0eabcfd92301c6a5a SwiftyUserDefaults: 63f80248cf5bfb3458825d9a78f2eb7e1293a040 TagListView: a1c236d17960a0cf64156725a76ce6d73ebce2be + UMAPM: ba9fbebe8dd2048b251c332ab0afc86e1ba5ea63 + UMCommon: d652b3b372a801b36db203f5b546ab3e15676898 + UMDevice: 20b7b3c37a36b2c5c7ca8b5a54386ff9ed2b3b19 URLNavigator: e9c0426ba6e6ac57f34d018bbf3df840797f984d WechatOpenSDK-XCFramework: ff342ae616bb86df3d236aca38059dfd4bc4a949 YBImageBrowser: 7ecc8bf33ffa5f3b94c397c29b4f3638dd37f527 YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54 ZXSDK: 786338c0a18e98e03eda00699c3bfd2700b97117 -PODFILE CHECKSUM: 55d478000a8bba48e7bb7de252ef246a0b3784c4 +PODFILE CHECKSUM: 439991fe5523a65e07f0df7135995adfc31f6cb3 COCOAPODS: 1.16.2 diff --git a/QuickLocation.xcodeproj/project.pbxproj b/QuickLocation.xcodeproj/project.pbxproj index 69ecfd80..444bb7d5 100644 --- a/QuickLocation.xcodeproj/project.pbxproj +++ b/QuickLocation.xcodeproj/project.pbxproj @@ -613,21 +613,29 @@ /* Begin PBXFileSystemSynchronizedRootGroup section */ 30CCDF8E2FE3E63B00F5214A /* sound */ = { isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + ); path = sound; sourceTree = ""; }; 30CCDF902FE3E63B00F5214A /* video */ = { isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + ); path = video; sourceTree = ""; }; 30CCE01E2FE3E64700F5214A /* lotties */ = { isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + ); path = lotties; sourceTree = ""; }; 30D87CEF2FDFF52100E958FD /* TTGTagCollectionView */ = { isa = PBXFileSystemSynchronizedRootGroup; + exceptions = ( + ); path = TTGTagCollectionView; sourceTree = ""; }; @@ -1785,14 +1793,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-frameworks.sh\"\n"; @@ -1806,14 +1810,10 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources-${CONFIGURATION}-input-files.xcfilelist", ); - inputPaths = ( - ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources-${CONFIGURATION}-output-files.xcfilelist", ); - outputPaths = ( - ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-QuickLocation/Pods-QuickLocation-resources.sh\"\n"; @@ -2152,9 +2152,10 @@ INFOPLIST_FILE = QuickLocation/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极速定位"; INFOPLIST_KEY_NSCameraUsageDescription = "您的相机将被用于扫描二维码、拍摄照片和视频。"; + INFOPLIST_KEY_NSContactsUsageDescription = "需要访问您的通讯录以导入联系人号码"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; - INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风,以便您使用麦克风进行音频录制。"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风,以便您使用麦克风发送语音消息。"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "为了保存图片到您的相册,请允许添加照片,谢谢。"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "我们需要访问您的相册,以便您可以发送照片。"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; @@ -2204,9 +2205,10 @@ INFOPLIST_FILE = QuickLocation/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "极速定位"; INFOPLIST_KEY_NSCameraUsageDescription = "您的相机将被用于扫描二维码、拍摄照片和视频。"; + INFOPLIST_KEY_NSContactsUsageDescription = "需要访问您的通讯录以导入联系人号码"; INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "需要获取您的位置信息以在地图上显示您的位置"; - INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风,以便您使用麦克风进行音频录制。"; + INFOPLIST_KEY_NSMicrophoneUsageDescription = "我们需要使用您的麦克风,以便您使用麦克风发送语音消息。"; INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "为了保存图片到您的相册,请允许添加照片,谢谢。"; INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "我们需要访问您的相册,以便您可以发送照片。"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; diff --git a/QuickLocation/AppDelegate.swift b/QuickLocation/AppDelegate.swift index 4dcf1a48..8c269ca1 100644 --- a/QuickLocation/AppDelegate.swift +++ b/QuickLocation/AppDelegate.swift @@ -11,6 +11,7 @@ import IQKeyboardManagerSwift import GeYanSdk import AMapFoundationKit #endif +import UMCommon @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -61,6 +62,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // OpenIM GroupIMService.shared.initSDK() + // 友盟 + UMConfigure.initWithAppkey(AppSettings.kAppsUMengAppKey, channel: "App Store") + window = UIWindow(frame: UIScreen.main.bounds) window?.backgroundColor = .white window?.overrideUserInterfaceStyle = .light diff --git a/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png b/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png index 8a299af2..2fa8bbe5 100644 Binary files a/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png and b/QuickLocation/Assets.xcassets/AppIcon.appiconset/app_icon.png differ diff --git a/QuickLocation/Info.plist b/QuickLocation/Info.plist index ee972bb7..9c3f7054 100644 --- a/QuickLocation/Info.plist +++ b/QuickLocation/Info.plist @@ -38,10 +38,25 @@ NSAppTransportSecurity NSAllowsArbitraryLoads - + + NSExceptionDomains + + 38.207.176.65 + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + imws.zuom8.cn + + NSExceptionAllowsInsecureHTTPLoads + + NSIncludesSubdomains + + + - NSContactsUsageDescription - 需要访问您的通讯录以导入联系人号码 UIAppFonts douyu.otf diff --git a/QuickLocation/Main/BaseViewController/BaseViewController.swift b/QuickLocation/Main/BaseViewController/BaseViewController.swift index 0aa6d369..04fc45f6 100644 --- a/QuickLocation/Main/BaseViewController/BaseViewController.swift +++ b/QuickLocation/Main/BaseViewController/BaseViewController.swift @@ -9,6 +9,7 @@ import UIKit import RxCocoa import RxSwift import YBImageBrowser +import UMCommon #if DEBUG || AdHoc //import FLEX #endif @@ -53,6 +54,7 @@ class BaseViewController: UIViewController { let className = String(describing: self.classForCoder) print(className) + MobClick.beginLogPageView(className) // 返回根页面时恢复 tabBar 可见性(UINavigationControllerDelegate 在 pop 时可能漏触发) (tabBarController as? MainTabBarController)?.updateTabBarVisibility() @@ -69,6 +71,7 @@ class BaseViewController: UIViewController { let className = String(describing: self.classForCoder) print(className) + MobClick.endLogPageView(className) } @objc func dismissClicked(_ item: UIBarButtonItem) { diff --git a/QuickLocation/Manager/App/AppSettings.swift b/QuickLocation/Manager/App/AppSettings.swift index f8ee7cf7..447790ad 100644 --- a/QuickLocation/Manager/App/AppSettings.swift +++ b/QuickLocation/Manager/App/AppSettings.swift @@ -46,6 +46,8 @@ class AppSettings: NSObject { public static let kAppsAlipayAppId = "" /// 个推 public static let kAppsGeTuiAppId = "cYHNI4KThh6SxZUsf9RiU2" + /// 友盟 + public static let kAppsUMengAppKey = "6a55f05e6f259537c7c960d7" } diff --git a/QuickLocation/Manager/MQTT/MQTTService.swift b/QuickLocation/Manager/MQTT/MQTTService.swift index d217bfa8..e6941427 100644 --- a/QuickLocation/Manager/MQTT/MQTTService.swift +++ b/QuickLocation/Manager/MQTT/MQTTService.swift @@ -8,7 +8,7 @@ import Foundation import CocoaMQTT import UIKit -import _LocationEssentials +import CoreLocation // MARK: - MQTT 模型 diff --git a/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png b/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png new file mode 100644 index 00000000..43cedf11 Binary files /dev/null and b/QuickLocation/Resource/lotties/emoji/fun/png/1-001.png differ diff --git a/QuickLocation/Section/Home/InteractionEmojiCell.swift b/QuickLocation/Section/Home/InteractionEmojiCell.swift index 76a14aa1..bfd27aa4 100644 --- a/QuickLocation/Section/Home/InteractionEmojiCell.swift +++ b/QuickLocation/Section/Home/InteractionEmojiCell.swift @@ -23,6 +23,7 @@ final class InteractionEmojiCell: UICollectionViewCell { ] static let funPngMap: [String: String] = [ + "fun_1": "1-001", "fun_10": "10-020", "fun_11": "11-043", "fun_13": "13-005", "fun_14": "14-145", "fun_15": "15-073", "fun_16": "16-031", "fun_17": "17-034", "fun_18": "18-092", "fun_19": "19-124", "fun_2": "2-002", "fun_3": "3-029", "fun_4": "4-005", @@ -68,6 +69,8 @@ final class InteractionEmojiCell: UICollectionViewCell { let path = Bundle.main.path(forResource: "\(pngName)", ofType: "png") { imageView.image = UIImage(contentsOfFile: path) } + + guard AppContextManager.shared.systemConfig?.isIntercept == false else { return } lockView.isHidden = name.hasPrefix("normal_") || AppContextManager.shared.vip > 1 } } diff --git a/QuickLocation/Section/Web/Controller/WebViewController.swift b/QuickLocation/Section/Web/Controller/WebViewController.swift index 14ab6679..25a2c890 100644 --- a/QuickLocation/Section/Web/Controller/WebViewController.swift +++ b/QuickLocation/Section/Web/Controller/WebViewController.swift @@ -543,7 +543,7 @@ class FullscreenWebView: WKWebView { func openPage(body: Any) { guard let body = body as? [String: Any], let pageName = body["pageName"] as? String else { return } - if let class_VC = NSClassFromString("dinoGo.\(pageName)") as? BaseViewController.Type { + if let class_VC = NSClassFromString("QuickLocation.\(pageName)") as? BaseViewController.Type { let vc = class_VC.init() navigationController?.pushViewController(vc, animated: true) }