add

GIGA.xcodeproj/project.pbxproj

@@ -31,6 +31,7 @@
 		8340BFA9213E65CA008F22E4 /* GIGACommonLocalizabe.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8340BFA8213E65CA008F22E4 /* GIGACommonLocalizabe.strings */; };
 		8340BFAB213E665D008F22E4 /* GIGAUserLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8340BFAA213E665D008F22E4 /* GIGAUserLocalizable.strings */; };
 		8340BFAF213E739D008F22E4 /* GiGaNoNetWorkView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8340BFAE213E739D008F22E4 /* GiGaNoNetWorkView.m */; };
+		834127212152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 834127202152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.m */; };
 		8342D9FD2131150200D16B1D /* 4481.wav in Resources */ = {isa = PBXBuildFile; fileRef = 8342D9FC2131150200D16B1D /* 4481.wav */; };
 		8342FD7A2150C51100D141F4 /* GIGaFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8342FD792150C51100D141F4 /* GIGaFileManager.m */; };
 		8342FD7D2150F94600D141F4 /* AppVerionDescriptionVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8342FD7C2150F94600D141F4 /* AppVerionDescriptionVC.m */; };
@@ -46,6 +47,17 @@
 		835060A9212D38EE007E6220 /* GiGaStartAdView.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060A8212D38EE007E6220 /* GiGaStartAdView.m */; };
 		835060AD212D4D0C007E6220 /* GiGaFileNanager.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060AC212D4D0C007E6220 /* GiGaFileNanager.m */; };
 		835060B3212D54C2007E6220 /* GiGaAdDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 835060B2212D54C2007E6220 /* GiGaAdDetailViewController.m */; };
+		835147312151E4EF00B25A88 /* GIGaAboutUsVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8351472F2151E4EF00B25A88 /* GIGaAboutUsVC.m */; };
+		835147322151E4EF00B25A88 /* GIGaAboutUsVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 835147302151E4EF00B25A88 /* GIGaAboutUsVC.xib */; };
+		835147352152003700B25A88 /* GiGaFeedBackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 835147342152003700B25A88 /* GiGaFeedBackViewController.m */; };
+		835147382152147600B25A88 /* GiGaUserInfoVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 835147372152147600B25A88 /* GiGaUserInfoVC.m */; };
+		8351473C215215C500B25A88 /* GiGAUserInfoCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8351473A215215C500B25A88 /* GiGAUserInfoCell.m */; };
+		8351473D215215C500B25A88 /* GiGAUserInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8351473B215215C500B25A88 /* GiGAUserInfoCell.xib */; };
+		8351474121521C2A00B25A88 /* GIGaChangePassVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8351473F21521C2A00B25A88 /* GIGaChangePassVC.m */; };
+		8351474221521C2A00B25A88 /* GIGaChangePassVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8351474021521C2A00B25A88 /* GIGaChangePassVC.xib */; };
+		8351474621521CC500B25A88 /* GiGaChangePhoneNumberVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 8351474421521CC500B25A88 /* GiGaChangePhoneNumberVC.m */; };
+		8351474B21523B7400B25A88 /* GIGaUserChangeMobleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 8351474921523B7400B25A88 /* GIGaUserChangeMobleCell.m */; };
+		8351474C21523B7400B25A88 /* GIGaUserChangeMobleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8351474A21523B7400B25A88 /* GIGaUserChangeMobleCell.xib */; };
 		8357ADC52123BEBD000816F2 /* GiGaUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 8357ADC42123BEBD000816F2 /* GiGaUser.m */; };
 		8357ADC92123BFCA000816F2 /* GiGaUserManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8357ADC82123BFCA000816F2 /* GiGaUserManager.m */; };
 		8357ADCD2123C091000816F2 /* GiGaNetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8357ADCC2123C091000816F2 /* GiGaNetManager.m */; };
@@ -223,6 +235,8 @@
 		8340BFAA213E665D008F22E4 /* GIGAUserLocalizable.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = GIGAUserLocalizable.strings; sourceTree = "<group>"; };
 		8340BFAD213E739D008F22E4 /* GiGaNoNetWorkView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaNoNetWorkView.h; sourceTree = "<group>"; };
 		8340BFAE213E739D008F22E4 /* GiGaNoNetWorkView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaNoNetWorkView.m; sourceTree = "<group>"; };
+		8341271F2152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaMaskTimeUseRecordVC.h; sourceTree = "<group>"; };
+		834127202152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaMaskTimeUseRecordVC.m; sourceTree = "<group>"; };
 		8342D9FC2131150200D16B1D /* 4481.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = 4481.wav; sourceTree = "<group>"; };
 		8342FD782150C51100D141F4 /* GIGaFileManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaFileManager.h; sourceTree = "<group>"; };
 		8342FD792150C51100D141F4 /* GIGaFileManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaFileManager.m; sourceTree = "<group>"; };
@@ -249,6 +263,24 @@
 		835060AC212D4D0C007E6220 /* GiGaFileNanager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaFileNanager.m; sourceTree = "<group>"; };
 		835060B1212D54C2007E6220 /* GiGaAdDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaAdDetailViewController.h; sourceTree = "<group>"; };
 		835060B2212D54C2007E6220 /* GiGaAdDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaAdDetailViewController.m; sourceTree = "<group>"; };
+		8351472E2151E4EF00B25A88 /* GIGaAboutUsVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaAboutUsVC.h; sourceTree = "<group>"; };
+		8351472F2151E4EF00B25A88 /* GIGaAboutUsVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaAboutUsVC.m; sourceTree = "<group>"; };
+		835147302151E4EF00B25A88 /* GIGaAboutUsVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GIGaAboutUsVC.xib; sourceTree = "<group>"; };
+		835147332152003700B25A88 /* GiGaFeedBackViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaFeedBackViewController.h; sourceTree = "<group>"; };
+		835147342152003700B25A88 /* GiGaFeedBackViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaFeedBackViewController.m; sourceTree = "<group>"; };
+		835147362152147600B25A88 /* GiGaUserInfoVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaUserInfoVC.h; sourceTree = "<group>"; };
+		835147372152147600B25A88 /* GiGaUserInfoVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaUserInfoVC.m; sourceTree = "<group>"; };
+		83514739215215C500B25A88 /* GiGAUserInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGAUserInfoCell.h; sourceTree = "<group>"; };
+		8351473A215215C500B25A88 /* GiGAUserInfoCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGAUserInfoCell.m; sourceTree = "<group>"; };
+		8351473B215215C500B25A88 /* GiGAUserInfoCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GiGAUserInfoCell.xib; sourceTree = "<group>"; };
+		8351473E21521C2A00B25A88 /* GIGaChangePassVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaChangePassVC.h; sourceTree = "<group>"; };
+		8351473F21521C2A00B25A88 /* GIGaChangePassVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaChangePassVC.m; sourceTree = "<group>"; };
+		8351474021521C2A00B25A88 /* GIGaChangePassVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GIGaChangePassVC.xib; sourceTree = "<group>"; };
+		8351474321521CC500B25A88 /* GiGaChangePhoneNumberVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaChangePhoneNumberVC.h; sourceTree = "<group>"; };
+		8351474421521CC500B25A88 /* GiGaChangePhoneNumberVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaChangePhoneNumberVC.m; sourceTree = "<group>"; };
+		8351474821523B7400B25A88 /* GIGaUserChangeMobleCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GIGaUserChangeMobleCell.h; sourceTree = "<group>"; };
+		8351474921523B7400B25A88 /* GIGaUserChangeMobleCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GIGaUserChangeMobleCell.m; sourceTree = "<group>"; };
+		8351474A21523B7400B25A88 /* GIGaUserChangeMobleCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GIGaUserChangeMobleCell.xib; sourceTree = "<group>"; };
 		8357ADC32123BEBD000816F2 /* GiGaUser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaUser.h; sourceTree = "<group>"; };
 		8357ADC42123BEBD000816F2 /* GiGaUser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GiGaUser.m; sourceTree = "<group>"; };
 		8357ADC72123BFCA000816F2 /* GiGaUserManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GiGaUserManager.h; sourceTree = "<group>"; };
@@ -911,6 +943,9 @@
 				83BFAE76213CDE91004EF801 /* GiGaSettingsViewCell.xib */,
 				83048484214FACE700603CE7 /* JobMaskButton.h */,
 				83048485214FACE700603CE7 /* JobMaskButton.m */,
+				83514739215215C500B25A88 /* GiGAUserInfoCell.h */,
+				8351473A215215C500B25A88 /* GiGAUserInfoCell.m */,
+				8351473B215215C500B25A88 /* GiGAUserInfoCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -928,6 +963,20 @@
 				83BFAE72213CDB58004EF801 /* GiSysSettingsVC.m */,
 				8342FD7B2150F94600D141F4 /* AppVerionDescriptionVC.h */,
 				8342FD7C2150F94600D141F4 /* AppVerionDescriptionVC.m */,
+				8351472E2151E4EF00B25A88 /* GIGaAboutUsVC.h */,
+				8351472F2151E4EF00B25A88 /* GIGaAboutUsVC.m */,
+				835147302151E4EF00B25A88 /* GIGaAboutUsVC.xib */,
+				835147332152003700B25A88 /* GiGaFeedBackViewController.h */,
+				835147342152003700B25A88 /* GiGaFeedBackViewController.m */,
+				835147362152147600B25A88 /* GiGaUserInfoVC.h */,
+				835147372152147600B25A88 /* GiGaUserInfoVC.m */,
+				8351473E21521C2A00B25A88 /* GIGaChangePassVC.h */,
+				8351473F21521C2A00B25A88 /* GIGaChangePassVC.m */,
+				8351474021521C2A00B25A88 /* GIGaChangePassVC.xib */,
+				8351474321521CC500B25A88 /* GiGaChangePhoneNumberVC.h */,
+				8351474421521CC500B25A88 /* GiGaChangePhoneNumberVC.m */,
+				8341271F2152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.h */,
+				834127202152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -1118,6 +1167,9 @@
 				838762E6214B9FA60039D241 /* GIGaUserCityViewCell.xib */,
 				8304847F214F488F00603CE7 /* GiGaUserJobViewCell.h */,
 				83048480214F488F00603CE7 /* GiGaUserJobViewCell.m */,
+				8351474821523B7400B25A88 /* GIGaUserChangeMobleCell.h */,
+				8351474921523B7400B25A88 /* GIGaUserChangeMobleCell.m */,
+				8351474A21523B7400B25A88 /* GIGaUserChangeMobleCell.xib */,
 			);
 			path = userInfoView;
 			sourceTree = "<group>";
