diff --git a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj index 69f63c5..e444389 100644 --- a/SwiftProject/SwiftProject.xcodeproj/project.pbxproj +++ b/SwiftProject/SwiftProject.xcodeproj/project.pbxproj @@ -1028,7 +1028,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.4; + CURRENT_PROJECT_VERSION = 1.0; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; @@ -1057,7 +1057,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4; + MARKETING_VERSION = 1.5; OTHER_CFLAGS = ""; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; @@ -1081,7 +1081,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.4; + CURRENT_PROJECT_VERSION = 1.0; DEVELOPMENT_TEAM = 8DQD6BV6H9; ENABLE_APP_SANDBOX = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1109,7 +1109,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.4; + MARKETING_VERSION = 1.5; OTHER_CFLAGS = ""; OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS"; PRODUCT_BUNDLE_IDENTIFIER = com.nsk.tdvideo; diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index 4659eb1..52bef08 100644 Binary files a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate and b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 019be34..001473c 100644 --- a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -679,6 +679,38 @@ endingLineNumber = "169" landmarkName = "show(praiseCallback:negativeCallback:)" landmarkType = "9"> + + + + + + 0 { + return [getDatasourceOneSection(), getDatasourceTwoSection(), getDatasourceThreeSection()] + } + else { + return [getDatasourceOneSection(), getDatasourceTwoSection()] + } } } @@ -52,7 +58,7 @@ class MenuVC: BaseController,UITableViewDelegate,UITableViewDataSource { func configureUI() { self.navLine?.isHidden = true self.setLeftOneBtnImg(imgStr: "menuvc_backbtn") - self.leftBtn1?.addTarget(self, action: #selector(dismissVC(sender: )), for: .touchUpInside) +// self.leftBtn1?.addTarget(self, action: #selector(dismissVC(sender: )), for: .touchUpInside) self.view.backgroundColor = UIColor(r: 6, g: 5, b: 7, a: 1) let topView = topView() self.view.addSubview(topView) @@ -151,10 +157,10 @@ class MenuVC: BaseController,UITableViewDelegate,UITableViewDataSource { let config = FirebaseRemoteConfig.RemoteConfig.remoteConfig() let menuParams = config.configValue(forKey: "menuParams") guard let dicInfo = menuParams.jsonValue as? [String:Any] else { - return [["":""]] + return [] } guard let contactConfig = dicInfo["contactConfig"] as? [String:Any] else { - return [["":""]] + return [] } diff --git a/SwiftProject/SwiftProject/remote_config_defaults.plist b/SwiftProject/SwiftProject/remote_config_defaults.plist index 3c16f74..e064cdf 100644 --- a/SwiftProject/SwiftProject/remote_config_defaults.plist +++ b/SwiftProject/SwiftProject/remote_config_defaults.plist @@ -3,6 +3,6 @@ menuParams - {"contactConfig":{"default":[{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/wechat.png","title":"WeChat","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/tencent.png","title":"Tencent QQ","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/email.png","title":"Email","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/telegram.png","title":"Telegram","url":"mailto://fangaoqdi@163.com"}],"zh":[{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/wechat.png","title":"WeChat","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/tencent.png","title":"Tencent QQ","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/email.png","title":"Email","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/telegram.png","title":"Telegram","url":"mailto://fangaoqdi@163.com"}]}} + {"contactConfig":{"default":[{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/wechat.png","title":"WeChat","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/tencent.png","title":"Tencent QQ","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/email.png","title":"Email","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/telegram.png","title":"Telegram","url":"mailto://fangaoqdi@163.com"}],"zh":[{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/wechat.png","title":"WeChat","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/tencent.png","title":"Tencent QQ","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/email.png","title":"Email","url":"mailto://fangaoqdi@163.com"},{"icon":"https://resource-sg-public.obs.ap-southeast-3.myhuaweicloud.com/vpcamera/telegram.png","title":"Telegram","url":"mailto://fangaoqdi@163.com"}]},"isOnline":0} \ No newline at end of file