V 1.5 (1.0)

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;

SwiftProject/SwiftProject.xcworkspace/xcuserdata/aaa.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -679,6 +679,38 @@
             endingLineNumber = "169"
             landmarkName = "show(praiseCallback:negativeCallback:)"
             landmarkType = "9">
+            <Locations>
+               <Location
+                  uuid = "B6E2DD19-CC45-4EF2-94A7-8DFC039BBE5E - 8f11d5983f12631c"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "static SwiftProject.FeedbackView.show(praiseCallback: () -&gt; (), negativeCallback: () -&gt; ()) -&gt; ()"
+                  moduleName = "SwiftProject"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/View/FeedbackView/FeedbackView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "155"
+                  endingLineNumber = "155"
+                  offsetFromSymbolStart = "264">
+               </Location>
+               <Location
+                  uuid = "B6E2DD19-CC45-4EF2-94A7-8DFC039BBE5E - 8f11d5983f121d73"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "static SwiftProject.FeedbackView.show(praiseCallback: () -&gt; (), negativeCallback: () -&gt; ()) -&gt; ()"
+                  moduleName = "SwiftProject"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/aaa/Documents/IOS%20Dev/VR/SwiftProject/SwiftProject/Project/View/FeedbackView/FeedbackView.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "170"
+                  endingLineNumber = "170"
+                  offsetFromSymbolStart = "264">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy

SwiftProject/SwiftProject/Project/Controller/MenuVC/FeedBackVC.swift

@@ -60,7 +60,7 @@ class FeedBackVC: BaseController, UITextViewDelegate, UITextFieldDelegate {
         super.viewDidLoad()
         navLine?.isHidden = true
         setLeftOneBtnImg(imgStr: "menuvc_backbtn")
-        leftBtn1?.addTarget(self, action: #selector(popVC(_ :)), for: .touchUpInside)
+//        leftBtn1?.addTarget(self, action: #selector(popVC(_ :)), for: .touchUpInside)
         self.view.backgroundColor = UIColor(r: 6, g: 5, b: 7, a: 1)
         //设置标题
         titleLab?.isHidden = false

SwiftProject/SwiftProject/Project/Controller/MenuVC/MenuVC.swift

@@ -15,7 +15,13 @@ class MenuVC: BaseController,UITableViewDelegate,UITableViewDataSource {
     static let kMenuVCCell_identifier = "kMenuVCCell_identifier"
     var dataSource:[[[String:Any]]]{
         get {
-            [getDatasourceOneSection(), getDatasourceTwoSection(), getDatasourceThreeSection()]
+            let tempDic = getDatasourceThreeSection()
+            if tempDic.count > 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 []
         }
         
         

SwiftProject/SwiftProject/remote_config_defaults.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
   <key>menuParams</key>
-  <string>{"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"}]}}</string>
+  <string>{"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}</string>
 </dict>
 </plist>