@@ -1384,6 +1436,7 @@
 			files = (
 				833DE8E42150169F009D4329 /* city.json in Resources */,
 				83346AC6212BBC8C0054D597 /* GiGaRegistViewController.xib in Resources */,
+				8351474C21523B7400B25A88 /* GIGaUserChangeMobleCell.xib in Resources */,
 				838762DE214B9F140039D241 /* GIGaUserWeChatViewCell.xib in Resources */,
 				83BFAE6D213CD0E3004EF801 /* GiGaMineInfoViewCell.xib in Resources */,
 				8361B3D6212155C300238FEB /* LaunchScreen.storyboard in Resources */,
@@ -1395,11 +1448,13 @@
 				83BFAE78213CDE91004EF801 /* GiGaSettingsViewCell.xib in Resources */,
 				83346AC1212BB50A0054D597 /* PassWordResetVC.xib in Resources */,
 				83BDC0592147B89900E74E0D /* GiGaAnswerViewCell.xib in Resources */,
+				8351473D215215C500B25A88 /* GiGAUserInfoCell.xib in Resources */,
 				83346AD1212BF5B70054D597 /* useragreement.html in Resources */,
 				838762D9214B9EF80039D241 /* GIGaUserIDViewCell.xib in Resources */,
 				838762E8214B9FA60039D241 /* GIGaUserCityViewCell.xib in Resources */,
 				8342FD8B2151095100D141F4 /* AppVersionLogoCell.xib in Resources */,
 				83BFAE68213CCF10004EF801 /* GiGaMineUserViewCell.xib in Resources */,
+				8351474221521C2A00B25A88 /* GIGaChangePassVC.xib in Resources */,
 				8340BFA9213E65CA008F22E4 /* GIGACommonLocalizabe.strings in Resources */,
 				83835BA8212E4748001480F2 /* MAssaageCenterCell.xib in Resources */,
 				8361B3D3212155C300238FEB /* Assets.xcassets in Resources */,
@@ -1408,6 +1463,7 @@
 				8340BFAB213E665D008F22E4 /* GIGAUserLocalizable.strings in Resources */,
 				8342D9FD2131150200D16B1D /* 4481.wav in Resources */,
 				83835BB0212E4FCD001480F2 /* MessageListViewCell.xib in Resources */,
+				835147322151E4EF00B25A88 /* GIGaAboutUsVC.xib in Resources */,
 				8342FD832150FA1500D141F4 /* AppVersionDescCell.xib in Resources */,
 				8338F6B12142182200B4780B /* MaskTime.png in Resources */,
 				83346ACF212BD7830054D597 /* GiGaWebViewController.xib in Resources */,
@@ -1510,6 +1566,7 @@
 				83846441214A4BFF00F12B33 /* MaskTestResultVC.m in Sources */,
 				83346AC5212BBC8C0054D597 /* GiGaRegistViewController.m in Sources */,
 				83346AD7212C18F50054D597 /* GiGaAppGaurdVC.m in Sources */,
+				8351474B21523B7400B25A88 /* GIGaUserChangeMobleCell.m in Sources */,
 				8349585C212511040064DB6C /* AppDelegate+ThirdParty.m in Sources */,
 				83048481214F489000603CE7 /* GiGaUserJobViewCell.m in Sources */,
 				83BFAE73213CDB58004EF801 /* GiSysSettingsVC.m in Sources */,
@@ -1534,6 +1591,7 @@
 				8342FD7D2150F94600D141F4 /* AppVerionDescriptionVC.m in Sources */,
 				8357ADC92123BFCA000816F2 /* GiGaUserManager.m in Sources */,
 				8390116F214E20B2004CA790 /* LYSDatePickerViewController.m in Sources */,
+				8351473C215215C500B25A88 /* GiGAUserInfoCell.m in Sources */,
 				83835BB3212E50ED001480F2 /* ActiveMesagelistVC.m in Sources */,
 				83835BC3212E677C001480F2 /* GiGaQuestionVC.m in Sources */,
 				83A2271F212AC8C100B3E75C /* GiGaUserLoginVC.m in Sources */,
@@ -1541,10 +1599,13 @@
 				83346ACE212BD7830054D597 /* GiGaWebViewController.m in Sources */,
 				8357ADD82124027D000816F2 /* GiGaUserDefault.m in Sources */,
 				83835BB6212E5174001480F2 /* GiGaServiceViewController.m in Sources */,
+				835147352152003700B25A88 /* GiGaFeedBackViewController.m in Sources */,
 				8390116E214E20B2004CA790 /* LYSDateLogicViewController.m in Sources */,
 				8361B40721215E6F00238FEB /* GiGaHelper.m in Sources */,
+				835147382152147600B25A88 /* GiGaUserInfoVC.m in Sources */,
 				83901175214E20B2004CA790 /* LYSDatePickerManager.m in Sources */,
 				83901173214E20B2004CA790 /* LYSDateBasicViewController.m in Sources */,
+				8351474121521C2A00B25A88 /* GIGaChangePassVC.m in Sources */,
 				8392900F2134FA0A0077D2E8 /* GiGaCommentModel.m in Sources */,
 				8390116C214E20B2004CA790 /* LYSDatePopViewController.m in Sources */,
 				83835BA0212E43BD001480F2 /* GiGaMasssagesVC.m in Sources */,
@@ -1568,6 +1629,7 @@
 				83901179214E20B2004CA790 /* LYSDatePickerTypeBase.m in Sources */,
 				835060A2212D1225007E6220 /* GiGaMeViewController.m in Sources */,
 				8361B3CB212155C200238FEB /* AppDelegate.m in Sources */,
+				8351474621521CC500B25A88 /* GiGaChangePhoneNumberVC.m in Sources */,
 				838388C8212F9C4200D14C53 /* GiGaLocalNotificationManager.m in Sources */,
 				83835BBC212E60E5001480F2 /* MessageDetailViewController.m in Sources */,
 				83835BCD212E856A001480F2 /* NSString+MD5.m in Sources */,
@@ -1590,6 +1652,7 @@
 				8392900C2134F9F80077D2E8 /* GiGaCommentView.m in Sources */,
 				839290062134F4240077D2E8 /* LXDanMuManager.m in Sources */,
 				833DE8E52150169F009D4329 /* JYAddressPicker.m in Sources */,
+				834127212152AEFB001DDB36 /* GIGaMaskTimeUseRecordVC.m in Sources */,
 				8342FD7A2150C51100D141F4 /* GIGaFileManager.m in Sources */,
 				83901171214E20B2004CA790 /* LYSDatePickerLabel.m in Sources */,
 				838762E2214B9F580039D241 /* GiGaUserSexViewCell.m in Sources */,
@@ -1597,6 +1660,7 @@
 				83E40B2F21218BA0008149C4 /* GiGaUserViewController.m in Sources */,
 				83901170214E20B2004CA790 /* LYSDateHeaderViewController.m in Sources */,
 				835060A5212D3536007E6220 /* AppDelegate+GiGaConfig.m in Sources */,
+				835147312151E4EF00B25A88 /* GIGaAboutUsVC.m in Sources */,
 				83901174214E20B2004CA790 /* LYSDateIndicatorViewController.m in Sources */,
 				83E40B2B21218B6F008149C4 /* GiGaExercisesViewController.m in Sources */,
 				8390117B214E20B2004CA790 /* LYSDatePickerHeaderView.m in Sources */,

GIGA/Assets.xcassets/maskTime/usergaurd_uphand.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "usergaurd_uphand@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Assets.xcassets/maskTime/userguard_up.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "userguard_up@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Assets.xcassets/userCenter/bg_change_newnumber.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg_change_newnumber@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Assets.xcassets/userCenter/bg_change_oldnumber.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "bg_change_oldnumber@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Assets.xcassets/userCenter/btn_changephonesend.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "btn_changephonesend@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Assets.xcassets/userCenter/user_changephonewihte.imageset/Contents.json

@@ -0,0 +1,13 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "user_changephonewihte@2x.png",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GIGA/Category/SHineLabel.h

@@ -15,5 +15,7 @@
 @property(nonatomic,retain) UIColor *oinsideColor;
 //光晕
 @property(nonatomic,retain) UIColor *blurColor;
+@property(nonatomic) CGFloat fontsize;
+
 
 @end

GIGA/Category/SHineLabel.m

@@ -30,8 +30,7 @@
     CGContextSetTextDrawingMode(ctx, mode);
     NSMutableParagraphStyle *paragraStyle = [[NSMutableParagraphStyle alloc] init];
     paragraStyle.alignment = NSTextAlignmentCenter;
-    
+    [self.text drawInRect:self.bounds withAttributes:@{NSFontAttributeName:[UIFont fontWithName:@"PingFangSC-Semibold" size:self.fontsize],NSForegroundColorAttributeName:[UIColor whiteColor],NSKernAttributeName:@(4),NSParagraphStyleAttributeName:paragraStyle}];
-    [self.text drawInRect:self.bounds withAttributes:@{NSFontAttributeName:[UIFont fontWithName:@"PingFangSC-Semibold" size:22],NSForegroundColorAttributeName:[UIColor whiteColor],NSKernAttributeName:@(4),NSParagraphStyleAttributeName:paragraStyle}];
     
 }
 -(void)dealloc{

GIGA/Config/ApiRequestConfig.h

@@ -21,5 +21,19 @@
 #define kUploadAvator @"sys/oss/v1/upload"
 //版本说明
 #define kAPiAPPVersion @"sys/maskversionarticle/v1/list"
+//修改密码
+#define kPAiUSerEditpwd @"user/v1/editpwd"
+//修改手机号
+#define kApiChangePhone @"user/v1/editmobil"
+//修改手机号发送验证码
+#define kApiChangeMobleCode @"msg/sms/v1/editsendcode"
+//发送验证码
+#define kApiSendPhoneCode @"msg/sms/v1/sendcode";
+//找回密码发送验证码
+#define kApiChangePassSendCode @"msg/sms/v1/retrievesendcode"
+//异步验证手机验证码
+#define kApiVersifyPhoneCode @"v1/user/v1/validateSmsCode"
+
+
 
 #endif /* ApiRequestConfig_h */

GIGA/Config/GIGA.h

@@ -49,6 +49,8 @@ UD_SYNC
 #define kUserLogOutNotify @"userLogOutNotify"
 //用户头像修改
 #define kUserAvatorUpdateNoti @"userAvatorUpdate"
+//用户昵称修改
+#define kUserNameUpDateNoti @"userNickNameUpdate"
 
 //微信登陆授权成功
 #define kWeiXinAuthrization_Success @"WXAuthSuccess"

GIGA/Modules/LogIn/Controller/GiGaUserLoginVC.m

@@ -99,7 +99,6 @@
     self.loginBtn.layer.cornerRadius = self.loginBtn.frame.size.height / 2;
     
     NSMutableAttributedString *attri = [[NSMutableAttributedString alloc] init];
-    
     NSTextAttachment *attch = [[NSTextAttachment alloc] init];
     attch.image = [UIImage imageNamed:@"ic_wechat"];
     attch.bounds = CGRectMake(0,-4, 12.9, 12.5);
@@ -169,13 +168,20 @@
         GIGA_ShowToast(@"密码不能为空");
         return;
     }
-    BOOL isPass = [GiGaHelper checkPassWord:self.passwordTextField.text];
+//    BOOL isPass = [GiGaHelper checkPassWord:self.passwordTextField.text];
-    
+//
-    if (isPass == NO) {
+//    if (isPass == NO) {
+//        GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
+//        return;
+//    }
+    int leng = [GiGaHelper convertToInt: self.passwordTextField.text];
+
+    if (!(leng >= 6 && leng <= 20)) {
         GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
         return;
     }
     
+    
     [self loginWithAction:btn];
     
 }

