Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveMateCode

# Conflicts: # metaCode.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveMateCode
# Conflicts: # metaCode.xcodeproj/project.pbxproj
niudaojian
2 parents 2fc6f675 b617f1f7
Showing 67 changed files with 2258 additions and 35 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseMoel.swift
metaCode/Classes/CustomView/CNLiveAlertTool.swift
metaCode/Classes/CNLiveHotButton.swift → metaCode/Classes/CustomView/CNLiveHotButton.swift
metaCode/Classes/CNLiveTips.swift → metaCode/Classes/CustomView/CNLiveTips.swift
metaCode/Classes/Extensions/NSObject+CNLiveCurrentVC.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveHelpFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineNickViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveTypeFeedBackViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
@@ -28,6 +28,8 @@ target &#39;metaCode&#39; do
   pod 'HandyJSON'
   #轻量级缓存工具
   pod 'SwiftyUserDefaults'
+  #图片视频选择器
+  pod 'HXPHPicker'
   #加载GIF
   pod 'SwiftGifOrigin', '~> 1.7.0'
@@ -16,16 +16,16 @@
 		790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01992A2DCAE400C5978D /* CNLiveViewController.swift */; };
 		790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */; };
 		790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D019E2A2DD66E00C5978D /* CNLiveLoginViewModel.swift */; };
-		790D01A12A2DD69200C5978D /* CNLiveTips.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A02A2DD69200C5978D /* CNLiveTips.swift */; };
 		790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */; };
 		790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */; };
 		790D01A72A2DF84C00C5978D /* countries.plist in Resources */ = {isa = PBXBuildFile; fileRef = 790D01A62A2DF84C00C5978D /* countries.plist */; };
 		79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */; };
 		79282A3E2A2EFDA000B5F8CF /* CNLiveLoginModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3D2A2EFDA000B5F8CF /* CNLiveLoginModel.swift */; };
 		79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */; };
-		79282A422A2F173300B5F8CF /* CNLiveHotButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A412A2F173300B5F8CF /* CNLiveHotButton.swift */; };
 		79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */; };
 		79282A462A2F457D00B5F8CF /* CNLiveMineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */; };
+		79396EED2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */; };
+		79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
 		798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */; };
@@ -34,10 +34,20 @@
 		798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */; };
 		798A44F02A305BC200815935 /* UIButton+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */; };
 		798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */; };
+		798A44F62A3077ED00815935 /* CNLiveTips.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F42A3077ED00815935 /* CNLiveTips.swift */; };
+		798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F52A3077ED00815935 /* CNLiveHotButton.swift */; };
+		798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */; };
+		798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FA2A30999900815935 /* CNLiveAlertTool.swift */; };
+		798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */; };
+		798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
 		7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
+		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
+		79F4B1182A32C5FA00993C03 /* CNLiveBaseMoel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */; };
+		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
+		79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
 		7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */; };
 		7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */; };
@@ -95,16 +105,16 @@
 		790D01992A2DCAE400C5978D /* CNLiveViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveViewController.swift; sourceTree = "<group>"; };
 		790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+CNGradient.swift"; sourceTree = "<group>"; };
 		790D019E2A2DD66E00C5978D /* CNLiveLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginViewModel.swift; sourceTree = "<group>"; };
-		790D01A02A2DD69200C5978D /* CNLiveTips.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTips.swift; sourceTree = "<group>"; };
 		790D01A22A2DDBA300C5978D /* CNLiveConfigManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigManager.swift; sourceTree = "<group>"; };
 		790D01A42A2DF65E00C5978D /* CNLiveLoginPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginPickerView.swift; sourceTree = "<group>"; };
 		790D01A62A2DF84C00C5978D /* countries.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = countries.plist; sourceTree = "<group>"; };
 		79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		79282A3D2A2EFDA000B5F8CF /* CNLiveLoginModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginModel.swift; sourceTree = "<group>"; };
 		79282A3F2A2F055100B5F8CF /* CNLiveConfigUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigUserInfo.swift; sourceTree = "<group>"; };
-		79282A412A2F173300B5F8CF /* CNLiveHotButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHotButton.swift; sourceTree = "<group>"; };
 		79282A432A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveLoginAuthView.swift; sourceTree = "<group>"; };
 		79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewController.swift; sourceTree = "<group>"; };
+		79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSObject+CNLiveCurrentVC.swift"; sourceTree = "<group>"; };
+		79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInfoShowViewController.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
 		798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineHeaderView.swift; sourceTree = "<group>"; };
@@ -113,9 +123,19 @@
 		798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseNavigationController.swift; sourceTree = "<group>"; };
 		798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+CNLiveExtension.swift"; sourceTree = "<group>"; };
 		798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineSubBodyListView.swift; sourceTree = "<group>"; };
+		798A44F42A3077ED00815935 /* CNLiveTips.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveTips.swift; sourceTree = "<group>"; };
+		798A44F52A3077ED00815935 /* CNLiveHotButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveHotButton.swift; sourceTree = "<group>"; };
+		798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveHelpFeedBackViewController.swift; sourceTree = "<group>"; };
+		798A44FA2A30999900815935 /* CNLiveAlertTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlertTool.swift; sourceTree = "<group>"; };
+		798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTypeFeedBackViewController.swift; sourceTree = "<group>"; };
+		798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInputFeedBackViewController.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
 		7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
+		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
+		79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseMoel.swift; sourceTree = "<group>"; };
+		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
+		79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoAlertView.swift; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
 		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
 		7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBackgroupView.swift; sourceTree = "<group>"; };
@@ -200,6 +220,7 @@
 				790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */,
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */,
+				79396EEC2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -263,6 +284,12 @@
 			children = (
 				79282A452A2F457D00B5F8CF /* CNLiveMineViewController.swift */,
 				798A44EB2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift */,
+				798A44F82A30835400815935 /* CNLiveHelpFeedBackViewController.swift */,
+				798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */,
+				798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */,
+				79396EF02A31C21B0053E1AF /* CNLiveInfoShowViewController.swift */,
+				79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */,
+				79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -271,7 +298,7 @@
 			isa = PBXGroup;
 			children = (
 				7C2703312A36CC430061EC50 /* GlobalBlock */,
-				7C4931322A3076BE000E44B4 /* CustomView */,
+				798A44F32A3077ED00815935 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
 				7CD675502A29C036008354C1 /* Constant */,
 				796398912A260C0100D045EB /* Common */,
@@ -362,6 +389,7 @@
 				7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */,
 				7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */,
 				798A44ED2A305AAC00815935 /* CNLiveBaseNavigationController.swift */,
+				79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */,
 			);
 			path = Base;
 			sourceTree = "<group>";
@@ -372,6 +400,7 @@
 				798A44E72A30134400815935 /* CNLiveMineHeaderView.swift */,
 				798A44E92A30135D00815935 /* CNLiveMineBodyListView.swift */,
 				798A44F12A30674200815935 /* CNLiveMineSubBodyListView.swift */,
+				79F4B11B2A33036E00993C03 /* CNLiveMineInfoAlertView.swift */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -391,13 +420,14 @@
 			path = GlobalBlock;
 			sourceTree = "<group>";
 		};
-		7C4931322A3076BE000E44B4 /* CustomView */ = {
+		798A44F32A3077ED00815935 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
-				79282A412A2F173300B5F8CF /* CNLiveHotButton.swift */,
-				790D01A02A2DD69200C5978D /* CNLiveTips.swift */,
+				798A44F42A3077ED00815935 /* CNLiveTips.swift */,
+				798A44F52A3077ED00815935 /* CNLiveHotButton.swift */,
+				798A44FA2A30999900815935 /* CNLiveAlertTool.swift */,
 			);
