diff --git a/Ifish.xcodeproj/project.pbxproj b/Ifish.xcodeproj/project.pbxproj index 6a9d305..b9ca793 100644 --- a/Ifish.xcodeproj/project.pbxproj +++ b/Ifish.xcodeproj/project.pbxproj @@ -2477,6 +2477,12 @@ E58C9984208195640004C42B /* RuiMeiViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C9983208195640004C42B /* RuiMeiViewController.m */; }; E58C99872081A3BA0004C42B /* RuiMeiProtocolModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C99862081A3BA0004C42B /* RuiMeiProtocolModel.m */; }; E58C998A2081A6930004C42B /* RuiMeiBackMsgUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E58C99892081A6930004C42B /* RuiMeiBackMsgUtils.m */; }; + E5F1B03421183DCD00A879A1 /* setting-reset@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03121183DCC00A879A1 /* setting-reset@2x.png */; }; + E5F1B03521183DCD00A879A1 /* setting-reset@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03221183DCD00A879A1 /* setting-reset@3x.png */; }; + E5F1B03621183DCD00A879A1 /* setting-reset.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03321183DCD00A879A1 /* setting-reset.png */; }; + E5F1B03A21183E9700A879A1 /* setting-restart@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03721183E9600A879A1 /* setting-restart@3x.png */; }; + E5F1B03B21183E9700A879A1 /* setting-restart.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03821183E9600A879A1 /* setting-restart.png */; }; + E5F1B03C21183E9700A879A1 /* setting-restart@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5F1B03921183E9700A879A1 /* setting-restart@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -6273,6 +6279,12 @@ E58C99882081A6930004C42B /* RuiMeiBackMsgUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RuiMeiBackMsgUtils.h; sourceTree = ""; }; E58C99892081A6930004C42B /* RuiMeiBackMsgUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RuiMeiBackMsgUtils.m; sourceTree = ""; }; E5C644C0206BBD7100C558D5 /* CommonMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonMacros.h; sourceTree = ""; }; + E5F1B03121183DCC00A879A1 /* setting-reset@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-reset@2x.png"; sourceTree = ""; }; + E5F1B03221183DCD00A879A1 /* setting-reset@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-reset@3x.png"; sourceTree = ""; }; + E5F1B03321183DCD00A879A1 /* setting-reset.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-reset.png"; sourceTree = ""; }; + E5F1B03721183E9600A879A1 /* setting-restart@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-restart@3x.png"; sourceTree = ""; }; + E5F1B03821183E9600A879A1 /* setting-restart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-restart.png"; sourceTree = ""; }; + E5F1B03921183E9700A879A1 /* setting-restart@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "setting-restart@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -7979,6 +7991,12 @@ 882954921DBDA3A100E9DDD7 /* ifishWodeImgs */ = { isa = PBXGroup; children = ( + E5F1B03821183E9600A879A1 /* setting-restart.png */, + E5F1B03921183E9700A879A1 /* setting-restart@2x.png */, + E5F1B03721183E9600A879A1 /* setting-restart@3x.png */, + E5F1B03321183DCD00A879A1 /* setting-reset.png */, + E5F1B03121183DCC00A879A1 /* setting-reset@2x.png */, + E5F1B03221183DCD00A879A1 /* setting-reset@3x.png */, 889C14F01EA7397B00470F50 /* personal_iocn_set.png */, 889C14F11EA7397B00470F50 /* personal_iocn_set@2x.png */, 889C14F21EA7397B00470F50 /* personal_iocn_set@3x.png */, @@ -14471,6 +14489,7 @@ 883283971EAF4BF800A47157 /* explore_iocn_messages.png in Resources */, 8860D7901D6D7BE8001E544C /* KanHuWorkViewFirstCell.xib in Resources */, 88C1B1CC1DC99B0500C2C99A /* TabMineDeivceListViewCell.xib in Resources */, + E5F1B03421183DCD00A879A1 /* setting-reset@2x.png in Resources */, 882957681DBDA3A300E9DDD7 /* ifishmenu@1x.png in Resources */, 883283981EAF4BF800A47157 /* explore_iocn_messages@2x.png in Resources */, 88602A711E10BC3500F3DB5D /* NIMKitSettings.bundle in Resources */, @@ -14888,6 +14907,7 @@ 8829577B1DBDA3A400E9DDD7 /* set_cellBack.png in Resources */, 88591EED1D65B8B500A1316E /* ShopCertifyFailViewController.xib in Resources */, 8849EFC11EB883840096CAD7 /* enter_tablet@3x.png in Resources */, + E5F1B03521183DCD00A879A1 /* setting-reset@3x.png in Resources */, 8871C49F1E6D507B000AA49F /* signin_condition_gift_achieve.png in Resources */, 881F0F501D73DF4E0091507E /* BaoGaoViewFirstCell.xib in Resources */, 885979F91E542371003D0E5C /* IfishShopEdite2ViewCell.xib in Resources */, @@ -14919,6 +14939,7 @@ 886D15871E6066D20085F7D6 /* introlImage_1.png in Resources */, 882956271DBDA3A200E9DDD7 /* neves0042.png in Resources */, 882956331DBDA3A200E9DDD7 /* neves0054.png in Resources */, + E5F1B03A21183E9700A879A1 /* setting-restart@3x.png in Resources */, 88D337351DC71EB5006C0ADB /* linkingdevice_setting@2x.png in Resources */, 88C1B2161DCC5A1400C2C99A /* personal_iocn_feedback@3x.png in Resources */, 8860D7A71D6D9463001E544C /* shopEditViewImgCell.xib in Resources */, @@ -15049,6 +15070,7 @@ 882957331DBDA3A300E9DDD7 /* swimmingfish0034.png in Resources */, 8871C4A01E6D507B000AA49F /* signin_condition_gift_achieve@2x.png in Resources */, 882956FC1DBDA3A300E9DDD7 /* JiaReBang_on.png in Resources */, + E5F1B03C21183E9700A879A1 /* setting-restart@2x.png in Resources */, 88602F9C1E12002600F3DB5D /* NTESWhiteboardViewController.xib in Resources */, 885FBDD21E4C0CB400E0D7D1 /* explore_iocn_look@3x.png in Resources */, 880708021DE812040076F65A /* live_sharechat_iocn.png in Resources */, @@ -15135,6 +15157,7 @@ 885979E81E52EB11003D0E5C /* nurse_empty_picture@3x.png in Resources */, 885979D41E529F64003D0E5C /* GoNetShopViewCell.xib in Resources */, 886FB1A21E5A9D0A00256332 /* FishDocSection0ViewImgCell.xib in Resources */, + E5F1B03621183DCD00A879A1 /* setting-reset.png in Resources */, 88380DAE1EB1D96A00FC7C0D /* merchant_iocn_stock@2x.png in Resources */, 8829581A1DC04ED200E9DDD7 /* equipment_point.png in Resources */, 882956381DBDA3A200E9DDD7 /* neves0059.png in Resources */, @@ -15167,6 +15190,7 @@ 8867F5D11E656F9100AF021C /* rank_iocn_assist@3x.png in Resources */, 8832EABD1ED2834200D9195E /* shop_goods_edite.png in Resources */, 883E79B51D48B0280030E075 /* Box.png in Resources */, + E5F1B03B21183E9700A879A1 /* setting-restart.png in Resources */, 88597A071E5428A5003D0E5C /* IfishSHopEdite4ViewCell.xib in Resources */, 886484451EE171D30046C3BD /* redact_line_pointgray.png in Resources */, 8871FB041EBC63D30038E99A /* attestation_license@2x.png in Resources */, diff --git a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m index 94ea041..0035072 100644 --- a/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m +++ b/Ifish/controllers/IfishTabControllers/我的/mineControllers/IfishSetViewController.m @@ -36,7 +36,7 @@ extern BOOL firstLogIn; -(void)loadData{ self.titles=@[@[@"更换手机",@"修改密码",@"设备重启",@"恢复出厂模式"],@[@"切换账号"]]; - self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"replace_iocn_code",@"replace_iocn_code"],@[@"personal_iocn_switch"]]; + self.imgs = @[@[@"personal_iocn_replace",@"replace_iocn_code",@"setting-restart",@"setting-reset"],@[@"personal_iocn_switch"]]; } -(void)creatTab{ diff --git a/Ifish/ifishImgSouce/.DS_Store b/Ifish/ifishImgSouce/.DS_Store index 461c5d0..3730cce 100644 Binary files a/Ifish/ifishImgSouce/.DS_Store and b/Ifish/ifishImgSouce/.DS_Store differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset.png new file mode 100644 index 0000000..36c5e40 Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset.png differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@2x.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@2x.png new file mode 100644 index 0000000..b36b799 Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@2x.png differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@3x.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@3x.png new file mode 100644 index 0000000..406cf30 Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-reset@3x.png differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart.png new file mode 100644 index 0000000..79ae48e Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart.png differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@2x.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@2x.png new file mode 100644 index 0000000..f40b8c8 Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@2x.png differ diff --git a/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@3x.png b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@3x.png new file mode 100644 index 0000000..27f1b34 Binary files /dev/null and b/Ifish/ifishImgSouce/ifishWodeImgs/setting-restart@3x.png differ