GIGA/Modules/LogIn/Controller/PassWordResetVC.m

@@ -153,9 +153,10 @@
         return;
     }
     
-    BOOL isPass = [GiGaHelper checkPassWord:self.passNewTextField.text];
+    //BOOL isPass = [GiGaHelper checkPassWord:self.passNewTextField.text];
+    int leng = [GiGaHelper convertToInt: self.passNewTextField.text];
     
-    if (isPass == NO) {
+    if (!(leng >= 6 && leng <= 20)) {
         GIGA_ShowToast(@"请输入6-20位数字和字母组成的密码");
         return;
     }

GIGA/Modules/Mask/Controller/GiGaFlingCommitVC.m

@@ -124,7 +124,11 @@
     
     NSURL* url = [[NSURL alloc] initWithString:@"http://wsyts.s1.natapp.cc"];
     //@"connectParams":@{@"token":@""}
-    SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"extraHeaders":@{@"device":@"ios"},@"token":@""}];
+    NSString *token = [GiGaUserDefault getCurentToken];
+    if (!token) {
+        token = @"";
+    }
+    SocketManager *manager = [[SocketManager alloc] initWithSocketURL:url config:@{@"log": @NO, @"forcePolling": @YES,@"extraHeaders":@{@"device":@"ios"},@"token":token}];
     
     _manager = manager;
     _client = manager.defaultSocket;

GIGA/Modules/Mask/Controller/GiGaMaskTaskViewController.m

@@ -186,6 +186,7 @@
     if (showAppGaurd == NO) {
         [self showAPPappGaurdView];
     }
+    //[self showUserGaurdView];
 }
 
 -(void)viewWillDisappear:(BOOL)animated{
@@ -198,9 +199,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+ 
-//    [self.view addSubview:self.tableView];
-//    self.tableView.backgroundColor = GIGA_MAIN_BGCOLOR;
     [self setUpNav];
     [self initUI];
     [self addNotify];
@@ -545,7 +544,7 @@
     }else{
          userGuardVC.modalPresentationStyle = UIModalPresentationCurrentContext;
     }
-    userGuardVC.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.5];
+    userGuardVC.view.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3];
     [self presentViewController:userGuardVC animated:NO completion:nil];
 }
 

GIGA/Modules/Mask/Controller/UserGuardViewController.m

@@ -9,8 +9,10 @@
 #import "UserGuardViewController.h"
 #import "Masonry.h"
 #import "GiGaUserDefault.h"
+#import "SHineLabel.h"
 
 @interface UserGuardViewController ()
+@property(nonatomic,strong) UIImageView *handimage;
 
 @end
 
@@ -27,21 +29,93 @@
 
 -(void)creatUI{
     
-    UIButton *dismisBtn= [UIButton buttonWithType:UIButtonTypeCustom];
+//    UIButton *dismisBtn= [UIButton buttonWithType:UIButtonTypeCustom];
+//
+//    [dismisBtn setTitle:@"知道了" forState:UIControlStateNormal];
+//    [dismisBtn setTintColor:[UIColor whiteColor]];
+//     dismisBtn.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1];
+//    [dismisBtn addTarget:self action:@selector(dismisBtnAction) forControlEvents:UIControlEventTouchUpInside];
+//    [self.view addSubview:dismisBtn];
+//
+//    [dismisBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.width.mas_equalTo(100);
+//        make.height.mas_equalTo(60);
+//        make.centerX.mas_equalTo(self.view.mas_centerX);
+//        make.top.mas_equalTo(self.view.mas_top).offset(200);
+//    }];
     
-    [dismisBtn setTitle:@"知道了" forState:UIControlStateNormal];
+    //usergaurd_uphand
-    [dismisBtn setTintColor:[UIColor whiteColor]];
+    UIImageView *upimage = [[UIImageView alloc] init];
-     dismisBtn.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.1];
+    upimage.image = [UIImage imageNamed:@"userguard_up"];
-    [dismisBtn addTarget:self action:@selector(dismisBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:upimage];
-    [self.view addSubview:dismisBtn];
+    [upimage mas_makeConstraints:^(MASConstraintMaker *make) {
-    
+        make.height.and.with.mas_equalTo(20);
-    [dismisBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.view.mas_centerX).offset(10);
-        make.width.mas_equalTo(100);
+        make.top.mas_equalTo(self.view.mas_top).offset(298);
-        make.height.mas_equalTo(60);
+        
-        make.centerX.mas_equalTo(self.view.mas_centerX);
-        make.top.mas_equalTo(self.view.mas_top).offset(200);
     }];
     
+    UIImageView *handimage = [[UIImageView alloc] init];
+    self.handimage = handimage;
+    handimage.image = [UIImage imageNamed:@"usergaurd_uphand"];
+    [self.view addSubview:handimage];
+    [handimage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(upimage.mas_right).offset(2);
+        make.size.mas_equalTo(CGSizeMake(50, 60));
+        
+        make.top.mas_equalTo(self.view.mas_top).offset(301);
+        
+    }];
+    
+    SHineLabel *shainLabe = [[SHineLabel alloc] init];
+    [self.view addSubview:shainLabe];
+    shainLabe.textColor = [UIColor whiteColor];
+    shainLabe.outLineColor = [UIColor whiteColor];
+    shainLabe.blurColor = [UIColor whiteColor];
+    shainLabe.oinsideColor = [UIColor whiteColor];
+    shainLabe.fontsize = 18;
+    shainLabe.text = @"按住面膜向上滑\n敷到脸部开始倒计时";
+    shainLabe.numberOfLines = 0;
+    
+    [shainLabe mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(CGSizeMake(222, 60));
+        //make.width.mas_equalTo(222);
+        make.top.mas_equalTo(self.view.mas_top).offset(384);
+        make.centerX.mas_equalTo(self.view.mas_centerX);
+    }];
+    
+   // [self creatnaima];
+}
+
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [self creatnaima];
+}
+-(void)creatnaima{
+
+    [UIView animateWithDuration:1.0 animations:^{
+        [UIView setAnimationRepeatCount:MAXFLOAT];
+        [self->_handimage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(201);
+            
+        }];
+        [self.view layoutIfNeeded];
+    } completion:^(BOOL finished) {
+        
+        [self->_handimage mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(301);
+            
+        }];
+        [self.view layoutIfNeeded];
+    }];
+}
+
+
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self dismisBtnAction];
 }
 
 -(void)dismisBtnAction{

GIGA/Modules/Mask/View/MaskTimeCircularProgressView.m

@@ -85,6 +85,7 @@
         _countLabel.blurColor = [UIColor whiteColor];
         _countLabel.oinsideColor = [UIColor whiteColor];
         _countLabel.text = @"00:00";
+        _countLabel.fontsize = 22;
         _countLabel.font = [UIFont fontWithName:GIGA_FONTBOLD size:22];
     }
     return _countLabel;

GIGA/Modules/Me/Controller/AppVerionDescriptionVC.m

@@ -22,18 +22,19 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    [self addNavTitile:@"版本说明"];
     _currntPage = 1;
     _totalPage = 1;
+    
     self.versionsArr = [[NSMutableArray alloc] init];
     [self.view addSubview:self.tableView];
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
-    self.tableView.backgroundColor = [UIColor whiteColor];
+    self.tableView.backgroundColor = GIGA_MAIN_BGCOLOR;
     self.tableView.separatorStyle = UITableViewCellSelectionStyleNone;
     self.tableView.sectionFooterHeight = 0;
     self.tableView.estimatedSectionFooterHeight=  0;
     self.tableView.estimatedSectionHeaderHeight = 0;
-    
     self.tableView.frame = CGRectMake(0, 1, KMainW, self.view.bounds.size.height - SAFE_NAV_HEIGHT);
     [self requstListDatas];
 }
@@ -55,8 +56,8 @@
         if(!cell){
             cell = [[[NSBundle mainBundle] loadNibNamed:@"AppVersionLogoCell" owner:self options:nil] lastObject];
         }
-        return cell;
         
+        return cell;
     }
     
     AppVersionDescCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AppVersionDescCell"];
@@ -64,6 +65,9 @@
     if(!cell){
         cell = [[[NSBundle mainBundle] loadNibNamed:@"AppVersionDescCell" owner:self options:nil] lastObject];
     }
+    
+    VersionModel *model =self.versionsArr[indexPath.row];
+    [cell loadCellDataAt:indexPath version:model];
     return cell;
 }
 
@@ -92,6 +96,20 @@
     return 4;
 }
 