-			name = CustomView;
+			path = CustomView;
 			sourceTree = "<group>";
 		};
 		7CD675212A26F844008354C1 /* HomePage */ = {
@@ -746,8 +776,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */,
+				79F4B11C2A33036E00993C03 /* CNLiveMineInfoAlertView.swift in Sources */,
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
+				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
+				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
@@ -755,23 +788,29 @@
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
+				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
 				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
-				790D01A12A2DD69200C5978D /* CNLiveTips.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
+				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
+				798A44F62A3077ED00815935 /* CNLiveTips.swift in Sources */,
+				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
+				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
+				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
 				79282A3E2A2EFDA000B5F8CF /* CNLiveLoginModel.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
+				79396EED2A319F220053E1AF /* NSObject+CNLiveCurrentVC.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
@@ -781,8 +820,9 @@
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
 				7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */,
+				79F4B1182A32C5FA00993C03 /* CNLiveBaseMoel.swift in Sources */,
+				79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */,
 				7CD6753F2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift in Sources */,
-				79282A422A2F173300B5F8CF /* CNLiveHotButton.swift in Sources */,
 				7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */,
 				798A44E82A30134400815935 /* CNLiveMineHeaderView.swift in Sources */,
 				7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */,
+//
+//  CNLiveBaseMoel.swift
+//  metaCode
+//
+//  Created by open on 2023/6/9.
+//
+
+import Foundation
+import HandyJSON
+
+class BaseModel: HandyJSON {
+    
+    required init() {}
+    
+    func mapping(mapper: HelpingMapper) {
+        
+    }
+}
+//
+//  CNLiveAlertTool.swift
+//  metaCode
+//
+//  Created by open on 2023/6/7.
+//
+
+import Foundation
+
+class AlertTool: NSObject {
+    
+    /// 快速创建系统AlertController：包括Alert 和 ActionSheet，带颜色
+    /// - Parameters:
+    ///   - title: 标题文字
+    ///   - message: 消息体文字
+    ///   - actionTitles: 可选择点击的按钮文字（不包括取消）
+    ///   - cancelTitle: 取消按钮文字
+    ///   - style: 类型：Alert 或者 ActionSheet
+    ///   - actionStyles: 按钮颜色类型（与actionTitles长度一致生效）
+    ///   - completion: 完成点击按钮之后的回调（取消按钮的index 为 0 ，其他按钮的index从上往下依次为 1、2、3...）
+    static func showSystemAlert(title:String?, message:String?, actionTitles:Array<String>, cancelTitle:String="", style:UIAlertController.Style, actionStyles:Array<UIAlertAction.Style>=[], completion: @escaping ((_ index: Int) -> ())) {
+        
+        let vc = UIApplication.shared.keyWindow?.rootViewController
+        vc?.dismiss(animated: false)
+        
+        DispatchQueue.main.async {
+            let alertController = UIAlertController(title: title, message: message, preferredStyle: style)
+            for i in 0 ..< actionTitles.count {
+                let action = UIAlertAction(title: actionTitles[i], style: actionTitles.count == actionStyles.count ? actionStyles[i]: .default) { action in
+                    completion(i+1)
+                }
+                alertController.addAction(action)
+            }
+            if (!cancelTitle.isEmpty) {
+                let cancel = UIAlertAction(title: cancelTitle, style: .cancel) { action in
+                    completion(0)
+                }
+                alertController.addAction(cancel)
+            }
+            vc?.present(alertController, animated: true, completion: nil)
+        }
+    }
+    
+    /// 快速创建系统AlertController：包括Alert 和 ActionSheet
+    static func showSystemAlert(title:String="", message:String="", actionTitles:Array<String>, cancelTitle:String="", style:UIAlertController.Style, completion: @escaping ((_ index: Int) -> ())) {
+        AlertTool.showSystemAlert(title: title, message: message, actionTitles: actionTitles, cancelTitle: cancelTitle, style: style, actionStyles: []) { index in
+            completion(index)
+        }
+    }
+    
+    /// 快速创建系统Alert弹框（取消按钮的index 为 0 ，确认为1）
+    static func systemAlert(title:String="", message:String="", cancelTitle:String="取消", confirmTitle:String="确认", handler: @escaping ((_ index: Int) -> ())) {
+        AlertTool.showSystemAlert(title: title, message: message, actionTitles: [confirmTitle], cancelTitle: cancelTitle, style: .alert) { index in
+            handler(index)
+        }
+    }
+    
+    /// 快速创建系统ActionSheet弹框（取消按钮的index 为 0 ，其他按钮的index从上往下依次为 1、2、3...）
+    static func systemActionSheet(title:String?, message:String?, actionTitles:Array<String>, cancelTitle:String="取消", handler: @escaping ((_ index: Int) -> ())) {
+        AlertTool.showSystemAlert(title: title, message: message, actionTitles: actionTitles, cancelTitle: cancelTitle, style: .actionSheet) { index in
+            handler(index)
+        }
+    }
+    
+}
+//
+//  NSObject+CNLiveCurrentVC.swift
+//  metaCode
+//
+//  Created by open on 2023/6/8.
+//
+
+import Foundation
+
+func currentViewController() -> (UIViewController?) {
+   var window = UIApplication.shared.keyWindow
+   if window?.windowLevel != UIWindow.Level.normal{
+     let windows = UIApplication.shared.windows
+     for  windowTemp in windows{
+       if windowTemp.windowLevel == UIWindow.Level.normal{
+          window = windowTemp
+          break
+        }
+      }
+    }
+   let vc = window?.rootViewController
+   return currentVC(vc)
+}
+
+private func currentVC(_ vc :UIViewController?) -> UIViewController? {
+   if vc == nil {
+      return nil
+   }
+   if let presentVC = vc?.presentedViewController {
+      return currentVC(presentVC)
+   }
+   else if let tabVC = vc as? UITabBarController {
+      if let selectVC = tabVC.selectedViewController {
+          return currentVC(selectVC)
+       }
+       return nil
+    }
+    else if let naiVC = vc as? UINavigationController {
+       return currentVC(naiVC.visibleViewController)
+    }
+    else {
+       return vc
+    }
+ }
@@ -75,7 +75,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         setNeedsStatusBarAppearanceUpdate()
-        
+        view.backgroundColor = .white
         //添加主视图
         self.view.addSubview(self.headerView)
         self.headerView.snp.makeConstraints { make in
@@ -224,7 +224,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         let i_Range = NSRange(attributedString.string.range(of: "《个人信息保护政策》")!, in: attributedString.string)
         attributedString.addAttribute(.link, value: "info://", range: i_Range)
         let textView: UITextView = UITextView.init()
-        textView.backgroundColor = .white
+        textView.backgroundColor = .clear
         textView.isEditable = false
         textView.isScrollEnabled = false
         textView.delegate = self
@@ -6,10 +6,10 @@
 //
 import Foundation
-import HandyJSON
 import SwiftyUserDefaults
+import HandyJSON
-class CNLiveLoginModel : HandyJSON, DefaultsSerializable, Codable {
+class CNLiveLoginModel : BaseModel, DefaultsSerializable, Codable {
     required init() {}
@@ -38,5 +38,16 @@ class CNLiveLoginModel : HandyJSON, DefaultsSerializable, Codable {
     var uid:String = ""
     var wxUid:String = ""
+    override func mapping(mapper: HelpingMapper) {
+        mapper.specify(property: &gender) { rawString -> String in
+            var g = "未知"
+            if rawString == "m" {
+                g = "男"
+            } else {
+                g = "女"
+            }
+            return g
+        }
+    }
 }
+//
+//  CNLiveHelpFeedBackViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/7.
+//
+
+import Foundation
+
+
+class CNLiveHelpFeedBackViewController : CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource {
+    
+    let kCNLiveHelpFeedBackViewCellKey = "kCNLiveHelpFeedBackViewCellKey"
+    
+    lazy var collectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout.init()
+        layout.itemSize = CGSize(width: (KSreenWidth - 45)/2, height: 60)
+        layout.sectionInset = .init(top: 5, left: 15, bottom: 5, right: 15)
+        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView.delegate = self
+        collectionView.dataSource = self
+        collectionView.backgroundColor = .clear
+        collectionView.register(MineFeedBackListCollectViewCell.self, forCellWithReuseIdentifier: kCNLiveHelpFeedBackViewCellKey)
+        return collectionView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        dataArray.add(["image":"mine_add_feed_back_list","name":"反馈"])
+        dataArray.add(["image":"mine_add_custom_service_list","name":"客服"])
+        return dataArray
+    }()
+    
+    override func viewWillAppear(_ animated: Bool) {
+        navigationBarHidden = false
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        titleName = "帮助与反馈"
+        
+        view.addSubview(collectionView)
+        collectionView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.left.bottom.right.equalToSuperview()
+        }
+        
+    }
+    
+}
+
+extension CNLiveHelpFeedBackViewController {
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return dataArray.count
+    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let item = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveHelpFeedBackViewCellKey, for: indexPath) as! MineFeedBackListCollectViewCell
+        let dict = dataArray[indexPath.row] as! Dictionary<String, Any>
+        item.setupWithDataSource(dict: dict)
+        return item
+    }
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForHeaderInSection section: Int) -> CGSize {
+        return CGSize.init(width: KSreenWidth, height: 20)
+    }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if indexPath.row == 0 {
+            self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .feedback), animated: true)
+        }
+        if indexPath.row == 1 {
+            AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["呼叫 010-65832485"]) { index in
+                if index == 1 {
+                    let url: NSURL = NSURL(string: "TEL://010-65832485")!
+                    UIApplication.shared.open(url as URL)
+                }
+            }
+        }
+    }
+    
+}
+ 
+//
+//  CNLiveInfoShowViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/8.
+//
+
+import Foundation
+import YYCategories
+
+enum ListShowInfoType {
+    case service
+    case privacy
+}
+
+class CNLiveInfoShowViewController: CNLiveBaseViewController {
+    
+    var _show_type:ListShowInfoType!
+    init(show_type:ListShowInfoType) {
+       super.init(nibName:nil, bundle:nil)
+        _show_type = show_type
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        navigationBarHidden = false
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        var attrString =  ""
+        switch _show_type {
+        case .service:
+            titleName = "APP用户服务协议"
+            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限。 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
+        case .privacy:
+            titleName = "个人信息保护政策"
+            attrString = "欢迎您使用元码，我们非常重视您的个人信息保护，并采取了有效措施保障您的信息安全，请您充分了解: \n为保障APP账号安全，元码APP需向您申请获取电话状态权限 \n请您务必阅读APP《个人信息保护政策》，以充分了解我们如何处理您的个人信息。"
+        case .none:
+            break
+        }
+        
+        let paraph = NSMutableParagraphStyle()
+        paraph.lineSpacing = 10
+        let attributes = [NSAttributedString.Key.font:Font_16_Fit,
+                          NSAttributedString.Key.paragraphStyle: paraph]
+        let h = attrString.boundingRect(with: CGSize(width: KSreenWidth - 40, height: CGFloat(MAXFLOAT)), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size.height + 40
+        let textView = UITextView.init()
+        textView.attributedText = NSAttributedString(string: attrString, attributes: attributes)
+        textView.textColor = HexColor("#666666")
+        textView.layer.cornerRadius = 10
+        textView.layer.masksToBounds = true
+        textView.textAlignment  = .left
+        textView.contentMode = .scaleAspectFill
+        textView.contentInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        textView.sizeToFit()
+        view.addSubview(textView)
+        textView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(get_system_nav_height() + 10)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(h)
+        }
+    }
+    
+}
+//
+//  CNLiveInputFeedBackViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/7.
+//
+
+import Foundation
+import HXPHPicker
+
+enum InputFeedBackType {
+    case problem
+    case product
+}
+
+let textView_placeholder = "请尽可能详细地输入您遇到的问题，包括时间、问题发生的页面、进行什么样的操作、出现的具体问题和细节，以便我们更快地处理您的问题 (至少5个字)"
+class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDelegate {
+    
+    var _show_type:InputFeedBackType!
+    init(show_type:InputFeedBackType) {
+       super.init(nibName:nil, bundle:nil)
+        _show_type = show_type
+    }
+    
+    lazy var iView: UIView = {
+        let iView = UIView.init()
+        iView.backgroundColor = .white
+        iView.layer.cornerRadius = 10
+        iView.layer.masksToBounds = true
+        return iView
+    }()
+    
+    lazy var p_textView : UITextView = {
+        let p_textView = UITextView.init()
+        p_textView.backgroundColor = .white
+        p_textView.font = BoldFont_16
+        p_textView.text = textView_placeholder
+        p_textView.textColor = HexColor("#C8C8C8")
+        p_textView.delegate = self
+        return p_textView
+    }()
+    
+    lazy var numberLabel : UILabel = {
+        let numberLabel = UILabel.init()
+        numberLabel.text = "0/200"
+        numberLabel.textColor = .black
+        numberLabel.font = Font_14
+        numberLabel.textAlignment = .right
+        return numberLabel
+    }()
+    
+    lazy var photoLabel : UILabel = {
+        let photoLabel = UILabel.init()
+        let mString = NSMutableAttributedString(string: "上传截图 (选填 0/3)")
+        mString.addAttributes([.foregroundColor: UIColor.black,.font: BoldFont_18], range: NSRange(location: 0, length: 4))
+        mString.addAttributes([.foregroundColor: HexColor("#B4B4B4")!,.font: Font_14], range: NSRange(location: 4, length: 9))
+        photoLabel.attributedText = mString
+        return photoLabel
+    }()
+    
+    lazy var photoView: MinePhotoUploadView = {
+        let pView = MinePhotoUploadView.init(frame: .zero)
+        pView.backgroundColor = .clear
+        return pView
+    }()
+    
+    lazy var mobileLabel : UILabel = {
+        let mobileLabel = UILabel.init()
+        let mString = NSMutableAttributedString(string: "联系电话 (选填)")
+        mString.addAttributes([.foregroundColor: UIColor.black,.font: BoldFont_18], range: NSRange(location: 0, length: 4))
+        mString.addAttributes([.foregroundColor: HexColor("#B4B4B4")!,.font: Font_14], range: NSRange(location: 4, length: 5))
+        mobileLabel.attributedText = mString
+        return mobileLabel
+    }()
+    
+    lazy var mobileView: UIView = {
+        let mobileView = UIView.init()
+        mobileView.backgroundColor = .white
+        mobileView.layer.cornerRadius = 10
+        mobileView.layer.masksToBounds = true
+        return mobileView
+    }()
+    
+    lazy var mobileField: UITextField = {
+        let mobileField = UITextField.init()
+        mobileField.backgroundColor = .white
+        mobileField.placeholder = "便于我们与您联系"
+        mobileField.font = BoldFont_16_Fit
+        mobileField.keyboardType = .numberPad
+        mobileField.clearButtonMode = .whileEditing
+        mobileField.layer.cornerRadius = 10
+        mobileField.layer.masksToBounds = true
+        return mobileField
+    }()
+    
+    lazy var sendButton: UIButton = {
+        let sendButton = UIButton(type: .custom)
+        sendButton.setTitle("提  交", for: .normal)
+        sendButton.setTitleColor(.white, for: .normal)
+        sendButton.titleLabel?.font = BoldFont_16_Fit
+        sendButton.layer.cornerRadius = 20
+        sendButton.layer.masksToBounds = true
+        sendButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
+        return sendButton
+    }()
+    
+    required init?(coder aDecoder:NSCoder) {
+       fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        navigationBarHidden = false
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        switch _show_type {
+        case .problem:
+            titleName = "问题反馈"
+        case .product:
+            titleName = "产品建议"
+        case .none:
+            break
+        }
+        
+        view.addSubview(iView)
+        iView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(get_system_nav_height()+10)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(200)
+        }
+        
+        iView.addSubview(p_textView)
+        p_textView.snp.makeConstraints { make in
+            make.top.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.bottom.equalToSuperview().offset(-30)
+        }
+        
+        iView.addSubview(numberLabel)
+        numberLabel.snp.makeConstraints { make in
+            make.left.bottom.equalToSuperview()
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(30)
+        }
+        
+        view.addSubview(photoLabel)
+        photoLabel.snp.makeConstraints { make in
+            make.top.equalTo(iView.snp.bottom).offset(15)
+            make.left.equalToSuperview().offset(10)
+        }
+        
+        view.addSubview(photoView)
+        photoView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(photoLabel.snp.bottom).offset(10)
+            make.height.equalTo((KSreenWidth - 40)/3)
+        }
+        
+        view.addSubview(mobileLabel)
+        mobileLabel.snp.makeConstraints { make in
+            make.top.equalTo(photoView.snp.bottom).offset(15)
+            make.left.equalToSuperview().offset(10)
+        }
+        
+        view.addSubview(mobileView)
+        mobileView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.top.equalTo(mobileLabel.snp.bottom).offset(10)
+            make.height.equalTo(50)
+        }
+        
+        mobileView.addSubview(mobileField)
+        mobileField.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+        }
+        
+        view.addSubview(sendButton)
+        sendButton.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(40)
+        }
+        setupWithSendBtnStatue(statue: false)
+
+    }
+    
+    
+    private func setupWithSendBtnStatue(statue: Bool) {
+        var alpha = 0.3
+        if statue {
+            alpha = 1
+        }
+        sendButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: alpha),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: alpha)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        sendButton.isUserInteractionEnabled = statue
+    }
+    
+    @objc func sendInfoActionMothod() {
+        let array = photoView.selectedImages
+        array.remove("")
+        print("获取的图片:\(array) 内容:\(p_textView.text ?? "") 手机号:\(mobileField.text ?? "")")
+    }
+}
+
+extension CNLiveInputFeedBackViewController {
+    func textViewDidEndEditing(_ textView: UITextView) {
+        if textView.text.lengthOfBytes(using: .utf8) < 1 {
+            textView.text = textView_placeholder
+            textView.textColor = HexColor("#C8C8C8")
+            setupWithSendBtnStatue(statue: false)
+        }
+    }
+    func textViewDidBeginEditing(_ textView: UITextView) {
+        if textView.text == textView_placeholder {
+            textView.text = ""
+            textView.textColor = .black
+            setupWithSendBtnStatue(statue: true)
+        }
+    }
+    func textViewDidChange(_ textView: UITextView) {
+        if textView.text.count > 200 {
+            let selectRang = textView.markedTextRange
+            
+            if let selectRang = selectRang {
+                let position = textView.position(from: (selectRang.start), offset: 0)
+                if position != nil {
+                    return
+                }
+            }
+            
+            let textContent = textView.text ?? ""
+            let textNum = textContent.count
+            
+            if textNum > 200 {
+                textView.text = string_prefix(index: 200, text: textContent)
+            }
+        }
+        numberLabel.text = "\(textView.text.count)/200"
+    }
+    func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        if textView.returnKeyType == .done {
+            if text == "\n" {
+                textView.resignFirstResponder()
+            }
+            return true
+        }
+        return true
+    }
+    
+    private func string_prefix(index: Int, text: String) -> String {
+        if text.count <= index {
+            return text
+        } else {
+            let index = text.index(text.startIndex, offsetBy: index)
+            let str = text.prefix(upTo: index)
+            return String(str)
+        }
+    }
+}
@@ -7,7 +7,7 @@
 import Foundation
