diff --git a/SwiftProject/Podfile b/SwiftProject/Podfile index 8cb86de..2023b98 100644 --- a/SwiftProject/Podfile +++ b/SwiftProject/Podfile @@ -48,4 +48,5 @@ pod 'FirebaseFirestore' pod 'FacebookCore' pod 'FirebaseRemoteConfig' pod 'KeychainAccess' +pod 'SDWebImage' end diff --git a/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate b/SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/UserInterfaceState.xcuserstate index d00e8e5..278d855 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/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Contents.json new file mode 100644 index 0000000..34761cb --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group_1597880421.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group_1597880421@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group_1597880421@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421.png new file mode 100644 index 0000000..8417053 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@2x.png new file mode 100644 index 0000000..5583a3a Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@3x.png new file mode 100644 index 0000000..456b52a Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_feedback.imageset/Group_1597880421@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Contents.json new file mode 100644 index 0000000..6e79a78 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group_1597880413.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group_1597880413@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group_1597880413@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413.png new file mode 100644 index 0000000..3724ff3 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@2x.png new file mode 100644 index 0000000..12b4fc8 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@3x.png new file mode 100644 index 0000000..740fbfa Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_privacy.imageset/Group_1597880413@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Contents.json new file mode 100644 index 0000000..db7da00 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group_1597880409.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group_1597880409@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group_1597880409@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409.png new file mode 100644 index 0000000..fabc8e3 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@2x.png new file mode 100644 index 0000000..1247445 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@3x.png new file mode 100644 index 0000000..868768c Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_sharevpcamera.imageset/Group_1597880409@3x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Contents.json b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Contents.json new file mode 100644 index 0000000..e619392 --- /dev/null +++ b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group_1597880414.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group_1597880414@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group_1597880414@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414.png new file mode 100644 index 0000000..6d8a4a1 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@2x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@2x.png new file mode 100644 index 0000000..b857609 Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@2x.png differ diff --git a/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@3x.png b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@3x.png new file mode 100644 index 0000000..e30e17d Binary files /dev/null and b/SwiftProject/SwiftProject/Assets.xcassets/mine/menuvc/menuvc_terms.imageset/Group_1597880414@3x.png differ diff --git a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift index c1965ae..60b84eb 100644 --- a/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift +++ b/SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift @@ -135,24 +135,44 @@ class MenuVC: BaseController,UITableViewDelegate,UITableViewDataSource { //数据源第一组（Share VPCamera And Feedback）,key值为image、title private func getDatasourceOneSection () -> [[String:Any]] { return [ - ["image":UIImage(named: "")!, "title":NSLocalizedString("v1.5_share vpcamera", comment: "")], - ["image":UIImage(named: "")!, "title":NSLocalizedString("v1.5_feedback", comment: "")] + ["image":UIImage(named: "menuvc_sharevpcamera")!, "title":NSLocalizedString("v1.5_share vpcamera", comment: "")], + ["image":UIImage(named: "menuvc_feedback")!, "title":NSLocalizedString("v1.5_feedback", comment: "")] ] } //数据源第二组（Privacy Policy And Terms of Service）,key值为image、title private func getDatasourceTwoSection () -> [[String:Any]] { return [ - ["image":UIImage(named: "")!, "title":NSLocalizedString("v1.5_privacy policy", comment: "")], - ["image":UIImage(named: "")!, "title":NSLocalizedString("v1.5_terms of service", comment: "")] + ["image":UIImage(named: "menuvc_privacy")!, "title":NSLocalizedString("v1.5_privacy policy", comment: "")], + ["image":UIImage(named: "menuvc_terms")!, "title":NSLocalizedString("v1.5_terms of service", comment: "")] ] } //数据源第三组，网络获取，key值为 image、title、url private func getDatasourceThreeSection () -> [[String:Any]] { - let url = URL(string: "XXXXXX") + let config = FirebaseRemoteConfig.RemoteConfig.remoteConfig() + let menuParams = config.configValue(forKey: "menuParams") + guard let dicInfo = menuParams.jsonValue as? [String:Any] else { + return [["":""]] + } + guard let contactConfig = dicInfo["contactConfig"] as? [String:Any] else { + return [["":""]] + } - return [ - ["image":UIImage(named: ""), "title":"title", "url":"url"] - ] + + var localConfig = contactConfig[NSLocalizedString("menu_lang", comment: "")] as? [[String:Any]] + if localConfig == nil { + localConfig = contactConfig["default"] as? [[String:Any]] + } + var dataDictionary:[[String:Any]] = [] + localConfig?.forEach({ item in + + let iconUrl = item["icon"] as! String + let title = item["title"] as! String + let jumpUrl = item["url"] as! String + + dataDictionary.append(["image":UIImage(named: ""), "title":item["title"] as! String, "url":item["url"] as! String]) + }) + + return dataDictionary } //MARK: - TableViewDelegate and DataSource diff --git a/SwiftProject/SwiftProject/en.lproj/Localizable.strings b/SwiftProject/SwiftProject/en.lproj/Localizable.strings index e1b90f0..c17d30b 100644 --- a/SwiftProject/SwiftProject/en.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/en.lproj/Localizable.strings @@ -122,13 +122,14 @@ "v1.5_negative" = "Negative"; "v1.5_feedbackdesc" = "Do you like VPCamera?\nPlease rate a Five star or give a feed\n back to us"; //V1.5版本，用于功能集合页 -"v1.5_share vpcamera" = "Share VPCamera" -"v1.5_feedback" = "Feedback" -"v1.5_privacy policy" = "Privacy Policy" -"v1.5_terms of service" = "Terms of Service" -"v1.5_contact us" = "Contact us" -"v1.5_problem/suggestion placeholder" = "Please let us kno'w your prablems or suggestions. Our service team will deal with it soon." -"v1.5_problem/suggestion title" = "Problem/Suggestion description" -"v1.5_contact information placeholder" = "Please @xxxx.com" -"v1.5_contact information title" = "Contact information" -"v1.5_submit" = "Submit" +"v1.5_share vpcamera" = "Share VPCamera"; +"v1.5_feedback" = "Feedback"; +"v1.5_privacy policy" = "Privacy Policy"; +"v1.5_terms of service" = "Terms of Service"; +"v1.5_contact us" = "Contact us"; +"v1.5_problem/suggestion placeholder" = "Please let us kno'w your prablems or suggestions. Our service team will deal with it soon."; +"v1.5_problem/suggestion title" = "Problem/Suggestion description"; +"v1.5_contact information placeholder" = "Please @xxxx.com"; +"v1.5_contact information title" = "Contact information"; +"v1.5_submit" = "Submit"; +"menu_lang" = "en"; diff --git a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings index 91648a1..4472cc5 100644 --- a/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings +++ b/SwiftProject/SwiftProject/zh-Hans.lproj/Localizable.strings @@ -118,13 +118,14 @@ "右侧亮度循环按键" ="右侧亮度循环按键\n长按 3s 切换 HSBS\n长按 7s 切换 FSBS"; //V1.5版本，用于功能集合页 -"v1.5_share vpcamera" = "分享 VPCamera" -"v1.5_feedback" = "反馈意见" -"v1.5_privacy policy" = "隐私政策" -"v1.5_terms of service" = "服务条款" -"v1.5_contact us" = "联系我们" -"v1.5_problem/suggestion title" = "问题/建议描述" -"v1.5_problem/suggestion placeholder" = "请告知我们您的问题或建议。我们的服务团队将尽快处理。" -"v1.5_contact information title" = "联系信息" -"v1.5_contact information placeholder" = "请输入 @xxxx.com" -"v1.5_submit" = "提交" +"v1.5_share vpcamera" = "分享 VPCamera"; +"v1.5_feedback" = "反馈意见"; +"v1.5_privacy policy" = "隐私政策"; +"v1.5_terms of service" = "服务条款"; +"v1.5_contact us" = "联系我们"; +"v1.5_problem/suggestion title" = "问题/建议描述"; +"v1.5_problem/suggestion placeholder" = "请告知我们您的问题或建议。我们的服务团队将尽快处理。"; +"v1.5_contact information title" = "联系信息"; +"v1.5_contact information placeholder" = "请输入 @xxxx.com"; +"v1.5_submit" = "提交"; +"menu_lang" = "zh";