+
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    if (section == 1) {
+        UIView *view = [[UIView alloc] init];
+        view.backgroundColor = GIGARGB(222, 222, 222, 1);
+        
+        return view;
+    }
+    UIView *view = [[UIView alloc] init];
+    view.backgroundColor = GIGARGB(222, 222, 222, 1);
+    return view;
+    
+}
+
 -(void)requstListDatas{
     
     GiGaBaseAPiRequest *reuqest = [GiGaBaseAPiRequest initWithRequestPath:kAPiAPPVersion method:RequestPostMethod parms:@{}];

GIGA/Modules/Me/Controller/GIGaAboutUsVC.h

@@ -0,0 +1,17 @@
+//
+//  GIGaAboutUsVC.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GIGaAboutUsVC : GiGaBaseViewController
+@property (weak, nonatomic) IBOutlet UIView *backWhiteBorderView;
+@property (weak, nonatomic) IBOutlet UILabel *curentV;
+@property (weak, nonatomic) IBOutlet UILabel *xieyiLab;
+
+
+@end

GIGA/Modules/Me/Controller/GIGaAboutUsVC.m

@@ -0,0 +1,58 @@
+//
+//  GIGaAboutUsVC.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GIGaAboutUsVC.h"
+
+@interface GIGaAboutUsVC ()
+
+@end
+
+@implementation GIGaAboutUsVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addNavTitile:@"关于我们"];
+    self.view.backgroundColor = GIGA_MAIN_BGCOLOR;
+    // Do any additional setup after loading the view from its nib.
+    self.backWhiteBorderView.layer.masksToBounds = YES;
+    self.backWhiteBorderView.layer.borderWidth = 1;
+    self.backWhiteBorderView.layer.cornerRadius = 2;
+    self.backWhiteBorderView.layer.borderColor = [UIColor whiteColor].CGColor;
+    NSDictionary *infoDic=[[NSBundle mainBundle] infoDictionary];
+    // CFShow((__bridge CFTypeRef)(infoDic));
+    NSString *app_Version=[infoDic objectForKey:@"CFBundleShortVersionString"];
+    NSLog(@"app_Version%@",app_Version);
+    self.curentV.text = [NSString stringWithFormat:@"当前版本：%@",app_Version];
+    
+    UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(xiyiDetail)];
+    [self.xieyiLab addGestureRecognizer:tap];
+    //self.xieyiLab.backgroundColor = [UIColor blueColor];
+}
+
+-(void)xiyiDetail{
+    
+    
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

GIGA/Modules/Me/Controller/GIGaAboutUsVC.xib

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GIGaAboutUsVC">
+            <connections>
+                <outlet property="backWhiteBorderView" destination="ns1-dj-ePW" id="6Of-yh-wjX"/>
+                <outlet property="curentV" destination="O00-AN-ESn" id="UyI-B2-ExA"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="xieyiLab" destination="aZZ-3P-qGO" id="lJh-iM-KcO"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uWt-SH-yKP">
+                    <rect key="frame" x="0.0" y="1" width="375" height="666"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="面膜时间" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KQS-5b-EYm">
+                            <rect key="frame" x="159.5" y="182" width="56" height="20"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="14"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mask Time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CaV-Vg-83Z">
+                            <rect key="frame" x="166.5" y="210" width="42" height="12"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="8"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ns1-dj-ePW">
+                            <rect key="frame" x="68.5" y="313" width="238" height="88"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客服热线： 400-0000-000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fQZ-vC-DAg">
+                                    <rect key="frame" x="44" y="25" width="151" height="17"/>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="12"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="客服邮箱： mianmoshijian@giga.com" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EBK-Mj-Ct8">
+                                    <rect key="frame" x="14" y="50" width="210" height="17"/>
+                                    <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="12"/>
+                                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <constraints>
+                                <constraint firstItem="fQZ-vC-DAg" firstAttribute="centerX" secondItem="ns1-dj-ePW" secondAttribute="centerX" id="7X7-jn-kzl"/>
+                                <constraint firstAttribute="width" constant="238" id="DGQ-7E-YHS"/>
+                                <constraint firstAttribute="height" constant="88" id="EaG-ps-sIb"/>
+                                <constraint firstItem="EBK-Mj-Ct8" firstAttribute="top" secondItem="fQZ-vC-DAg" secondAttribute="bottom" constant="8" id="bNP-8C-HpO"/>
+                                <constraint firstItem="EBK-Mj-Ct8" firstAttribute="centerX" secondItem="ns1-dj-ePW" secondAttribute="centerX" id="czP-0L-JfE"/>
+                                <constraint firstItem="fQZ-vC-DAg" firstAttribute="top" secondItem="ns1-dj-ePW" secondAttribute="top" constant="25" id="k98-4w-xNo"/>
+                            </constraints>
+                        </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前版本： v 1.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O00-AN-ESn">
+                            <rect key="frame" x="142.5" y="405" width="90" height="17"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="12"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="《面膜时间用户协议》" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aZZ-3P-qGO">
+                            <rect key="frame" x="127.5" y="599" width="120" height="17"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="12"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CopyRight @ 极迦生物 2018 - 2020" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uqu-At-cU5">
+                            <rect key="frame" x="103.5" y="640" width="168" height="14"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="10"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg_logo" translatesAutoresizingMaskIntoConstraints="NO" id="YGv-MC-rGM">
+                            <rect key="frame" x="137.5" y="60" width="100" height="100"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="100" id="DtG-ZH-d1u"/>
+                                <constraint firstAttribute="height" constant="100" id="Nwk-cV-2hk"/>
+                            </constraints>
+                        </imageView>
+                    </subviews>
+                    <color key="backgroundColor" red="0.51372549020000002" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstItem="CaV-Vg-83Z" firstAttribute="top" secondItem="KQS-5b-EYm" secondAttribute="bottom" constant="8" id="0Ca-ma-0Xq"/>
+                        <constraint firstItem="aZZ-3P-qGO" firstAttribute="top" secondItem="uWt-SH-yKP" secondAttribute="top" constant="599" id="4aq-UH-aog"/>
+                        <constraint firstItem="KQS-5b-EYm" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="743-r4-R1X"/>
+                        <constraint firstAttribute="bottom" secondItem="uqu-At-cU5" secondAttribute="bottom" constant="31" id="F3V-4E-z1P"/>
+                        <constraint firstItem="O00-AN-ESn" firstAttribute="top" secondItem="ns1-dj-ePW" secondAttribute="bottom" constant="4" id="VBQ-rU-lZq"/>
+                        <constraint firstItem="ns1-dj-ePW" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="Vgi-dq-8gh"/>
+                        <constraint firstItem="YGv-MC-rGM" firstAttribute="top" secondItem="uWt-SH-yKP" secondAttribute="top" constant="60" id="WYS-WQ-DAP"/>
+                        <constraint firstItem="O00-AN-ESn" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="bbr-sV-JYk"/>
+                        <constraint firstItem="uqu-At-cU5" firstAttribute="top" secondItem="aZZ-3P-qGO" secondAttribute="bottom" constant="24" id="bn8-GO-D8j"/>
+                        <constraint firstAttribute="trailing" secondItem="uqu-At-cU5" secondAttribute="trailing" constant="104" id="f5C-j2-JuY"/>
+                        <constraint firstItem="ns1-dj-ePW" firstAttribute="top" secondItem="CaV-Vg-83Z" secondAttribute="bottom" constant="91" id="guj-Ca-B2n"/>
+                        <constraint firstItem="YGv-MC-rGM" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="nXD-1v-Onf"/>
+                        <constraint firstItem="aZZ-3P-qGO" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="o8Y-VR-Tgb"/>
+                        <constraint firstItem="KQS-5b-EYm" firstAttribute="top" secondItem="YGv-MC-rGM" secondAttribute="bottom" constant="22" id="u8C-WB-j66"/>
+                        <constraint firstItem="uqu-At-cU5" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="voV-lZ-Bcb"/>
+                        <constraint firstItem="CaV-Vg-83Z" firstAttribute="centerX" secondItem="uWt-SH-yKP" secondAttribute="centerX" id="wVb-TK-8rW"/>
+                    </constraints>
+                </scrollView>
+            </subviews>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <constraints>
+                <constraint firstItem="uWt-SH-yKP" firstAttribute="bottom" secondItem="Q5M-cg-NOt" secondAttribute="bottom" id="0kv-mk-8fZ"/>
+                <constraint firstItem="uWt-SH-yKP" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="Hiz-Jq-2Zt"/>
+                <constraint firstItem="uWt-SH-yKP" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="1" id="dsu-ko-bjd"/>
+                <constraint firstItem="uWt-SH-yKP" firstAttribute="trailing" secondItem="Q5M-cg-NOt" secondAttribute="trailing" id="n5D-6s-nKv"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+            <point key="canvasLocation" x="33.5" y="53.5"/>
+        </view>
+    </objects>
+    <resources>
+        <image name="bg_logo" width="88" height="88"/>
+    </resources>
+</document>

GIGA/Modules/Me/Controller/GIGaChangePassVC.h

@@ -0,0 +1,17 @@
+//
+//  GIGaChangePassVC.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GIGaChangePassVC : GiGaBaseViewController
+@property (weak, nonatomic) IBOutlet UITextField *oldPassField;
+@property (weak, nonatomic) IBOutlet UITextField *xinPassFiled;
+
+@property (weak, nonatomic) IBOutlet UITextField *reNewPassFiled;
+
+@end

GIGA/Modules/Me/Controller/GIGaChangePassVC.m

@@ -0,0 +1,101 @@
+//
+//  GIGaChangePassVC.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GIGaChangePassVC.h"
+#import "GiGaBaseAPiRequest.h"
+
+@interface GIGaChangePassVC ()
+
+@end
+
+@implementation GIGaChangePassVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addNavTitile:@"修改密码"];
+    // Do any additional setup after loading the view from its nib.
+    UIButton *saveBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [saveBtn addTarget:self action:@selector(doBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    saveBtn.frame = CGRectMake(0, 0,40, 36);
+    NSAttributedString *attrititle = [GiGaHelper stringWithText:@"完成" textColor:[UIColor whiteColor] textFont:GIGA_TEXTFONTMEDIUM(16) leterSpace:0];
+    [saveBtn setAttributedTitle:attrititle forState:UIControlStateNormal];
+    UIBarButtonItem *saveItem = [[UIBarButtonItem alloc] initWithCustomView:saveBtn];
+    self.navigationItem.rightBarButtonItem = saveItem;
+    
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+-(void)doBtnAction:(UIButton *)btn{
+    
+    if (self.oldPassField.text.length == 0) {
+        
+        //[self.view makeToast:@"请输入原密码" duration:2 position:CSToastPositionTop];
+        GIGA_ShowToast(@"请输入新密码");
+        return;
+    }
+    
+    if (self.xinPassFiled.text.length == 0) {
+        //[self.view makeToast:@"请输入新密码" duration:2 position:CSToastPositionTop];
+        GIGA_ShowToast(@"请输入新密码");
+        return;
+    }
+    
+    int leng = [GiGaHelper convertToInt: self.xinPassFiled.text];
+    if (!(leng >= 6 && leng <= 20)) {
+        GIGA_ShowToast(@"请输入6-20位数字和字母组成的新密码");
+        return;
+    }
+    
+    if (self.reNewPassFiled.text.length == 0) {
+        GIGA_ShowToast(@"请输入新密码");
+        return;
+    }
+    
+
+    if (self.reNewPassFiled.text != self.xinPassFiled.text) {
+        GIGA_ShowToast(@"两次输入密码不一致!");
+        return;
+    }
+
+    [self newPassBtnAction:btn];
+    
+}
+
+-(void)newPassBtnAction:(UIButton *)btn{
+    
+    btn.userInteractionEnabled = NO;
+    [self.view makeToastActivity:CSToastPositionCenter];
+    NSDictionary *params = @{
+                             @"password":self.oldPassField.text,
+                             @"newPassword":self.xinPassFiled.text,
+                             @"newPasswordConfirm":self.reNewPassFiled.text
+                             };
+    GiGaBaseAPiRequest *requst = [GiGaBaseAPiRequest initWithRequestPath:kPAiUSerEditpwd method:RequestPostMethod parms:params];
+    [requst requstDataWithResult:^(GiGaAPIResult *result) {
+        [self.view hideToastActivity];
+        btn.userInteractionEnabled = YES;
+        if (result.success) {
+             GIGA_WIndowTost(result.message);
+            [self.navigationController popViewControllerAnimated:YES];
+            
+        }else{
+                if (result.code == 401) {
+                    //token失效
+                    [GiGaBaseAPiRequest userTokenTimeOutGologinFromVC:self];
+                }
+               GIGA_WIndowTost(result.message);
+        }
+    }];
+    
+}
+
+@end

GIGA/Modules/Me/Controller/GIGaChangePassVC.xib

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GIGaChangePassVC">
+            <connections>
+                <outlet property="oldPassField" destination="7cM-MG-zEY" id="DVW-fJ-jPp"/>
+                <outlet property="reNewPassFiled" destination="ADk-hR-ecA" id="cyV-wS-htK"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
+                <outlet property="xinPassFiled" destination="kms-0e-gzX" id="RAH-Wh-ciA"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="旧密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fh3-Zt-2GC">
+                    <rect key="frame" x="29" y="57" width="42" height="20"/>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入旧密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="7cM-MG-zEY">
+                    <rect key="frame" x="106" y="49" width="245" height="36"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="36" id="BPG-0j-gO5"/>
+                    </constraints>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                    <textInputTraits key="textInputTraits" keyboardType="namePhonePad" secureTextEntry="YES"/>
+                </textField>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rCk-5f-1L2">
+                    <rect key="frame" x="29" y="107" width="42" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="42" id="5jH-Pe-blE"/>
+                        <constraint firstAttribute="height" constant="20" id="ikM-1u-Veu"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="PingFangHK-Medium" family="PingFang HK" pointSize="14"/>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入新密码(6～20位数字、字母、符号)" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kms-0e-gzX">
+                    <rect key="frame" x="106" y="101" width="244" height="31"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="31" id="zZ8-hZ-S7v"/>
+                    </constraints>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                    <textInputTraits key="textInputTraits" keyboardType="namePhonePad" secureTextEntry="YES"/>
+                </textField>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhF-Qv-2wC">
+                    <rect key="frame" x="29" y="157" width="70" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="70" id="cjc-Ev-bqF"/>
+                        <constraint firstAttribute="height" constant="20" id="qZq-xq-gJb"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PZp-JK-tgE">
+                    <rect key="frame" x="25" y="91" width="326" height="1"/>
+                    <color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="jJ1-iR-XMk"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OLf-js-1si">
+                    <rect key="frame" x="25" y="142" width="326" height="1"/>
+                    <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="cgb-hm-l73"/>
+                    </constraints>
+                </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jn6-n7-ZUF">
+                    <rect key="frame" x="29" y="194" width="322" height="1"/>
+                    <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="ifN-m4-Ink"/>
+                    </constraints>
+                </view>
+                <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="再次输入新密码" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ADk-hR-ecA">
+                    <rect key="frame" x="107" y="150" width="245" height="34"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="34" id="wMy-NI-PcK"/>
+                    </constraints>
+                    <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                    <textInputTraits key="textInputTraits" keyboardType="namePhonePad" secureTextEntry="YES"/>
+                </textField>
+            </subviews>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <constraints>
+                <constraint firstItem="HhF-Qv-2wC" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="29" id="2bp-ib-52A"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="PZp-JK-tgE" secondAttribute="trailing" constant="24" id="3Wr-2Z-Uej"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="kms-0e-gzX" secondAttribute="trailing" constant="25" id="3to-2U-Cst"/>
+                <constraint firstItem="7cM-MG-zEY" firstAttribute="centerY" secondItem="Fh3-Zt-2GC" secondAttribute="centerY" id="444-KF-WUw"/>
+                <constraint firstItem="Fh3-Zt-2GC" firstAttribute="top" secondItem="Q5M-cg-NOt" secondAttribute="top" constant="37" id="5fT-iT-CIN"/>
+                <constraint firstItem="OLf-js-1si" firstAttribute="top" secondItem="kms-0e-gzX" secondAttribute="bottom" constant="10" id="6CD-dm-Jg0"/>
+                <constraint firstItem="7cM-MG-zEY" firstAttribute="leading" secondItem="Fh3-Zt-2GC" secondAttribute="trailing" constant="35" id="6g0-Hl-cdM"/>
+                <constraint firstItem="PZp-JK-tgE" firstAttribute="top" secondItem="Fh3-Zt-2GC" secondAttribute="bottom" constant="14" id="7Cj-Ja-Q0c"/>
+                <constraint firstItem="rCk-5f-1L2" firstAttribute="top" secondItem="Fh3-Zt-2GC" secondAttribute="bottom" constant="30" id="7Zi-zv-09b"/>
+                <constraint firstItem="ADk-hR-ecA" firstAttribute="leading" secondItem="HhF-Qv-2wC" secondAttribute="trailing" constant="8" id="82h-9e-rhx"/>
+                <constraint firstItem="OLf-js-1si" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" constant="25" id="AEZ-8y-wJv"/>
+                <constraint firstItem="PZp-JK-tgE" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="25" id="F5I-N6-W6O"/>
+                <constraint firstItem="Fh3-Zt-2GC" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="29" id="IYG-qf-jua"/>
+                <constraint firstItem="Jn6-n7-ZUF" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="29" id="NTl-XK-gHv"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="Jn6-n7-ZUF" secondAttribute="trailing" constant="24" id="PED-OM-OK0"/>
+                <constraint firstItem="HhF-Qv-2wC" firstAttribute="top" secondItem="OLf-js-1si" secondAttribute="bottom" constant="14" id="Ru5-Fq-vEj"/>
+                <constraint firstAttribute="trailing" secondItem="OLf-js-1si" secondAttribute="trailing" constant="24" id="Tnh-gv-meP"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="ADk-hR-ecA" secondAttribute="trailing" constant="23" id="bMN-9l-hsL"/>
+                <constraint firstItem="kms-0e-gzX" firstAttribute="centerY" secondItem="rCk-5f-1L2" secondAttribute="centerY" constant="-1" id="f3v-vS-DMg"/>
+                <constraint firstItem="kms-0e-gzX" firstAttribute="leading" secondItem="rCk-5f-1L2" secondAttribute="trailing" constant="35" id="kNx-dP-EGV"/>
+                <constraint firstItem="rCk-5f-1L2" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" constant="29" id="n8e-7g-uhd"/>
+                <constraint firstItem="Jn6-n7-ZUF" firstAttribute="top" secondItem="ADk-hR-ecA" secondAttribute="bottom" constant="10" id="qez-p1-06i"/>
+                <constraint firstItem="ADk-hR-ecA" firstAttribute="centerY" secondItem="HhF-Qv-2wC" secondAttribute="centerY" id="rkb-vq-bCB"/>
+                <constraint firstItem="Q5M-cg-NOt" firstAttribute="trailing" secondItem="7cM-MG-zEY" secondAttribute="trailing" constant="24" id="uFj-qV-7fZ"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
+            <point key="canvasLocation" x="33.5" y="73.5"/>
+        </view>
+    </objects>
+</document>

GIGA/Modules/Me/Controller/GIGaMaskTimeUseRecordVC.h

@@ -0,0 +1,13 @@
+//
+//  GIGaMaskTimeUseRecordVC.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/20.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GIGaMaskTimeUseRecordVC : GiGaBaseViewController
+
+@end

GIGA/Modules/Me/Controller/GIGaMaskTimeUseRecordVC.m

@@ -0,0 +1,38 @@
+//
+//  GIGaMaskTimeUseRecordVC.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/20.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GIGaMaskTimeUseRecordVC.h"
+
+@interface GIGaMaskTimeUseRecordVC ()
+
+@end
+
+@implementation GIGaMaskTimeUseRecordVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addNavTitile:@"历史测试"];
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

GIGA/Modules/Me/Controller/GiGaChangePhoneNumberVC.h

@@ -0,0 +1,13 @@
+//
+//  GiGaChangePhoneNumberVC.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GiGaChangePhoneNumberVC : GiGaBaseViewController
+
+@end

GIGA/Modules/Me/Controller/GiGaChangePhoneNumberVC.m

@@ -0,0 +1,300 @@
+//
+//  GiGaChangePhoneNumberVC.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaChangePhoneNumberVC.h"
+#import "GIGaUserChangeMobleCell.h"
+#import "GiGaBaseAPiRequest.h"
+
+//typedef NS_ENUM(NSInteger,PohoneCodeType)
+//{
+//    PohoneCodeTypeOld = 0,//原手机号
+//    PohoneCodeTypeNew//新手机号
+//
+//
+//};
+
+@interface GiGaChangePhoneNumberVC ()
+//@property(nonatomic) PohoneCodeType  viewCodeType;
+@property(nonatomic) BOOL nextSteep;
+@property(nonatomic,copy) NSString *oldCode;
+@property(nonatomic,copy) NSString *xinCode;
+@end
+
+@implementation GiGaChangePhoneNumberVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addNavTitile:@"修改手机号"];
+    _nextSteep = NO;
+    // Do any additional setup after loading the view from its nib.
+    [self.view addSubview:self.tableView];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.backgroundColor = [UIColor whiteColor];
+    self.tableView.separatorStyle = UITableViewCellSelectionStyleNone;
+    self.tableView.sectionFooterHeight = 0;
+    self.tableView.estimatedSectionFooterHeight=  0;
+    self.tableView.estimatedSectionHeaderHeight = 0;
+    self.tableView.bounces = NO;
+    self.tableView.frame = CGRectMake(0,0, KMainW, self.view.bounds.size.height - SAFE_NAV_HEIGHT);
+   
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+
+    return 1;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    
+    
+    GIGaUserChangeMobleCell *cell = [tableView dequeueReusableCellWithIdentifier:@"GIGaUserChangeMobleCell"];
+    if(!cell){
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"GIGaUserChangeMobleCell" owner:self options:nil] lastObject];
+        
+    }
+    [cell.codeSendBtn addTarget:self action:@selector(sendCodeBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    if (_nextSteep) {
+        cell.numberTexFiled.userInteractionEnabled = YES;
+        cell.oldBtn.backgroundColor = GIGARGB(227, 227, 227, 1);
+        
+        NSAttributedString *atti1 = [GiGaHelper stringWithText:@"1.验证原号码" textColor:GIGARGB(165,165, 165, 1) textFont:GIGA_TEXTFONTMEDIUM(13) leterSpace:0];
+        [cell.oldBtn setAttributedTitle:atti1 forState:UIControlStateNormal];
+        
+        cell.xinPhoneBtn.backgroundColor = GIGARGB(227, 227, 227, 1);
+        NSAttributedString *atti = [GiGaHelper stringWithText:@"2.绑定新手机" textColor:GIGARGB(131, 10, 10, 1) textFont:GIGA_TEXTFONTMEDIUM(13) leterSpace:0];
+        [cell.xinPhoneBtn setAttributedTitle:atti forState:UIControlStateNormal];
+        
+        [cell.xinPhoneBtn setBackgroundImage:[UIImage imageNamed:@"user_changephonewihte"] forState:UIControlStateNormal];
+         
+    }else{
+        
+        cell.numberTexFiled.userInteractionEnabled = NO;
+       
+    }
+    
+    return cell;
+    
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 170.f;
+    
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    
+    return 115.f;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+   
+    return 0.1;
+}
+
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section{
+    UIView *view = [[UIView alloc] init];
+    UIButton *nextBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    nextBtn.backgroundColor = GIGARGB(181, 14, 14, 1);
+    nextBtn.layer.masksToBounds = YES;
+    nextBtn.layer.cornerRadius = 41/2;
+
+    [nextBtn addTarget:self action:@selector(nextBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+    nextBtn.frame = CGRectMake((KMainW - 244)/2 , 5, 244, 41);
+    if (_nextSteep) {
+        NSAttributedString *attrititle = [GiGaHelper stringWithText:@"下一步" textColor:[UIColor whiteColor] textFont:GIGA_TEXTFONTBOLD(16) leterSpace:0];
+        [nextBtn setAttributedTitle:attrititle forState:UIControlStateNormal];
+    }else{
+        NSAttributedString *attrititle = [GiGaHelper stringWithText:@"完成" textColor:[UIColor whiteColor] textFont:GIGA_TEXTFONTBOLD(16) leterSpace:0];
+        [nextBtn setAttributedTitle:attrititle forState:UIControlStateNormal];
+    }
+    [view addSubview:nextBtn];
+    
+    UILabel *tishiLab = [[UILabel alloc] init];
+    tishiLab.frame = CGRectMake((KMainW - 70)/2,CGRectGetMaxY(nextBtn.frame) + 32, 70, 14);
+    NSMutableAttributedString *attriTile = [[NSMutableAttributedString alloc] init];
+    NSTextAttachment *attch = [[NSTextAttachment alloc] init];
+    attch.image = [UIImage imageNamed:@"ic_love"];
+    attch.bounds = CGRectMake(-2,-3, 12, 12);
+    NSAttributedString *imastr=[NSAttributedString attributedStringWithAttachment:attch];
+    [attriTile appendAttributedString:imastr];
+    
+    NSAttributedString *titleStr = [[NSAttributedString alloc] initWithString:@"温馨提示:" attributes:@{NSFontAttributeName:GIGA_TEXTFONTMEDIUM(10), NSForegroundColorAttributeName:GIGARGB(187, 187, 187, 1)}];
+    [attriTile appendAttributedString:titleStr];
+    
+    tishiLab.attributedText = attriTile;
+    [view addSubview:tishiLab];
+    
+    
+    UILabel *desc =[[UILabel alloc] init];
+    desc.frame = CGRectMake((KMainW - 240.f) / 2 , CGRectGetMaxY(tishiLab.frame) + 2, 240, 14);
+    
+    desc.text =@"手机号码修改成功后需要使用新的手机号进行登陆哟。";
+    desc.textColor = GIGARGB(187, 187, 187, 1);
+    desc.font = GIGA_TEXTFONTMEDIUM(10);
+    [view addSubview:desc];
+
+    return view;
+}
+#pragma mark 下一步 Or 完成
+-(void)nextBtnAction:(UIButton *)btn{
+    
+
+    if (_nextSteep) {
+        GILog(@"完成");
+        
+        GIGaUserChangeMobleCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        if (cell.numberTexFiled.text.length == 0) {
+            GIGA_ShowToast(@"请输入新手机号");
+            return;
+        }
+        if (![GiGaHelper isPhoneNumber:cell.numberTexFiled.text]) {
+            GIGA_ShowToast(@"请输入正确手机号");
+            return;
+        }
+        
+        if (cell.codeTexFiled.text.length == 0) {
+            GIGA_ShowToast(@"请输入新手机验证码");
+            return;
+        }
+        
+        [self verifyPhoneCode:cell.numberTexFiled.text code:cell.codeTexFiled.text btn:btn];
+        
+        
+    }else{
+        GILog(@"下一步");
+        
+        GIGaUserChangeMobleCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        //
+        if (cell.codeTexFiled.text.length == 0) {
+            GIGA_ShowToast(@"请输入验证码");
+            return;
+        }
+        
+        GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+        if (!user.mobile ||  [user.mobile isKindOfClass:[NSNull class]]) {
+            GILog(@"手机号为空");
+            return;
+        }
+        
+        [self verifyPhoneCode:user.mobile code:cell.codeTexFiled.text btn:btn];
+
+    }
+}
+
+-(void)finishBtn:(UIButton *)btn wtihNewPhone:(NSString *)xinNumber{
+    
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    NSString *oldphone = user.mobile;
+    
+    GiGaBaseAPiRequest *api = [GiGaBaseAPiRequest initWithRequestPath: kApiChangePhone method:RequestPostMethod parms:@{@"oldMobile":oldphone,@"newMobile":xinNumber,@"oldVerifiedCode":self.oldCode,@"newVerifiedCode":self.xinCode}];
+    [api requstDataWithResult:^(GiGaAPIResult *result) {
+        btn.userInteractionEnabled = YES;
+        [self.view hideToastActivity];
+        
+        if (result.success) {
+            GIGA_WIndowTost(@"手机号修改成功");
+            [self.navigationController popViewControllerAnimated:YES];
+        }else{
+            GIGA_ShowToast(result.message);
+        }
+    }];
+}
+
+#pragma mark  - 发送验证码
+-(void)sendCodeBtnAction:(UIButton *)btn{
+
+    if (_nextSteep) {
+        GIGaUserChangeMobleCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        if (cell.numberTexFiled.text.length == 0) {
+            GIGA_ShowToast(@"请输新手机号");
+            return;
+        }
+    
+        self.xinCode = cell.codeTexFiled.text;
+        [self sendCodeWith:cell.numberTexFiled.text];
+        
+    }else{
+        
+        GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+        if (!user.mobile ||  [user.mobile isKindOfClass:[NSNull class]]) {
+            GILog(@"手机号为空");
+            return;
+        }
+        [self sendCodeWith:user.mobile];
+        
+    }
+}
+
+-(void)sendCodeWith:(NSString *)phone{
+    NSString *utl = nil;
+    if (_nextSteep) {
+        utl= kApiChangeMobleCode;
+    }else{
+        utl= kApiSendPhoneCode;
+    }
+    GiGaBaseAPiRequest *api = [GiGaBaseAPiRequest initWithRequestPath:utl method:RequestPostMethod parms:@{@"mobile":phone}];
+    [api requstDataWithResult:^(GiGaAPIResult *result) {
+        if (result.success) {
+            GIGA_ShowToast(@"已发送");
+        }else{
+            GIGA_ShowToast(result.message);
+        }
+    }];
+}
+
+#pragma mark - 验证手机验证码
+-(void)verifyPhoneCode:(NSString *)phonenumber code:(NSString *)code btn:(UIButton *)btn
+{
+    btn.userInteractionEnabled = NO;
+    [self.view makeToastActivity:CSToastPositionCenter];
+    GiGaBaseAPiRequest *api = [GiGaBaseAPiRequest initWithRequestPath:kApiVersifyPhoneCode method:RequestPostMethod parms:@{@"mobile":phonenumber,@"verifiedCode":code}];
+    [api requstDataWithResult:^(GiGaAPIResult *result) {
+        
+        if (result.success) {
+            if (self.nextSteep) {
+                //验证码通过 完成
+                [self finishBtn:btn wtihNewPhone:phonenumber];
+                
+            }else{
+                btn.userInteractionEnabled = YES;
+                [self.view hideToastActivity];
+                self.nextSteep = YES;
+                self.oldCode = code;
+                [self.tableView reloadData];
+            }
+           
+        }else{
+            btn.userInteractionEnabled = YES;
+            [self.view hideToastActivity];
+            GIGA_ShowToast(result.message);
+        }
+    }];
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

GIGA/Modules/Me/Controller/GiGaFeedBackViewController.h

@@ -0,0 +1,13 @@
+//
+//  GiGaFeedBackViewController.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GiGaFeedBackViewController : GiGaBaseViewController
+
+@end

GIGA/Modules/Me/Controller/GiGaFeedBackViewController.m

@@ -0,0 +1,38 @@
+//
+//  GiGaFeedBackViewController.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaFeedBackViewController.h"
+
+@interface GiGaFeedBackViewController ()
+
+@end
+
+@implementation GiGaFeedBackViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self addNavTitile:@"意见反馈"];
+    // Do any additional setup after loading the view.
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

GIGA/Modules/Me/Controller/GiGaMeViewController.m

@@ -16,6 +16,8 @@
 #import "GiGaBaseAPiRequest.h"
 #import "GiGaUserManager.h"
 #import "UIImageView+WebCache.h"
+#import "GiGaUserInfoVC.h"
+#import "GIGaMaskTimeUseRecordVC.h"
 
 @interface GiGaMeViewController ()
 @property (nonatomic,strong) GiGaUser *user;
@@ -39,23 +41,43 @@
     self.tableView.estimatedSectionHeaderHeight = 0;
     self.tableView.bounces = NO;
     self.tableView.frame = CGRectMake(0, 1, KMainW, self.view.bounds.size.height - SAFE_NAV_HEIGHT);
-    [self loadUserInfo];
+    //[self loadUserInfo];
-    NC_ADD_TARGET_NAME_OBJECT(self, @selector(userAvatorUpDate), kUserAvatorUpdateNoti, nil) ;
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
+    NC_ADD_TARGET_NAME_OBJECT(self, @selector(userAvatorUpDate), kUserAvatorUpdateNoti, nil);
+    NC_ADD_TARGET_NAME_OBJECT(self, @selector(usersNameUpDateNoti), kUserNameUpDateNoti, nil);
+    
+}
+
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    
 }
 
 -(void)dealloc{
     NC_REMOVE_NAME(self, kUserAvatorUpdateNoti, nil);
+    NC_REMOVE_NAME(self, kUserNameUpDateNoti, nil);
 }
 
 -(void)userAvatorUpDate{
     
     GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
     if (user.headImgUrl && ![user.headImgUrl isKindOfClass:[NSNull class]] ) {
         GiGaMineUserViewCell *cell = [self.tableView  cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
         NSURL *url = [NSURL URLWithString:user.headImgUrl];
         [cell.userAvator sd_setImageWithURL:url];
+        
+    }
+}
+
+-(void)usersNameUpDateNoti{
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
+    if (user.nickName && ![user.nickName isEqualToString:@""] && ![user.nickName isKindOfClass:[NSNull class]]) {
+        GiGaMineUserViewCell *cell = [self.tableView  cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        cell.userName.text = user.nickName;
     }
-    
 }
 
 -(void)loadUserInfo{
@@ -120,7 +142,7 @@
     }
     
     if(indexPath.section == 0){
-        GiGaUserViewController *userVC= [[GiGaUserViewController alloc] init];
+        GiGaUserInfoVC *userVC= [[GiGaUserInfoVC alloc] init];
         [self.navigationController pushViewController:userVC animated:YES];
         
     }else{
@@ -130,6 +152,9 @@
             [self.navigationController pushViewController:historyVC animated:YES];
             
         }else if (indexPath.section == 1 && indexPath.row == 1){
+            //使用记录
+            GIGaMaskTimeUseRecordVC *historyVC= [[GIGaMaskTimeUseRecordVC alloc] init];
+            [self.navigationController pushViewController:historyVC animated:YES];
             
         }else{
             //系统设置

GIGA/Modules/Me/Controller/GiGaUserInfoVC.h

@@ -0,0 +1,13 @@
+//
+//  GiGaUserInfoVC.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaBaseViewController.h"
+
+@interface GiGaUserInfoVC : GiGaBaseViewController
+
+@end

GIGA/Modules/Me/Controller/GiGaUserInfoVC.m

@@ -0,0 +1,167 @@
+//
+//  GiGaUserInfoVC.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGaUserInfoVC.h"
+#import "GiGaMineUserViewCell.h"
+#import "GiGAUserInfoCell.h"
+#import "UIImageView+WebCache.h"
+#import "GiGaUserViewController.h"
+#import "GIGaChangePassVC.h"
+#import "GiGaChangePhoneNumberVC.h"
+
+@interface GiGaUserInfoVC ()
+@property (nonatomic,strong) GiGaUser *user;
+@end
+
+@implementation GiGaUserInfoVC
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    [self addNavTitile:@"个人中心"];
+    [self.view addSubview:self.tableView];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.backgroundColor = [UIColor whiteColor];
+    self.tableView.separatorStyle = UITableViewCellSelectionStyleNone;
+    self.tableView.sectionFooterHeight = 0;
+    self.tableView.estimatedSectionFooterHeight=  0;
+    self.tableView.estimatedSectionHeaderHeight = 0;
+    self.tableView.bounces = NO;
+    self.tableView.frame = CGRectMake(0, 1, KMainW, self.view.bounds.size.height - SAFE_NAV_HEIGHT);
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
+    NC_ADD_TARGET_NAME_OBJECT(self, @selector(userAvatorUpDate), kUserAvatorUpdateNoti, nil);
+    NC_ADD_TARGET_NAME_OBJECT(self, @selector(usersNameUpDateNoti), kUserNameUpDateNoti, nil);
+    
+}
+
+-(void)dealloc{
+    NC_REMOVE_NAME(self, kUserAvatorUpdateNoti, nil);
+    NC_REMOVE_NAME(self, kUserNameUpDateNoti, nil);
+}
+
+-(void)userAvatorUpDate{
+    
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
+    if (user.headImgUrl && ![user.headImgUrl isKindOfClass:[NSNull class]] ) {
+        GiGaMineUserViewCell *cell = [self.tableView  cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        NSURL *url = [NSURL URLWithString:user.headImgUrl];
+        [cell.userAvator sd_setImageWithURL:url];
+        
+    }
+}
+
+-(void)usersNameUpDateNoti{
+    GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+    self.user = user;
+    if (user.nickName && ![user.nickName isEqualToString:@""] && ![user.nickName isKindOfClass:[NSNull class]]) {
+        GiGaMineUserViewCell *cell = [self.tableView  cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+        cell.userName.text = user.nickName;
+    }
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 2;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    
+    if (section == 0){
+        return 1;
+    }
+    return 3;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if(indexPath.section ==0){
+        GiGaMineUserViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"GiGaMineUserViewCell"];
+        if(!cell){
+            cell = [[[NSBundle mainBundle] loadNibNamed:@"GiGaMineUserViewCell" owner:self options:nil] lastObject];
+            
+        }
+        
+        if (self.user) {
+            [cell loadUserinfoWith:self.user];
+        }
+        return cell;
+    }
+    GiGAUserInfoCell *cell = [tableView dequeueReusableCellWithIdentifier:@"GiGAUserInfoCell"];
+    if(!cell){
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"GiGAUserInfoCell" owner:self options:nil] lastObject];
+        
+    }
+    [cell loadCellData:indexPath];
+    return cell;
+    
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    if(indexPath.section == 1){
+        [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    }
+    
+    if(indexPath.section == 0){
+        GiGaUserViewController *userVC= [[GiGaUserViewController alloc] init];
+        [self.navigationController pushViewController:userVC animated:YES];
+        
+    }else{
+        if (indexPath.section == 1 && indexPath.row == 0 ){
+            GiGaUserViewController *userVC= [[GiGaUserViewController alloc] init];
+            [self.navigationController pushViewController:userVC animated:YES];
+            
+        }else if (indexPath.section == 1 && indexPath.row == 1){
+            
+            GIGaChangePassVC *changePass = [[GIGaChangePassVC alloc] init];
+            [self.navigationController pushViewController:changePass animated:YES];
+            
+        }else{
+            
+            GiGaChangePhoneNumberVC *changePass = [[GiGaChangePhoneNumberVC alloc] init];
+            [self.navigationController pushViewController:changePass animated:YES];
+            
+        }
+    }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if(indexPath.section==0){
+        return 139;
+    }else {
+        return 54;
+    }
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
+    return 0.1;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
+    if (section == 1){
+        return 6;
+    }
+    return 0.1;
+}
+
+-(UIView*)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
+    
+    if (section == 1) {
+        UIView *view = [[UIView alloc] init];
+        view.backgroundColor = GIGARGB(222, 222, 222, 1);
+        return view;
+    }
+    return nil;
+}
+
+@end

GIGA/Modules/Me/Controller/GiGaUserViewController.m

@@ -342,8 +342,11 @@
         [self.view hideToastActivity];
         if (result.success) {
             GIGA_ShowToast(@"修改成功");
+            
             [[GiGaUserManager shareUser] saveUser:self.user];
             
+            NC_POST_NAME_OBJECT(kUserNameUpDateNoti, nil);
+            
         }else{
             GIGA_ShowToast(result.dic[@"msg"]);
             if (result.code == 401) {

GIGA/Modules/Me/Controller/GiSysSettingsVC.m

@@ -12,6 +12,8 @@
 #import "GiGaUserDefault.h"
 #import "GiGaUserManager.h"
 #import "AppVerionDescriptionVC.h"
+#import "GIGaAboutUsVC.h"
+#import "GiGaFeedBackViewController.h"
 
 @interface GiSysSettingsVC ()
 
@@ -70,9 +72,11 @@
             
         }];
     }else if (indexPath.row == 1){
-        
+        GiGaFeedBackViewController *feedVC = [[GiGaFeedBackViewController alloc] init];
+        [self.navigationController pushViewController:feedVC  animated:YES];
     }else if (indexPath.row == 2){
-        
+        GIGaAboutUsVC *usVC= [[GIGaAboutUsVC alloc] init];
+        [self.navigationController pushViewController:usVC animated:YES];
     }else if (indexPath.row == 3){
         AppVerionDescriptionVC *verVC =[[AppVerionDescriptionVC alloc] init];
         [self.navigationController pushViewController:verVC animated:YES];

GIGA/Modules/Me/Model/GiGaUser.h

@@ -19,6 +19,7 @@
 @property(nonatomic,copy) NSString *cityName;
 @property(nonatomic,copy) NSString *headImgUrl;
 
+@property(nonatomic,copy) NSString *mobile;
 @property(nonatomic,copy) NSString *mobileMask;
 @property(nonatomic,assign) NSInteger mobileStatus;
 @property(nonatomic,copy) NSString *mobileStatusName;

GIGA/Modules/Me/View/AppVerionDescCells/AppVersionDescCell.h

@@ -7,8 +7,12 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "VersionModel.h"
 
 @interface AppVersionDescCell : UITableViewCell
 @property (weak, nonatomic) IBOutlet UILabel *VersionDescLabel;
+@property (weak, nonatomic) IBOutlet UILabel *versionLabe;
+@property (weak, nonatomic) IBOutlet UILabel *tempLabe;
+-(void)loadCellDataAt:(NSIndexPath *)indexPath version:(VersionModel *)model;
 
 @end

GIGA/Modules/Me/View/AppVerionDescCells/AppVersionDescCell.m

@@ -17,6 +17,13 @@
     
 }
 
+-(void)loadCellDataAt:(NSIndexPath *)indexPath version:(VersionModel *)model{
+    self.VersionDescLabel.text = model.content;
+    self.versionLabe.text = model.title;
+    self.tempLabe.text = model.createTime;
+    
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];
 

GIGA/Modules/Me/View/AppVerionDescCells/AppVersionDescCell.xib

@@ -32,13 +32,29 @@
                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="V1.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNp-3o-Day">
+                        <rect key="frame" x="7" y="11" width="27.5" height="20"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="14"/>
+                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gq7-SB-R78">
+                        <rect key="frame" x="330" y="11" width="29" height="19"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstItem="v31-x8-IlY" firstAttribute="top" secondItem="JXV-Zf-Ztb" secondAttribute="bottom" constant="15" id="26g-Zf-2QA"/>
+                    <constraint firstItem="nNp-3o-Day" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="11" id="2jZ-Ky-FFC"/>
+                    <constraint firstAttribute="trailing" secondItem="gq7-SB-R78" secondAttribute="trailing" constant="16" id="64C-Qu-X4e"/>
                     <constraint firstAttribute="trailing" secondItem="v31-x8-IlY" secondAttribute="trailing" constant="7" id="Ama-ed-0mY"/>
                     <constraint firstItem="v31-x8-IlY" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="7" id="Fax-Sh-1aI"/>
+                    <constraint firstItem="nNp-3o-Day" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="7" id="ddT-Gk-lT5"/>
                     <constraint firstAttribute="trailing" secondItem="JXV-Zf-Ztb" secondAttribute="trailing" id="e2a-v1-3mo"/>
                     <constraint firstItem="JXV-Zf-Ztb" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="40" id="oxm-rv-lzY"/>
+                    <constraint firstItem="gq7-SB-R78" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="11" id="u1e-1d-cgh"/>
                     <constraint firstItem="JXV-Zf-Ztb" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="uZy-ia-fM8"/>
                 </constraints>
             </tableViewCellContentView>
@@ -46,6 +62,8 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
                 <outlet property="VersionDescLabel" destination="v31-x8-IlY" id="Rfo-xt-BWD"/>
+                <outlet property="tempLabe" destination="gq7-SB-R78" id="F3e-f2-IHK"/>
+                <outlet property="versionLabe" destination="nNp-3o-Day" id="mjy-8A-vA1"/>
             </connections>
             <point key="canvasLocation" x="33.5" y="87"/>
         </tableViewCell>

GIGA/Modules/Me/View/AppVerionDescCells/AppVersionLogoCell.xib

@@ -40,7 +40,7 @@
                     <constraint firstItem="xDN-Vh-dG1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="31" id="hPh-Q6-tZd"/>
                 </constraints>
             </tableViewCellContentView>
-            <color key="backgroundColor" red="0.51372549020000002" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="calibratedRGB"/>
+            <color key="backgroundColor" red="0.51372549020000002" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <point key="canvasLocation" x="34" y="96.5"/>
         </tableViewCell>

GIGA/Modules/Me/View/GiGAUserInfoCell.h

@@ -0,0 +1,17 @@
+//
+//  GiGAUserInfoCell.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GiGAUserInfoCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UILabel *infoTitle;
+@property (weak, nonatomic) IBOutlet UILabel *numberLabe;
+
+-(void)loadCellData:(NSIndexPath *)indexPath;
+
+@end

GIGA/Modules/Me/View/GiGAUserInfoCell.m

@@ -0,0 +1,44 @@
+//
+//  GiGAUserInfoCell.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GiGAUserInfoCell.h"
+
+@implementation GiGAUserInfoCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+-(void)loadCellData:(NSIndexPath *)indexPath{
+    if (indexPath.section == 1 && indexPath.row == 0) {
+        //个人信息
+        self.infoTitle.text = @"个人信息";
+        self.numberLabe.hidden = YES;
+    }else if (indexPath.section == 1 && indexPath.row == 1){
+        //修改密码
+        self.infoTitle.text = @"修改密码";
+        self.numberLabe.hidden = YES;
+    }else if (indexPath.section == 1 && indexPath.row == 2){
+        //修改手机
+        self.infoTitle.text = @"修改手机";
+        self.numberLabe.hidden = NO;
+        GiGaUser *user = [[GiGaUserManager shareUser] getCurrentUser];
+        self.numberLabe.text =  user.mobileMask;
+        
+    }
+    
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

GIGA/Modules/Me/View/GiGAUserInfoCell.xib

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="GiGAUserInfoCell" id="KGk-i7-Jjw" customClass="GiGAUserInfoCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTl-oI-Mf6">
+                        <rect key="frame" x="16" y="11" width="37" height="20"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                        <color key="textColor" red="0.21568627450980393" green="0.21568627450980393" blue="0.21568627450980393" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Df-4e-35M">
+                        <rect key="frame" x="293" y="10" width="37" height="20"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                        <color key="textColor" red="0.2156862745" green="0.2156862745" blue="0.2156862745" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_indicator_right" translatesAutoresizingMaskIntoConstraints="NO" id="beP-cc-pCK">
+                        <rect key="frame" x="343" y="14" width="8.5" height="14"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="8.5" id="JgK-pL-apL"/>
+                            <constraint firstAttribute="height" constant="14" id="m28-NI-Wlo"/>
+                        </constraints>
+                    </imageView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l3j-L5-7Uw">
+                        <rect key="frame" x="16" y="43" width="328" height="1"/>
+                        <color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="zOJ-Ek-dgz"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="beP-cc-pCK" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="0BO-mg-TpM"/>
+                    <constraint firstItem="7Df-4e-35M" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" constant="-1.75" id="IOX-Kf-b5p"/>
+                    <constraint firstItem="l3j-L5-7Uw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="N5r-PD-EsH"/>
+                    <constraint firstItem="FTl-oI-Mf6" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="Z3q-9F-Dxi"/>
+                    <constraint firstItem="beP-cc-pCK" firstAttribute="leading" secondItem="7Df-4e-35M" secondAttribute="trailing" constant="13" id="gg8-Ms-yU1"/>
+                    <constraint firstItem="FTl-oI-Mf6" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="hKa-gq-Jxw"/>
+                    <constraint firstAttribute="trailing" secondItem="beP-cc-pCK" secondAttribute="trailing" constant="23.5" id="mZY-Vf-3nT"/>
+                    <constraint firstAttribute="bottom" secondItem="l3j-L5-7Uw" secondAttribute="bottom" id="rKH-xt-5nd"/>
+                    <constraint firstAttribute="trailing" secondItem="l3j-L5-7Uw" secondAttribute="trailing" constant="31" id="u3G-a1-ogU"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="infoTitle" destination="FTl-oI-Mf6" id="p6v-b8-qo9"/>
+                <outlet property="numberLabe" destination="7Df-4e-35M" id="dAE-Qu-dVQ"/>
+            </connections>
+            <point key="canvasLocation" x="24.5" y="54"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="user_indicator_right" width="9" height="14"/>
+    </resources>
+</document>

GIGA/Modules/Me/View/GiGaMineInfoViewCell.xib

@@ -37,7 +37,7 @@
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O4K-t3-KxB">
                         <rect key="frame" x="0.0" y="53" width="409" height="1"/>
-                        <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="lgP-Cy-DDC"/>
                         </constraints>

GIGA/Modules/Me/View/GiGaMineUserViewCell.m

@@ -31,10 +31,13 @@
     if (user.headImgUrl && ![user.nickName isKindOfClass:[NSNull class]]) {
         [self.userAvator sd_setImageWithURL:[NSURL URLWithString:user.headImgUrl]];
     }
-    if (!user.nickName && ![user.nickName isKindOfClass:[NSNull class]]) {
+    
-        self.userName.text = user.nickName;
+    if (!user.nickName || [user.nickName isKindOfClass:[NSNull class]] || [user.nickName isEqualToString:@""]) {
-    }else{
+        
         self.userName.text = @"GIGAUser666";
+        
+    }else{
+        self.userName.text = user.nickName;
     }
     
 }

GIGA/Modules/Me/View/userInfoView/GIGaUserChangeMobleCell.h

@@ -0,0 +1,19 @@
+//
+//  GIGaUserChangeMobleCell.h
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface GIGaUserChangeMobleCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UIButton *codeSendBtn;
+@property (weak, nonatomic) IBOutlet UIButton *oldBtn;
+@property (weak, nonatomic) IBOutlet UIButton *xinPhoneBtn;
+
+@property (weak, nonatomic) IBOutlet UITextField *numberTexFiled;
+@property (weak, nonatomic) IBOutlet UITextField *codeTexFiled;
+
+@end

GIGA/Modules/Me/View/userInfoView/GIGaUserChangeMobleCell.m

@@ -0,0 +1,29 @@
+//
+//  GIGaUserChangeMobleCell.m
+//  GIGA
+//
+//  Created by lianxiang on 2018/9/19.
+//  Copyright © 2018年 com.giga.ios. All rights reserved.
+//
+
+#import "GIGaUserChangeMobleCell.h"
+
+@implementation GIGaUserChangeMobleCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+    self.codeSendBtn.layer.masksToBounds = YES;
+    self.codeSendBtn.layer.cornerRadius = 2;
+    
+}
+
+
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

GIGA/Modules/Me/View/userInfoView/GIGaUserChangeMobleCell.xib

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="GIGaUserChangeMobleCell" id="KGk-i7-Jjw" customClass="GIGaUserChangeMobleCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="170"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="169.5"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2ZD-g3-5XT">
+                        <rect key="frame" x="0.0" y="0.0" width="161" height="49"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="49" id="8X4-gu-I7p"/>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="161" id="KZV-my-7i5"/>
+                            <constraint firstAttribute="height" constant="49" id="Sbd-Zj-PhK"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                        <state key="normal" title="1.验证原手机号">
+                            <color key="titleColor" red="0.51372549019607838" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                        </state>
+                    </button>
+                    <button opaque="NO" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0O3-uD-8he">
+                        <rect key="frame" x="161" y="0.0" width="159" height="49"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="49" id="gHg-LI-QBV"/>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="159" id="udM-bR-3xe"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                        <state key="normal" title="2. 绑定新手机" backgroundImage="bg_change_newnumber">
+                            <color key="titleColor" red="0.6470588235294118" green="0.6470588235294118" blue="0.6470588235294118" alpha="1" colorSpace="calibratedRGB"/>
+                        </state>
+                    </button>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ltN-mh-pCu">
+                        <rect key="frame" x="0.0" y="48" width="320" height="1"/>
+                        <color key="backgroundColor" red="0.8901960784313725" green="0.8901960784313725" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="1" id="BUO-kq-9vw"/>
+                        </constraints>
+                    </view>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BHw-jn-B4K">
+                        <rect key="frame" x="25" y="96" width="271" height="1"/>
+                        <color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="d5m-4a-rgv"/>
+                        </constraints>
+                    </view>
+                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="111*****19199" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zKj-gY-1hq">
+                        <rect key="frame" x="22" y="60" width="182" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="1lF-nU-EXq"/>
+                        </constraints>
+                        <nil key="textColor"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="14"/>
+                        <textInputTraits key="textInputTraits"/>
+                    </textField>
+                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hGp-Ng-Bdl">
+                        <rect key="frame" x="22" y="100" width="274" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="30" id="qX8-fG-b53"/>
+                        </constraints>
+                        <color key="textColor" red="0.73333333333333328" green="0.73333333333333328" blue="0.73333333333333328" alpha="1" colorSpace="calibratedRGB"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
+                        <textInputTraits key="textInputTraits"/>
+                    </textField>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xj0-4q-Lcf">
+                        <rect key="frame" x="25" y="137" width="271" height="1"/>
+                        <color key="backgroundColor" red="0.87058823529411766" green="0.87058823529411766" blue="0.87058823529411766" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="aPk-X1-OSE"/>
+                        </constraints>
+                    </view>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yh7-p6-Uf5">
+                        <rect key="frame" x="245" y="56" width="59" height="30"/>
+                        <color key="backgroundColor" red="0.70980392160000005" green="0.054901960780000002" blue="0.054901960780000002" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="30" id="8iy-aa-Gc9"/>
+                            <constraint firstAttribute="width" constant="59" id="eTQ-av-rBv"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="10"/>
+                        <state key="normal" title="发送验证码"/>
+                    </button>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="ltN-mh-pCu" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="48" id="1B7-Zk-FVf"/>
+                    <constraint firstAttribute="trailing" secondItem="Xj0-4q-Lcf" secondAttribute="trailing" constant="24" id="1lK-gV-mIr"/>
+                    <constraint firstItem="ltN-mh-pCu" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="35t-8L-aG2"/>
+                    <constraint firstItem="BHw-jn-B4K" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="25" id="3B1-1D-A2u"/>
+                    <constraint firstItem="0O3-uD-8he" firstAttribute="leading" secondItem="2ZD-g3-5XT" secondAttribute="trailing" id="6K7-mx-gbk"/>
+                    <constraint firstItem="Xj0-4q-Lcf" firstAttribute="top" secondItem="hGp-Ng-Bdl" secondAttribute="bottom" constant="7" id="6u4-GR-ox5"/>
+                    <constraint firstItem="2ZD-g3-5XT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="CiT-60-LRQ"/>
+                    <constraint firstItem="zKj-gY-1hq" firstAttribute="top" secondItem="ltN-mh-pCu" secondAttribute="bottom" constant="11" id="DHw-st-cVi"/>
+                    <constraint firstItem="Xj0-4q-Lcf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="25" id="EuX-go-oDE"/>
+                    <constraint firstAttribute="trailing" secondItem="BHw-jn-B4K" secondAttribute="trailing" constant="24" id="JF7-TA-MUQ"/>
+                    <constraint firstItem="BHw-jn-B4K" firstAttribute="top" secondItem="yh7-p6-Uf5" secondAttribute="bottom" constant="10" id="KuJ-Ad-Lou"/>
+                    <constraint firstItem="0O3-uD-8he" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="LN4-jM-a7y"/>
+                    <constraint firstItem="yh7-p6-Uf5" firstAttribute="leading" secondItem="zKj-gY-1hq" secondAttribute="trailing" constant="41" id="PM7-xr-Z8C"/>
+                    <constraint firstAttribute="trailing" secondItem="0O3-uD-8he" secondAttribute="trailing" id="VMO-hZ-ZR6"/>
+                    <constraint firstItem="2ZD-g3-5XT" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Yar-X7-iHB"/>
+                    <constraint firstAttribute="trailing" secondItem="hGp-Ng-Bdl" secondAttribute="trailing" constant="24" id="aQD-wy-GKM"/>
+                    <constraint firstAttribute="trailing" secondItem="ltN-mh-pCu" secondAttribute="trailing" id="edS-VB-4JC"/>
+                    <constraint firstAttribute="trailing" secondItem="yh7-p6-Uf5" secondAttribute="trailing" constant="16" id="el7-tP-Ix7"/>
+                    <constraint firstItem="zKj-gY-1hq" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="22" id="fPU-n6-Hyd"/>
+                    <constraint firstAttribute="bottomMargin" secondItem="Xj0-4q-Lcf" secondAttribute="bottom" constant="21" id="psu-29-T16"/>
+                    <constraint firstItem="hGp-Ng-Bdl" firstAttribute="top" secondItem="BHw-jn-B4K" secondAttribute="bottom" constant="3.5" id="tJp-CU-wfk"/>
+                    <constraint firstItem="hGp-Ng-Bdl" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="22" id="w93-63-Lei"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="codeSendBtn" destination="yh7-p6-Uf5" id="Y6N-dz-UOL"/>
+                <outlet property="codeTexFiled" destination="hGp-Ng-Bdl" id="fS5-MW-4DK"/>
+                <outlet property="numberTexFiled" destination="zKj-gY-1hq" id="ggw-Pm-eZ5"/>
+                <outlet property="oldBtn" destination="2ZD-g3-5XT" id="Nbp-cd-1tw"/>
+                <outlet property="xinPhoneBtn" destination="0O3-uD-8he" id="FOV-jq-ysj"/>
+            </connections>
+            <point key="canvasLocation" x="33" y="54"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="bg_change_newnumber" width="197" height="49"/>
+    </resources>
+</document>