-class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource {
+class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, UITableViewDragDelegate, UITableViewDropDelegate {
     let kCNLiveMineInfoLListTableViewIdentifier = "kCNLiveMineInfoLListTableViewIdentifier"
@@ -15,27 +15,45 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         let tableView = UITableView(frame: .zero, style: .plain)
         tableView.delegate = self
         tableView.dataSource = self
+        tableView.dragDelegate = self
+        tableView.dropDelegate = self
         tableView.backgroundColor = HexColor("#F7F8FA")
         tableView.tableFooterView = UIView.init()
         tableView.rowHeight = 100
+        tableView.dragInteractionEnabled = true
+        tableView.contentInsetAdjustmentBehavior = .scrollableAxes
         tableView.separatorStyle = .none
         tableView.register(MineInfoLListTableViewCell.self, forCellReuseIdentifier: kCNLiveMineInfoLListTableViewIdentifier)
         return tableView
     }()
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        dataArray.add(["image":"mine_header_icon_defult_ava","name":"志愿者身份"])
+        dataArray.add(["image":"mine_header_icon_defult_ava","name":"退伍军人身份"])
+        return dataArray
+    }()
+    
     override func viewWillAppear(_ animated: Bool) {
-        self.navigationBarHidden = false
+        navigationBarHidden = false
     }
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.titleName = "添加身份"
+        titleName = "添加身份"
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.equalTo(get_system_nav_height())
             make.left.right.bottom.equalToSuperview()
         }
     }
+    
+    private func dragCell(cell:UITableViewCell?) {
+        if #available(iOS 11.0, *) {
+            /// 当cell在拖拽过程中是否允许交互
+            cell?.userInteractionEnabledWhileDragging = false
+        } else {}
+    }
 }
 extension CNLiveMineAddInfoViewController {
@@ -44,14 +62,45 @@ extension CNLiveMineAddInfoViewController {
         return 1
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return 2
+        return dataArray.count
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineInfoLListTableViewIdentifier) as! MineInfoLListTableViewCell
-        cell.setupWithDataSource(icon: "mine_header_icon_defult_ava", name: "志愿者身份")
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineInfoLListTableViewIdentifier) as? MineInfoLListTableViewCell else{
+            return MineInfoLListTableViewCell()
+        }
+        let dict = dataArray[indexPath.row] as! Dictionary<String, Any>
+        cell.setupWithDataSource(icon: dict["image"] as! String, name: dict["name"] as! String)
+        dragCell(cell: cell)
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 100
     }
+    func tableView(_ tableView: UITableView, itemsForBeginning session: UIDragSession, at indexPath: IndexPath) -> [UIDragItem] {
+        let item = UIDragItem(itemProvider: NSItemProvider(object: UIImage()))
+        return [item]
+    }
+    // MARK: UITableViewDropDelegate
+    func tableView(_ tableView: UITableView, performDropWith coordinator: UITableViewDropCoordinator) {}
+    func tableView(_ tableView: UITableView, dropSessionDidUpdate session: UIDropSession, withDestinationIndexPath destinationIndexPath: IndexPath?) -> UITableViewDropProposal {
+        return UITableViewDropProposal(operation: .move, intent: .insertAtDestinationIndexPath)
+    }
+    func tableView(_ tableView: UITableView, canHandle session: UIDropSession) -> Bool {
+        // Only receive image data
+        return session.canLoadObjects(ofClass: UIImage.self)
+    }
+    //移动cell事件
+    func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath,
+                   to destinationIndexPath: IndexPath) {
+        objc_sync_enter(self)
+//        let dict: Dictionary = dataArray[sourceIndexPath.row] as! Dictionary<String, Any>
+//        dataArray.remove(sourceIndexPath.row)
+//        if destinationIndexPath.row > dataArray.count {
+//            dataArray.append(dict)
+//        } else {
+//            dataArray.insert(dict, at: destinationIndexPath.row)
+//        }
+        objc_sync_exit(self)
+//        tableView.reloadData()
+    }
 }
+//
+//  CNLiveMineInfoViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/9.
+//
+
+import Foundation
+import HXPHPicker
+import Kingfisher
+
+typealias ClickInfoResultBlock = (_ image: UIImage) -> Void
+class CNLiveMineInfoViewController: CNLiveBaseViewController, PhotoPickerControllerDelegate {
+    
+    lazy var imageView: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.backgroundColor = .clear
+        imageView.contentMode = .scaleToFill
+        imageView.image = UIImage(named: "mine_header_icon_defult_ava")
+        imageView.image = _image
+        return imageView
+    }()
+    
+    lazy var changeBtn: UIButton = {
+        let changeBtn = UIButton.init(type: .custom)
+        changeBtn.setTitle("更换头像", for: .normal)
+        changeBtn.setTitleColor(.white, for: .normal)
+        changeBtn.titleLabel?.font = BoldFont_19_Fit
+        changeBtn.layer.cornerRadius = 20
+        changeBtn.layer.masksToBounds = true
+        changeBtn.addTarget(self, action: #selector(changeAvatarAction), for: .touchUpInside)
+        return changeBtn
+    }()
+    
+    lazy var sendBtn: UIButton = {
+        let sendBtn = UIButton.init(type: .custom)
+        sendBtn.setTitle("确认", for: .normal)
+        sendBtn.setTitleColor(.white, for: .normal)
+        sendBtn.titleLabel?.font = BoldFont_19_Fit
+        sendBtn.layer.cornerRadius = 20
+        sendBtn.layer.masksToBounds = true
+        sendBtn.isHidden = true
+        sendBtn.addTarget(self, action: #selector(changeSendAction), for: .touchUpInside)
+        return sendBtn
+    }()
+    
+    lazy var cancelBtn: UIButton = {
+        let cancelBtn = UIButton.init(type: .custom)
+        cancelBtn.setTitle("取消", for: .normal)
+        cancelBtn.setTitleColor(.black, for: .normal)
+        cancelBtn.backgroundColor = .white
+        cancelBtn.layer.cornerRadius = 20
+        cancelBtn.layer.masksToBounds = true
+        cancelBtn.isHidden = true
+        cancelBtn.addTarget(self, action: #selector(changeCancelAction), for: .touchUpInside)
+        return cancelBtn
+    }()
+    
+    var _select_image: UIImage!
+    var _image:UIImage!
+    var reslut: ClickInfoResultBlock
+    init(image:UIImage, result: @escaping ClickInfoResultBlock) {
+        self.reslut = result
+       super.init(nibName:nil, bundle:nil)
+        _image = image
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        view.backgroundColor = .black
+        setNeedsStatusBarAppearanceUpdate()
+        
+        view.addSubview(imageView)
+        imageView.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.height.equalTo(KSreenWidth)
+        }
+        
+        view.addSubview(changeBtn)
+        changeBtn.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight()-20)
+            make.width.equalTo(200)
+            make.height.equalTo(40)
+        }
+        changeBtn.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        
+        view.addSubview(cancelBtn)
+        cancelBtn.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight()-20)
+            make.left.equalToSuperview().offset(20)
+            make.height.equalTo(40)
+            make.width.equalTo((KSreenWidth - 60) * 0.35)
+        }
+        
+        view.addSubview(sendBtn)
+        sendBtn.snp.makeConstraints { make in
+            make.centerY.equalTo(cancelBtn)
+            make.left.equalTo(cancelBtn.snp.right).offset(20)
+            make.height.equalTo(40)
+            make.width.equalTo((KSreenWidth - 60)*0.65)
+        }
+        sendBtn.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+      return .lightContent
+    }
+    
+    @objc func changeCancelAction() {
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    @objc func changeSendAction() {
+        self.reslut(_select_image)
+        self.navigationController?.popViewController(animated: true)
+    }
+    
+    @objc func changeAvatarAction() {
+        var crop = PhotoCroppingConfiguration.init()
+        crop.isRoundCrop = true
+        let configuration = PhotoEditorConfiguration()
+        configuration.state = .cropping
+        configuration.cropping = crop
+        configuration.fixedCropState = true
+        let config = PhotoTools.getWXPickerConfig()
+        config.selectMode = .single
+        config.selectOptions = .photo
+        config.photoEditor = configuration
+        config.maximumSelectedPhotoCount = 1
+        let pickerController = PhotoPickerController(picker: config)
+        pickerController.pickerDelegate = self
+        pickerController.isOriginal = false
+        self.navigationController?.present(pickerController, animated: true, completion: nil)
+    }
+}
+
+extension CNLiveMineInfoViewController {
+    
+    func pickerController(_ pickerController: PhotoPickerController,
+                            didFinishSelection result: PickerResult) {
+        result.getImage { [self] (image, photoAsset, index) in
+            if let image = image {
+                _select_image = image
+            }else {
+                print("failed")
+            }
+        } completionHandler: { [self] (images) in
+            imageView.image = images.first
+            cancelBtn.isHidden = false
+            sendBtn.isHidden = false
+            changeBtn.isHidden = true
+        }
+    }
+}
+//
+//  CNLiveMineNickViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/9.
+//
+
+import Foundation
+
+class CNLiveMineNickViewController: CNLiveBaseViewController, UITextFieldDelegate {
+    
+    
+    lazy var saveButton: UIButton = {
+        let saveButton = UIButton.init(type: .custom)
+        saveButton.frame = CGRect(x: KSreenWidth - 70, y: (get_system_nav_height() - (get_system_statusBar_height() + 25))/2 + get_system_statusBar_height(), width: 60, height: 25)
+        saveButton.setTitle("保存", for: .normal)
+        saveButton.titleLabel?.font = Font_15
+        saveButton.setTitleColor(.white, for: .normal)
+        saveButton.backgroundColor = HexColor("#EBEBEB")
+        saveButton.layer.masksToBounds  = true
+        saveButton.layer.cornerRadius = 5
+        saveButton.addTarget(self, action: #selector(clickSaveAction), for: .touchUpInside)
+        return saveButton
+    }()
+    
+    lazy var mainView: UIView = {
+        let mainView = UIView.init()
+        mainView.backgroundColor = .white
+        mainView.layer.cornerRadius = 8
+        mainView.layer.masksToBounds = true
+        return mainView
+    }()
+    
+    lazy var nickField: UITextField = {
+        let nickFielld = UITextField.init()
+        nickFielld.backgroundColor = .white
+        nickFielld.placeholder = "输入昵称"
+        nickFielld.font = BoldFont_16_Fit
+        nickFielld.delegate = self
+        nickFielld.text = UserInfoManager.shared.userInfo.nickName
+        nickFielld.keyboardType = .default
+        nickFielld.clearButtonMode = .whileEditing
+        return nickFielld
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        titleName = "更改昵称"
+        navigationBarHidden = false
+        topNavView.addSubview(saveButton)
+        
+        view.addSubview(mainView)
+        mainView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.top.equalToSuperview().offset(get_system_nav_height()+10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(50)
+        }
+        
+        mainView.addSubview(nickField)
+        nickField.snp.makeConstraints { make in
+            make.centerX.equalTo(mainView)
+            make.top.equalToSuperview().offset(5)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.bottom.equalToSuperview().offset(-5)
+        }
+        setupWithSendBtnStatue(statue: true)
+    }
+    
+    
+    private func setupWithSendBtnStatue(statue: Bool) {
+        if statue {
+            saveButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        } else {
+            saveButton.setGradient(colors: [UIColor(red: 235/255.0, green: 235/255.0, blue: 235/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 1), endPoint: CGPoint(x: 1, y: 0))
+        }
+        var color: UIColor = UIColor.white
+        if !statue {
+            color = HexColor("#999999")!
+        }
+        saveButton.isUserInteractionEnabled = statue
+        saveButton.setTitleColor(color, for: .normal)
+    }
+    
+    
+    @objc func clickSaveAction() {
+        print("保存")
+    }
+    
+    func textFieldDidBeginEditing(_ textField: UITextField) {
+        if textField == nickField {
+            mainView.layer.borderColor = HexColor("#0066FE")?.cgColor
+            mainView.layer.borderWidth = 1
+            setupWithSendBtnStatue(statue: true)
+        }
+    }
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField == nickField && textField.text?.count == 0 {
+            mainView.layer.borderColor = UIColor.white.cgColor
+            mainView.layer.borderWidth = 1
+            setupWithSendBtnStatue(statue: false)
+        }
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+    
+        if textField.returnKeyType == .done {
+            
+            if string == "\n" {
+                
+                textField.resignFirstResponder()
+            }
+            return true
+        }
+        return true
+    }
+}
+
+
@@ -89,7 +89,7 @@ extension CNLiveMineViewController {
         let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineTwoViewCellIdentifier) as! MineBodyTwoListViewCell
         let array = dataArray[indexPath.section]
         let sub_dict = (array as! Array<Any>)[indexPath.row]
-        cell.setupWithDataSource(dict: sub_dict as! Dictionary<String, Any>)
+        cell.setupWithDataSource(show_type: .feedback,dict: sub_dict as! Dictionary<String, Any>)
         return cell
     }
@@ -103,9 +103,13 @@ extension CNLiveMineViewController {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 1 {
-            let infoVC = CNLiveMineAddInfoViewController.init()
-            infoVC.hidesBottomBarWhenPushed = true;
-            self.navigationController?.pushViewController(infoVC, animated: true)
+            self.navigationController?.pushViewController(CNLiveMineAddInfoViewController.init(), animated: true)
+        }
+        if indexPath.section == 2 && indexPath.row == 0 {
+            self.navigationController?.pushViewController(CNLiveHelpFeedBackViewController.init(), animated: true)
+        }
+        if indexPath.section == 2 && indexPath.row == 1 {
+            self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .setting), animated: true)
         }
     }
+//
+//  CNLiveTypeFeedBackViewController.swift
+//  metaCode
+//
+//  Created by open on 2023/6/7.
+//
+
+import Foundation
+
+
+enum ListShowType {
+    case feedback
+    case setting
+    case privacy
+    case manager
+    case about
+    case info
+}
+
+class CNLiveTypeFeedBackViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource{
+    
+    let kCNLiveMineOneFeedBackViewCellIdentifier = "kCNLiveMineOneFeedBackViewCellIdentifier"
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .grouped)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.backgroundColor = .clear
+        tableView.tableFooterView = UIView.init()
+        tableView.tableHeaderView = UIView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 1))
+        tableView.separatorStyle = .none
+        tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+        tableView.register(MineBodyTwoListViewCell.self, forCellReuseIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier)
+        return tableView
+    }()
+    
+    lazy var dataArray: NSMutableArray = {
+        let dataArray = NSMutableArray()
+        if _show_type == .feedback {
+            dataArray.add(["icon":"mine_list_sub_set_feedback","name":"问题反馈"])
+            dataArray.add(["icon":"mine_list_sub_set_sugges","name":"产品建议"])
+        }
+        if _show_type == .setting {
+            dataArray.add(["icon":"mine_list_sub_set_privacy","name":"隐私"])
+            dataArray.add(["icon":"mine_list_sub_set_about","name":"关于我们"])
+        }
+        if _show_type == .privacy {
+            dataArray.add(["icon":"","name":"系统权限管理"])
+            dataArray.add(["icon":"","name":"个人信息保护政策"])
+        }
+        if _show_type == .manager {
+            dataArray.add(["icon":"mine_list_sub_set_poistion","name":"位置","desc":"用于判断一些内容"])
+            dataArray.add(["icon":"mine_list_sub_set_poistion","name":"位置","desc":"用于判断一些内容"])
+        }
+        if _show_type == .about {
+            dataArray.add(["icon":"","name":"版本更新","more":"当前已经是最新版本"])
+            dataArray.add(["icon":"","name":"APP用户服务协议","more":""])
+        }
+        if _show_type == .info {
+            dataArray.add(["icon":"","name":"头像","more":"","avatar":UserInfoManager.shared.userInfo.bigFaceUrl])
+            dataArray.add(["icon":"","name":"昵称","more":(UserInfoManager.shared.userInfo.nickName.count > 0 ? UserInfoManager.shared.userInfo.nickName : "请输入昵称"),"avatar":""])
+            dataArray.add(["icon":"","name":"性别","more":UserInfoManager.shared.userInfo.gender,"avatar":""])
+            dataArray.add(["icon":"","name":"生日","more":UserInfoManager.shared.userInfo.birthday,"avatar":""])
+        }
+        return dataArray
+    }()
+    
+    lazy var logoutButton: UIButton = {
+        let logoutButton = UIButton.init(type: .custom)
+        logoutButton.setTitle("退出登录", for: .normal)
+        logoutButton.backgroundColor = .white
+        logoutButton.setTitleColor(HexColor("#609BFF"), for: .normal)
+        logoutButton.layer.cornerRadius = 10
+        logoutButton.layer.masksToBounds = true
+        logoutButton.addTarget(self, action: #selector(logoutAction), for: .touchUpInside)
+        return logoutButton
+    }()
+    
+    lazy var headerView: MineAboutHeaderView = {
+        let headerView = MineAboutHeaderView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 200))
+        headerView.backgroundColor = .clear
+        return headerView
+    }()
+    
+    lazy var tipView: UIView = {
+        let tipView = UIView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 90))
+        tipView.backgroundColor = .clear
+        return tipView
+    }()
+    
+    lazy var tipSubView: UIView = {
+        let tipView = UIView.init(frame: CGRect(x: 10, y: 10, width: KSreenWidth-20, height: 70))
+        tipView.backgroundColor = HexColor("#EFF5FF")
+        tipView.layer.cornerRadius = 10
+        tipView.layer.masksToBounds = true
+        return tipView
+    }()
+    
+    lazy var tipLabel: UILabel = {
+        let tipLabel = UILabel.init(frame: CGRect(x: 10, y: 5, width: KSreenWidth - 40, height: 60))
+        let attrString = "为保障您正常使用元码APP部分功能，我们会向您申请手机系统权限，您可对以下权限进行管理。"
+        let paraph = NSMutableParagraphStyle()
+        paraph.lineSpacing = 5
+        let attributes = [NSAttributedString.Key.font:Font_13_Fit,
+                          NSAttributedString.Key.paragraphStyle: paraph]
+        tipLabel.attributedText = NSAttributedString(string: attrString, attributes: attributes)
+        tipLabel.backgroundColor = .clear
+        tipLabel.textColor = HexColor("#609BFF")
+        tipLabel.numberOfLines = 0
+        tipLabel.font = Font_13_Fit
+        tipLabel.lineBreakMode = .byCharWrapping
+        return tipLabel
+    }()
+    
+    var _show_type:ListShowType!
+    init(show_type:ListShowType) {
+       super.init(nibName:nil, bundle:nil)
+        _show_type = show_type
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    override func viewWillAppear(_ animated: Bool) {
+        navigationBarHidden = false
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        switch _show_type {
+        case .feedback:
+            titleName = "反馈类型"
+        case .setting:
+            titleName = "更多设置"
+        case .privacy:
+            titleName = "隐私"
+        case .manager:
+            titleName = "系统权限管理"
+        case .about:
+            titleName = "关于我们"
+        case .info:
+            titleName = "个人信息"
+        case .none:
+            break
+        }
+
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(get_system_nav_height())
+            make.left.right.bottom.equalToSuperview()
+        }
+        
+        if _show_type == .setting {
+            view.addSubview(logoutButton)
+            logoutButton.snp.makeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.left.equalToSuperview().offset(10)
+                make.right.equalToSuperview().offset(-10)
+                make.height.equalTo(45)
+                make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
+            }
+        }
+        if _show_type == .about {
+            tableView.tableHeaderView = headerView
+        }
+        if _show_type == .manager {
+            tipView.addSubview(tipSubView)
+            tipSubView.addSubview(tipLabel)
+            tableView.tableHeaderView = tipView
+        }
+    }
+    
+    @objc func logoutAction() -> Void {
+        AlertTool.systemActionSheet(title: nil, message: nil, actionTitles: ["退出登录"]) { index in
+            if index == 1 {
+                print("退出登录")
+            }
+        }
+    }
+    
+    deinit {
+        
+    }
+    
+}
+
+extension CNLiveTypeFeedBackViewController {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return dataArray.count
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveMineOneFeedBackViewCellIdentifier) as! MineBodyTwoListViewCell
+        let dict = dataArray[indexPath.section] as! NSDictionary
+        cell.setupWithDataSource(show_type: _show_type,dict: dict as! Dictionary<String, Any>)
+        return cell
+        
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        if _show_type == .manager {
+            return 75
+        }
+        if _show_type == .info && indexPath.section == 0 {
+            return 95
+        }
+        return 60
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 10
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if _show_type == .feedback {
+            var show_type = InputFeedBackType.problem
+            if indexPath.section == 0 {
+                show_type = .problem
+            }
+            if indexPath.section == 1 {
+                show_type = .product
+            }
+            self.navigationController?.pushViewController(CNLiveInputFeedBackViewController.init(show_type: show_type), animated: true)
+        }
+        if _show_type == .setting {
+            if indexPath.section == 0 {
+                self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .privacy), animated: true)
+            }
+            if indexPath.section == 1 {
+                self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .about), animated: true)
+            }
+        }
+        if _show_type == .privacy {
+            if indexPath.section == 0 {
+                self.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .manager), animated: true)
+            }
+            if indexPath.section == 1 {
+                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .privacy), animated: true)
+            }
+        }
+        if _show_type == .about {
+            if indexPath.section == 0 {
+                print("跳转app商店")
+            }
+            if indexPath.section == 1 {
+                self.navigationController?.pushViewController(CNLiveInfoShowViewController.init(show_type: .service), animated: true)
+            }
+        }
+        if _show_type == .info {
+            if indexPath.section == 0 {
+                let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
+                let vc = CNLiveMineInfoViewController.init(image: cell.avatarView.image!) { image in
+                    cell.avatarView.image = image
+                }
+                self.navigationController?.pushViewController(vc, animated: true)
+            }
+            if indexPath.section == 1 {
+                let mineInfoVC = CNLiveMineNickViewController.init()
+                self.navigationController?.pushViewController(mineInfoVC, animated: true)
+            }
+            if indexPath.section == 2 {
+                let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
+                MineInfoAlertView.showSelectView(showType: .gender) { text in
+                    cell.moreLabel.text = text
+                }
+            }
+            if indexPath.section == 3 {
+                let cell = tableView.cellForRow(at: indexPath) as! MineBodyTwoListViewCell
+                MineInfoAlertView.showSelectView(showType: .birthday) { text in
+                    cell.moreLabel.text = text
+                }
+            }
+        }
+    }
+}
+
@@ -107,7 +107,7 @@ class MineBodyTwoListViewCell : UITableViewCell {
     lazy var mainView: UIView = {
         let mainView = UIView.init()
         mainView.backgroundColor = .white
-        mainView.layer.cornerRadius = 8
+        mainView.layer.cornerRadius = 15
         mainView.layer.masksToBounds = true
         return mainView
     }()
@@ -124,6 +124,15 @@ class MineBodyTwoListViewCell : UITableViewCell {
         headerView.contentMode = .scaleToFill
         return headerView
     }()
+    lazy var avatarView: UIImageView = {
+        let avatarView = UIImageView.init()
+        avatarView.backgroundColor = .clear
+        avatarView.contentMode = .scaleToFill
+        avatarView.layer.cornerRadius = 30
+        avatarView.layer.masksToBounds = true
+        avatarView.isHidden = true
+        return avatarView
+    }()
     lazy var moreBtn: UIButton = {
         let moreBtn = UIButton.init(type: .custom)
         moreBtn.setImage(UIImage(named: "mine_list_icon_right_more"), for: .normal)
@@ -131,6 +140,23 @@ class MineBodyTwoListViewCell : UITableViewCell {
         moreBtn.layer.cornerRadius = 15
         return moreBtn
     }()
+    lazy var descLabel: UILabel = {
+        let descLabel = UILabel.init()
+        descLabel.textColor = HexColor("#999999")
+        descLabel.font = Font_11_Fit
+        descLabel.backgroundColor = .white
+        descLabel.isHidden = true
+        return descLabel
+    }()
+    lazy var moreLabel: UILabel = {
+        let moreLabel = UILabel.init()
+        moreLabel.textColor = HexColor("#999999")
+        moreLabel.font = Font_11_Fit
+        moreLabel.textAlignment = .right
+        moreLabel.backgroundColor = .white
+        moreLabel.isHidden = true
+        return moreLabel
+    }()
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -141,6 +167,9 @@ class MineBodyTwoListViewCell : UITableViewCell {
         mainView.addSubview(headerView)
         headerView.addSubview(nameLabel)
         mainView.addSubview(moreBtn)
+        mainView.addSubview(descLabel)
+        mainView.addSubview(moreLabel)
+        mainView.addSubview(avatarView)
         setupConstraints()
@@ -154,23 +183,68 @@ class MineBodyTwoListViewCell : UITableViewCell {
             make.top.bottom.equalToSuperview()
         }
         headerView.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(mainView)
             make.left.equalTo(15)
             make.size.equalTo(20)
         }
         nameLabel.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(headerView)
             make.left.equalTo(headerView.snp.right).offset(7)
         }
         moreBtn.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(headerView)
             make.right.equalToSuperview().offset(-15)
-            make.size.equalTo(30)
+            make.height.equalTo(30)
+            make.width.equalTo(15)
+        }
+        descLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview().offset(15)
+            make.left.equalTo(headerView.snp.right).offset(7)
+        }
+        moreLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(headerView)
+            make.right.equalTo(moreBtn.snp.left)
+        }
+        avatarView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(moreBtn.snp.left).offset(-10)
+            make.size.equalTo(60)
         }
     }
-    public func setupWithDataSource(dict : Dictionary<String, Any>) {
-        headerView.image = UIImage(named: dict["icon"] as! String)
+    public func setupWithDataSource(show_type: ListShowType,dict : Dictionary<String, Any>) {
+        let image = dict["icon"] as! String
+        if image == "" {
+            headerView.snp.updateConstraints { make in
+                make.centerY.equalToSuperview()
+                make.left.equalTo(15)
+                make.size.equalTo(0.01)
+            }
+        }else {
+            headerView.image = UIImage(named: image)
+        }
+        if dict.keys.contains("desc") {
+            descLabel.isHidden = false
+            descLabel.text = "\(dict["desc"] ?? "")"
+            headerView.snp.updateConstraints { make in
+                make.centerY.equalTo(mainView).offset(-10)
+                make.left.equalTo(15)
+                make.size.equalTo(20)
+            }
+        }
+        if dict.keys.contains("more") {
+            moreLabel.isHidden =  false
+            if show_type == .info {
+                moreLabel.font = Font_15_Fit
+            }
+            moreLabel.text =  "\(dict["more"] ?? "")"
+            
+           
+        }
+        if (dict.keys.contains("avatar") && (dict["avatar"] as! String).count > 0) {
+            avatarView.isHidden = false
+            avatarView.kf.setImage(with: URL(string: "\(dict["avatar"] ?? "")"), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
+        }
         nameLabel.text = "\(dict["name"] ?? "")"
     }
@@ -6,7 +6,8 @@
 //
 import Foundation
-
+import HXPHPicker
+import Kingfisher
 class MineHeaderView : UIView {
@@ -14,10 +15,15 @@ class MineHeaderView : UIView {
         let iconView = UIImageView.init()
         iconView.image = UIImage(named: "mine_header_icon_defult_ava")
+        iconView.kf.indicatorType = .activity
+        iconView.kf.setImage(with: URL(string: UserInfoManager.shared.userInfo.bigFaceUrl), placeholder: UIImage(named: "mine_header_icon_defult_ava"))
         iconView.backgroundColor = .clear
-        iconView.layer.cornerRadius = 20
+        iconView.layer.cornerRadius = 30
         iconView.layer.masksToBounds = true
         iconView.contentMode = .scaleToFill
+        iconView.isUserInteractionEnabled = true
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(pushMineInfoAction))
+        iconView.addGestureRecognizer(tap)
         return iconView
     }()
@@ -59,7 +65,6 @@ class MineHeaderView : UIView {
             make.right.equalToSuperview().offset(-15)
             make.size.equalTo(30)
         }
-        
     }
     required init?(coder: NSCoder) {
@@ -70,4 +75,195 @@ class MineHeaderView : UIView {
     }
+    @objc func pushMineInfoAction() {
+        currentViewController()?.navigationController?.pushViewController(CNLiveTypeFeedBackViewController.init(show_type: .info), animated: true)
+    }
+}
+
+class MineAboutHeaderView: UIView {
+    
+    lazy var iconView: UIImageView = {
+        let iconView = UIImageView.init()
+        iconView.image = UIImage(named: "mine_sub_about_app_logo")
+        iconView.contentMode = .scaleToFill
+        iconView.backgroundColor = .clear
+        return iconView
+    }()
+    
+    lazy var nameLabel: UILabel = {
+        let nameLabel = UILabel.init()
+        nameLabel.text = "\(kAppDisplayName)"
+        nameLabel.textColor = HexColor("#333333")
+        nameLabel.font = BoldFont_18_Fit
+        nameLabel.textAlignment = .center
+        return nameLabel
+    }()
+    
+    lazy var verLabel: UILabel = {
+        let verLabel = UILabel.init()
+        verLabel.text = "YUANMA\(kAppVersion)"
+        verLabel.textColor = HexColor("#333333")
+        verLabel.font = Font_16_Fit
+        verLabel.textAlignment = .center
+        return verLabel
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        addSubview(iconView)
+        addSubview(nameLabel)
+        addSubview(verLabel)
+        
+        iconView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalToSuperview().offset(60)
+            make.size.equalTo(80)
+        }
+        nameLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(iconView.snp.bottom).offset(8)
+        }
+        verLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(nameLabel.snp.bottom).offset(8)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+
+
+typealias ClickResultBlock = (_ array: NSMutableArray) ->Void
+class MinePhotoUploadView: UIView, PhotoPickerControllerDelegate {
+    
+    lazy var imageView01: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.backgroundColor = .white
+        imageView.image = UIImage(named: "mine_sub_quest_addd_image")
+        imageView.contentMode = .scaleAspectFit
+        imageView.isUserInteractionEnabled = true
+        imageView.tag = 1000
+        imageView.layer.cornerRadius = 7
+        imageView.layer.masksToBounds = true
+        let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
+        imageView.addGestureRecognizer(tapGes)
+        return imageView
+    }()
+    
+    lazy var imageView02: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.backgroundColor = .white
+        imageView.image = UIImage(named: "mine_sub_quest_addd_image")
+        imageView.contentMode = .scaleAspectFit
+        imageView.isUserInteractionEnabled = true
+        imageView.tag = 1001
+        imageView.isHidden = true
+        imageView.layer.cornerRadius = 7
+        imageView.layer.masksToBounds = true
+        let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
+        imageView.addGestureRecognizer(tapGes)
+        return imageView
+    }()
+    
+    lazy var imageView03: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.backgroundColor = .white
+        imageView.image = UIImage(named: "mine_sub_quest_addd_image")
+        imageView.contentMode = .scaleAspectFit
+        imageView.isUserInteractionEnabled = true
+        imageView.tag = 1002
+        imageView.isHidden = true
+        imageView.layer.cornerRadius = 7
+        imageView.layer.masksToBounds = true
+        let tapGes = UITapGestureRecognizer.init(target: self, action: #selector(touchImageAction))
+        imageView.addGestureRecognizer(tapGes)
+        return imageView
+    }()
+    
+    lazy var temp_imageView : UIImageView = {
+        return UIImageView.init()
+    }()
+    
+    lazy var selectedImages: NSMutableArray = {
+        let tempArrray = NSMutableArray.init()
+        tempArrray.addObjects(from: ["","",""])
+        return tempArrray
+    }()
+    
+    var resutBlock : ClickResultBlock?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .white
+        
+        addSubview(imageView01)
+        imageView01.snp.makeConstraints { make in
+            make.size.height.equalTo((KSreenWidth - 40)/3)
+            make.top.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+        }
+        addSubview(imageView02)
+        imageView02.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.size.height.equalTo((KSreenWidth - 40)/3)
+            make.size.width.equalTo(imageView02)
+            make.left.equalTo(imageView01.snp.right).offset(10)
+        }
+        addSubview(imageView03)
+        imageView03.snp.makeConstraints { make in
+            make.size.height.equalTo((KSreenWidth - 40)/3)
+            make.size.width.equalTo(imageView02)
+            make.top.equalToSuperview()
+            make.right.equalToSuperview().offset(-10)
+            make.left.equalTo(imageView02.snp.right).offset(10)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc private func touchImageAction(ges: UITapGestureRecognizer) {
+        temp_imageView = ges.view as! UIImageView
+        if selectedImages.object(at: temp_imageView.tag - 1000) is String {
+            let config = PhotoTools.getWXPickerConfig()
+            config.selectMode = .single
+            config.selectOptions = .photo
+            config.maximumSelectedPhotoCount = 3
+            let pickerController = PhotoPickerController(picker: config)
+            pickerController.pickerDelegate = self
+            pickerController.isOriginal = false
+            currentViewController()!.present(pickerController, animated: true, completion: nil)
+        }
+    }
+}
+
+extension MinePhotoUploadView {
+    
+    func pickerController(_ pickerController: PhotoPickerController,
+                            didFinishSelection result: PickerResult) {
+        result.getImage { [self] (image, photoAsset, index) in
+            if let image = image {
+                temp_imageView.image = image
+                if temp_imageView == imageView01 {
+                    imageView02.isHidden = false
+                    selectedImages.replaceObject(at: 0, with: image)
+                }
+                if temp_imageView == imageView02 {
+                    imageView03.isHidden = false
+                    selectedImages.replaceObject(at: 1, with: image)
+                }
+                if temp_imageView == imageView03 {
+                    selectedImages.replaceObject(at: 2, with: image)
+                }
+            }else {
+                print("failed")
+            }
+        } completionHandler: { (images) in
+
+        }
+    }
 }
+
+//
+//  CNLiveMineInfoAlertView.swift
+//  metaCode
+//
+//  Created by open on 2023/6/9.
+//
+
+import Foundation
+
+enum CNLiveMineInfoShowType {
+    case gender
+    case birthday
+}
+
+typealias CloseGenderResultBlock = (_ text: String) ->Void
+class MineInfoAlertView: UIView {
+    
+    lazy var tapGesture = UITapGestureRecognizer()
+    lazy var grayMaskView: UIView = {
+       let grayMaskView = UIView()
+       tapGesture.addTarget(self, action: #selector(setupCloseButtonAction))
+       grayMaskView.backgroundColor = UIColor.black.withAlphaComponent(0.2)
+       grayMaskView.addGestureRecognizer(tapGesture)
+       return grayMaskView
+    }()
+    
+    lazy var backView: UIView = {
+        let backView = UIView()
+        backView.backgroundColor = UIColor.white
+        backView.layer.cornerRadius = 12
+        return backView
+    }()
+    
+    lazy var contentView : UIView = {
+        let contentView = UIView.init()
+        contentView.backgroundColor = .white
+        contentView.isHidden = true
+        return contentView
+    }()
+    
+    lazy var wBtn: UIButton = {
+        let wBtn = UIButton.init(type: .custom)
+        wBtn.backgroundColor = .white
+        wBtn.setImage(UIImage(named: "mine_info_alert_icon_w_nomal"), for: .normal)
+        wBtn.setImage(UIImage(named: "mine_info_alert_icon_w_nomal"), for: .highlighted)
+        wBtn.setImage(UIImage(named: "mine_info_alert_icon_w_select"), for: .selected)
+        wBtn.imageView?.contentMode = .scaleToFill
+        wBtn.layer.cornerRadius = 40
+        wBtn.layer.masksToBounds = true
+        wBtn.addTarget(self, action: #selector(wClickAction), for: .touchUpInside)
+        return wBtn
+    }()
+    
+    lazy var mBtn: UIButton = {
+        let mBtn = UIButton.init(type: .custom)
+        mBtn.backgroundColor = .white
+        mBtn.setImage(UIImage(named: "mine_info_alert_icon_m_nomal"), for: .normal)
+        mBtn.setImage(UIImage(named: "mine_info_alert_icon_m_nomal"), for: .highlighted)
+        mBtn.setImage(UIImage(named: "mine_info_alert_icon_m_select"), for: .selected)
+        mBtn.imageView?.contentMode = .scaleToFill
+        mBtn.layer.cornerRadius = 40
+        mBtn.layer.masksToBounds = true
+        mBtn.addTarget(self, action: #selector(mClickAction), for: .touchUpInside)
+        return mBtn
+    }()
+    
+    lazy var wLabel: UILabel = {
+        let wLabel = UILabel.init()
+        wLabel.text = "女"
+        wLabel.textAlignment = .center
+        wLabel.textColor = .black
+        wLabel.font = BoldFont_17_Fit
+        return wLabel
+    }()
+    
+    lazy var mLabel: UILabel = {
+        let mLabel = UILabel.init()
+        mLabel.text = "男"
+        mLabel.textAlignment = .center
+        mLabel.textColor = .black
+        mLabel.font = BoldFont_17_Fit
+        return mLabel
+    }()
+    
+    lazy var wView: UIImageView = {
+        let wView = UIImageView.init()
+        wView.image = UIImage(named: "mine_info_alert_icon_g_select")
+        wView.layer.cornerRadius = 8
+        wView.layer.masksToBounds = true
+        wView.backgroundColor = .clear
+        wView.isHidden = true
+        return wView
+    }()
+    
+    lazy var mView: UIImageView = {
+        let mView = UIImageView.init()
+        mView.image = UIImage(named: "mine_info_alert_icon_g_select")
+        mView.layer.cornerRadius = 8
+        mView.layer.masksToBounds = true
+        mView.backgroundColor = .clear
+        mView.isHidden = true
+        return mView
+    }()
+    
+    lazy var datePicker: UIDatePicker = {
+        let datePicker = UIDatePicker.init()
+        datePicker.locale = Locale(identifier: "zh_CN")
+        datePicker.timeZone = TimeZone.init(identifier: "UTC")
+        datePicker.setValue(HexColor("#3C3C3C"), forKey: "textColor")
+        datePicker.datePickerMode = .date
+        datePicker.isHidden = true
+        datePicker.minimumDate = Date.init(timeIntervalSince1970: -60*60*24*365*60)
+        datePicker.maximumDate = Date.init(timeInterval: 0, since: Date.init())
+        datePicker.addTarget(self, action: #selector(dateChangeAction), for: .valueChanged)
+        return datePicker
+    }()
+    
+    lazy var nameLable : UILabel = {
+        let nameLable = UILabel.init()
+        nameLable.backgroundColor = .white
+        nameLable.font = BoldFont_16_Fit
+        nameLable.textAlignment  = .center
+        nameLable.textColor = .black
+        return nameLable
+    }()
+    
+    lazy var lineLable : UILabel = {
+        let lineLable = UILabel.init()
+        lineLable.backgroundColor = HexColor("#E6E6E6")
+        return lineLable
+    }()
+    
+    lazy var doneButton : UIButton = {
+        let doneButton = UIButton(type: .custom)
+        doneButton.setTitle("确定", for: .normal)
+        doneButton.setTitleColor(HexColor("#0066FE"), for: .normal)
+        doneButton.titleLabel?.font = Font_16
+        doneButton.addTarget(self, action: #selector(setupDoneButtonAction), for: .touchUpInside)
+        return doneButton
+    }()
+    
+    lazy var closeButton : UIButton = {
+        let closeButton = UIButton(type: .custom)
+        closeButton.setImage(UIImage(named: "login_alert_country_close"), for: .normal)
+        closeButton.backgroundColor = .clear
+        closeButton.addTarget(self, action: #selector(setupCloseButtonAction), for: .touchUpInside)
+        return closeButton
+    }()
+    
+    var gender: String?
+    var show_type: CNLiveMineInfoShowType?
+    var result: CloseGenderResultBlock?
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        addSubview(grayMaskView)
+        addSubview(backView)
+        backView.addSubview(datePicker)
+        backView.addSubview(contentView)
+        contentView.addSubview(wBtn)
+        contentView.addSubview(mBtn)
+        contentView.addSubview(wLabel)
+        contentView.addSubview(mLabel)
+        contentView.addSubview(wView)
+        contentView.addSubview(mView)
+        backView.addSubview(nameLable)
+        backView.addSubview(lineLable)
+        backView.addSubview(closeButton)
+        backView.addSubview(doneButton)
+        switch show_type {
+        case .gender:
+            nameLable.text = "设置性别"
+            contentView.isHidden = false
+            datePicker.isHidden = true
+        default:
+            nameLable.text = "选择生日"
+            contentView.isHidden = true
+            datePicker.isHidden = false
+        }
+        wBtn.isSelected = UserInfoManager.shared.userInfo.gender == "男"
+        mBtn.isSelected = UserInfoManager.shared.userInfo.gender == "女"
+        wView.isHidden = UserInfoManager.shared.userInfo.gender == "男"
+        wView.isHidden = UserInfoManager.shared.userInfo.gender == "女"
+        
+        setConstraints()
+    }
+    
+    func setConstraints() {
+        grayMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        backView.snp.makeConstraints { make in
+            make.top.equalTo(self.snp.bottom).offset(0)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(250)
+        }
+        doneButton.snp.makeConstraints { make in
+            make.right.equalToSuperview()
+            make.top.equalTo(10)
+            make.height.equalTo(30)
+            make.width.equalTo(60)
+        }
+        closeButton.snp.makeConstraints { make in
+            make.centerY.equalTo(doneButton)
+            make.left.equalTo(8)
+            make.size.equalTo(30)
+        }
+        nameLable.snp.makeConstraints { make in
+            make.centerY.equalTo(doneButton)
+            make.centerX.equalToSuperview()
+        }
+        lineLable.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.height.equalTo(1)
+            make.top.equalTo(nameLable.snp.bottom).offset(10)
+        }
+        datePicker.snp.makeConstraints { make in
+            make.bottom.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.top.equalTo(lineLable.snp.bottom)
+        }
+        contentView.snp.makeConstraints { make in
+            make.bottom.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.top.equalTo(lineLable.snp.bottom)
+        }
+        mBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-(KSreenWidth - 160)/3)
+            make.size.equalTo(80)
+        }
+        wBtn.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset((KSreenWidth - 160)/3)
+            make.size.equalTo(80)
+        }
+        mLabel.snp.makeConstraints { make in
+            make.centerX.equalTo(wBtn)
+            make.top.equalTo(wBtn.snp.bottom).offset(10)
+        }
+        wLabel.snp.makeConstraints { make in
+            make.centerX.equalTo(mBtn)
+            make.top.equalTo(mBtn.snp.bottom).offset(10)
+        }
+        mView.snp.makeConstraints { make in
+            make.centerX.equalTo(mBtn)
+            make.bottom.equalTo(mBtn.snp.bottom).offset(8)
+            make.size.equalTo(16)
+        }
+        wView.snp.makeConstraints { make in
+            make.centerX.equalTo(wBtn)
+            make.bottom.equalTo(wBtn.snp.bottom).offset(8)
+            make.size.equalTo(16)
+        }
+
+    }
+    
+    static public func showSelectView(showType: CNLiveMineInfoShowType, result: @escaping CloseGenderResultBlock){
+        let pickerView = MineInfoAlertView()
+        pickerView.show_type = showType
+        pickerView.result = result
+        
+        let window = UIApplication.shared.windows.last
+        window?.addSubview(pickerView)
+        pickerView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        window?.layoutIfNeeded()
+        pickerView.alpha = 0
+        UIView.animate(withDuration: 0.1) {
+            pickerView.alpha = 1
+        } completion: { _ in
+            UIView.animate(withDuration: 0.1) {
+                pickerView.backView.snp.updateConstraints { make in
+                    make.top.equalTo(pickerView.snp.bottom).offset(-pickerView.backView.frame.height)
+                }
+                pickerView.layoutIfNeeded()
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func dateChangeAction(sender: UIDatePicker) {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        print("\(formatter.string(from: datePicker.date))")
+        result!(formatter.string(from: datePicker.date))
+    }
+    
+    @objc func setupDoneButtonAction() {
+        print("进行更改\(gender ?? "")")
+        removeFromSuperview()
+    }
+    
+    @objc func setupCloseButtonAction() -> Void {
+        removeFromSuperview()
+    }
+    
+    @objc func mClickAction(sender: UIButton) {
+        sender.isSelected = !sender.isSelected
+        wBtn.isSelected = !sender.isSelected
+        mView.isHidden = !sender.isSelected
+        wView.isHidden = sender.isSelected
+        gender = "m"
+        result!("女")
+    }
+    
+    @objc func wClickAction(sender: UIButton) {
+        sender.isSelected = !sender.isSelected
+        mBtn.isSelected = !sender.isSelected
+        wView.isHidden = !sender.isSelected
+        mView.isHidden = sender.isSelected
+        gender = "w"
+        result!("男")
+    }
+}
@@ -92,3 +92,62 @@ class MineInfoLListTableViewCell : UITableViewCell {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+class MineFeedBackListCollectViewCell : UICollectionViewCell {
+    
+    lazy var iconView: UIImageView = {
+        let iconView = UIImageView.init()
+        iconView.backgroundColor = .white
+        iconView.contentMode = .scaleToFill
+        return iconView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init()
+        titleLabel.font = BoldFont_16_Fit
+        titleLabel.textColor = .black
+        return titleLabel
+    }()
+    
+    lazy var moreView: UIImageView = {
+        let moreView = UIImageView.init()
+        moreView.contentMode = .scaleToFill
+        moreView.backgroundColor = .white
+        moreView.image = UIImage(named: "mine_add_content_more_list")
+        return moreView
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .white
+        self.layer.masksToBounds = true
+        self.layer.cornerRadius = 8
+        
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.centerX.equalToSuperview().offset(10)
+        }
+        addSubview(iconView)
+        iconView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(titleLabel.snp.left).offset(-10)
+            make.size.equalTo(40)
+        }
+        addSubview(moreView)
+        moreView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(titleLabel.snp.right).offset(5)
+            make.size.equalTo(10)
+        }
+    }
+    
+    public func setupWithDataSource(dict: Dictionary<String, Any>) {
+        iconView.image = UIImage(named: (dict["image"] as? String)!)
+        titleLabel.text = dict["name"] as? String
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
@@ -2,10 +2,33 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
 		<false/>
 	</dict>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>需要允许打开相册才能访问相册照片和保存照片</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>需要允许打开相册才能访问相册照片和保存照片</string>
+	<key>NSCameraUsageDescription</key>
+	<string>需要允许开启相机才能使用录制视频和拍照功能</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>需要允许开启麦克风才能使用录制视频和语音等服务</string>
+	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>zh_CN</string>
+    <key>CFBundleLocalizations</key>
+    <array>
+        <string>zh</string>
+    </array>
 </dict>
 </plist>
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_add_content_more_list@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_add_content_more_list@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_add_customer _service_list@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_add_customer _service_list@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_add_feed_back_list@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_add_feed_back_list@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_g_select@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_g_select@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_m_nomal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_m_nomal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_m_select@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_m_select@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_w_nomal@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_w_nomal@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_w_select@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_info_alert_icon_w_select@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_sub_set_about@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_sub_set_about@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_sub_set_feedback@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_sub_set_feedback@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_sub_set_poistion@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_sub_set_poistion@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_sub_set_privacy@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_sub_set_privacy@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_list_sub_set_sugges@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_list_sub_set_sugges@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_sub_about_app_logo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_sub_about_app_logo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_sub_quest_addd_image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_sub_quest_addd_image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}