diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 2a6b412..b1fa605 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -151,6 +151,18 @@ A97DBE481ACAE7F600705682 /* smalliconWeixin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE471ACAE7F600705682 /* smalliconWeixin@2x.png */; }; A97DBE4C1ACAEBE300705682 /* first-login-sina@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE4B1ACAEBE300705682 /* first-login-sina@2x.png */; }; A97DBE4E1ACAED4900705682 /* camera-close-select@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE4D1ACAED4900705682 /* camera-close-select@2x.png */; }; + A98536721AEB66F9000312BF /* ReportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A98536701AEB66F9000312BF /* ReportViewController.m */; }; + A98536731AEB66F9000312BF /* ReportViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98536711AEB66F9000312BF /* ReportViewController.xib */; }; + A98536771AEB7400000312BF /* RegistAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A98536751AEB7400000312BF /* RegistAccountViewController.m */; }; + A98536781AEB7400000312BF /* RegistAccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98536761AEB7400000312BF /* RegistAccountViewController.xib */; }; + A985367C1AEB8F89000312BF /* RegistInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A985367A1AEB8F88000312BF /* RegistInfoViewController.m */; }; + A985367D1AEB8F89000312BF /* RegistInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A985367B1AEB8F88000312BF /* RegistInfoViewController.xib */; }; + A98536811AEBC7BB000312BF /* SetUserInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A985367F1AEBC7BB000312BF /* SetUserInfoViewController.m */; }; + A98536821AEBC7BB000312BF /* SetUserInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98536801AEBC7BB000312BF /* SetUserInfoViewController.xib */; }; + A98536861AEBDA1E000312BF /* OurLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A98536841AEBDA1E000312BF /* OurLoginViewController.m */; }; + A98536871AEBDA1E000312BF /* OurLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98536851AEBDA1E000312BF /* OurLoginViewController.xib */; }; + A985368B1AEBDDAB000312BF /* ModifyPassWordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A98536891AEBDDAB000312BF /* ModifyPassWordViewController.m */; }; + A985368C1AEBDDAB000312BF /* ModifyPassWordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A985368A1AEBDDAB000312BF /* ModifyPassWordViewController.xib */; }; A98D659D1AD37F18008668EE /* MessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A98D659B1AD37F18008668EE /* MessageTableViewCell.m */; }; A98D659E1AD37F18008668EE /* MessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98D659C1AD37F18008668EE /* MessageTableViewCell.xib */; }; A98F98521ACA29B5007C4594 /* libSocialQQ.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A98F98481ACA29B5007C4594 /* libSocialQQ.a */; }; @@ -409,6 +421,24 @@ A97DBE471ACAE7F600705682 /* smalliconWeixin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "smalliconWeixin@2x.png"; sourceTree = ""; }; A97DBE4B1ACAEBE300705682 /* first-login-sina@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "first-login-sina@2x.png"; sourceTree = ""; }; A97DBE4D1ACAED4900705682 /* camera-close-select@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camera-close-select@2x.png"; sourceTree = ""; }; + A985366F1AEB66F9000312BF /* ReportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReportViewController.h; sourceTree = ""; }; + A98536701AEB66F9000312BF /* ReportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReportViewController.m; sourceTree = ""; }; + A98536711AEB66F9000312BF /* ReportViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReportViewController.xib; sourceTree = ""; }; + A98536741AEB7400000312BF /* RegistAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistAccountViewController.h; sourceTree = ""; }; + A98536751AEB7400000312BF /* RegistAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistAccountViewController.m; sourceTree = ""; }; + A98536761AEB7400000312BF /* RegistAccountViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RegistAccountViewController.xib; sourceTree = ""; }; + A98536791AEB8F88000312BF /* RegistInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegistInfoViewController.h; sourceTree = ""; }; + A985367A1AEB8F88000312BF /* RegistInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RegistInfoViewController.m; sourceTree = ""; }; + A985367B1AEB8F88000312BF /* RegistInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RegistInfoViewController.xib; sourceTree = ""; }; + A985367E1AEBC7BB000312BF /* SetUserInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetUserInfoViewController.h; sourceTree = ""; }; + A985367F1AEBC7BB000312BF /* SetUserInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SetUserInfoViewController.m; sourceTree = ""; }; + A98536801AEBC7BB000312BF /* SetUserInfoViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SetUserInfoViewController.xib; sourceTree = ""; }; + A98536831AEBDA1E000312BF /* OurLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OurLoginViewController.h; sourceTree = ""; }; + A98536841AEBDA1E000312BF /* OurLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OurLoginViewController.m; sourceTree = ""; }; + A98536851AEBDA1E000312BF /* OurLoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OurLoginViewController.xib; sourceTree = ""; }; + A98536881AEBDDAB000312BF /* ModifyPassWordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModifyPassWordViewController.h; sourceTree = ""; }; + A98536891AEBDDAB000312BF /* ModifyPassWordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ModifyPassWordViewController.m; sourceTree = ""; }; + A985368A1AEBDDAB000312BF /* ModifyPassWordViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ModifyPassWordViewController.xib; sourceTree = ""; }; A98D659A1AD37F18008668EE /* MessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageTableViewCell.h; sourceTree = ""; }; A98D659B1AD37F18008668EE /* MessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageTableViewCell.m; sourceTree = ""; }; A98D659C1AD37F18008668EE /* MessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageTableViewCell.xib; sourceTree = ""; }; @@ -580,6 +610,12 @@ A9754A231ADC199B0018BAAD /* MyMessageViewController.h */, A9754A241ADC199B0018BAAD /* MyMessageViewController.m */, A9754A251ADC199B0018BAAD /* MyMessageViewController.xib */, + A985367E1AEBC7BB000312BF /* SetUserInfoViewController.h */, + A985367F1AEBC7BB000312BF /* SetUserInfoViewController.m */, + A98536801AEBC7BB000312BF /* SetUserInfoViewController.xib */, + A98536881AEBDDAB000312BF /* ModifyPassWordViewController.h */, + A98536891AEBDDAB000312BF /* ModifyPassWordViewController.m */, + A985368A1AEBDDAB000312BF /* ModifyPassWordViewController.xib */, ); path = My; sourceTree = ""; @@ -979,6 +1015,15 @@ A97DBE301ACAE10800705682 /* LoginViewController.h */, A97DBE311ACAE10800705682 /* LoginViewController.m */, A97DBE321ACAE10800705682 /* LoginViewController.xib */, + A98536741AEB7400000312BF /* RegistAccountViewController.h */, + A98536751AEB7400000312BF /* RegistAccountViewController.m */, + A98536761AEB7400000312BF /* RegistAccountViewController.xib */, + A98536791AEB8F88000312BF /* RegistInfoViewController.h */, + A985367A1AEB8F88000312BF /* RegistInfoViewController.m */, + A985367B1AEB8F88000312BF /* RegistInfoViewController.xib */, + A98536831AEBDA1E000312BF /* OurLoginViewController.h */, + A98536841AEBDA1E000312BF /* OurLoginViewController.m */, + A98536851AEBDA1E000312BF /* OurLoginViewController.xib */, ); path = Login; sourceTree = ""; @@ -1091,6 +1136,9 @@ A9FAD42E1AC923FC007ADC10 /* MyViewController.h */, A9FAD42F1AC923FC007ADC10 /* MyViewController.m */, A9FAD4301AC923FC007ADC10 /* MyViewController.xib */, + A985366F1AEB66F9000312BF /* ReportViewController.h */, + A98536701AEB66F9000312BF /* ReportViewController.m */, + A98536711AEB66F9000312BF /* ReportViewController.xib */, ); path = Main; sourceTree = ""; @@ -1199,6 +1247,7 @@ A966FB961AD62C5D00542068 /* icon_error@2x.png in Resources */, A97559A51ACB9748004ADA42 /* setup-head-default@2x.png in Resources */, A97DBE3F1ACAE29E00705682 /* Icon.png in Resources */, + A98536871AEBDA1E000312BF /* OurLoginViewController.xib in Resources */, A9754A271ADC199B0018BAAD /* MyMessageViewController.xib in Resources */, A94DF6361AD4D94E00DCDCB0 /* MyNoteViewController.xib in Resources */, A9E2711C1ADB97ED000B1542 /* Default.png in Resources */, @@ -1207,7 +1256,9 @@ A97559CC1ACBF0BC004ADA42 /* btn_bad_clicked@2x.png in Resources */, A97DBE461ACAE7B500705682 /* iconWeixin@2x.png in Resources */, A96862421ACCF0B400DDAA6B /* LICENCE.txt in Resources */, + A985367D1AEB8F89000312BF /* RegistInfoViewController.xib in Resources */, A99AA12F1ADD028400574B12 /* Icon120.png in Resources */, + A98536821AEBC7BB000312BF /* SetUserInfoViewController.xib in Resources */, A97C55071AC933AD0038818A /* UMSShareListController.xib in Resources */, A93441EE1ACA8C8F00A6B233 /* defaultUserIcon@2x.png in Resources */, A97559AC1ACB9DF0004ADA42 /* navigationButtonRefresh@2x.png in Resources */, @@ -1243,6 +1294,7 @@ A97559A91ACB9DE4004ADA42 /* navigationButtonPublishClick@2x.png in Resources */, A93441E21ACA89AA00A6B233 /* Profile_filter_voiceIconClick@2x.png in Resources */, A97559A81ACB9DE4004ADA42 /* navigationButtonPublish@2x.png in Resources */, + A98536781AEB7400000312BF /* RegistAccountViewController.xib in Resources */, A97559CE1ACBF0BC004ADA42 /* btn_good_clicked@2x.png in Resources */, A97883881AD369DF00D46477 /* mainCellDingClick@2x.png in Resources */, A90BA0211AD606B400728393 /* voice-record-level@2x.png in Resources */, @@ -1253,6 +1305,7 @@ A97559CD1ACBF0BC004ADA42 /* btn_bad@2x.png in Resources */, A93441F71ACA918100A6B233 /* tabbarSetup@2x.png in Resources */, A90BA0091AD6060600728393 /* playButtonClick@2x.png in Resources */, + A98536731AEB66F9000312BF /* ReportViewController.xib in Resources */, A97C55011AC933AD0038818A /* UMSCommentInputController.xib in Resources */, A97559AD1ACB9DF0004ADA42 /* navigationButtonRefreshClick@2x.png in Resources */, A90BA00B1AD6060600728393 /* playButtonPlay@2x.png in Resources */, @@ -1260,6 +1313,7 @@ A93441F81ACA918100A6B233 /* tabbarSetupClick@2x.png in Resources */, A93441FE1ACA919F00A6B233 /* tabbarVoice-dark@2x.png in Resources */, A9617A581ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png in Resources */, + A985368C1AEBDDAB000312BF /* ModifyPassWordViewController.xib in Resources */, A90BA0071AD6060600728393 /* play@2x.png in Resources */, A93441E51ACA8AC400A6B233 /* Profile_filter_contentIcon@2x.png in Resources */, A97559B31ACBC683004ADA42 /* NotePublishViewController.xib in Resources */, @@ -1334,6 +1388,7 @@ A97C54DD1AC901980038818A /* MBProgressHUD+Util.m in Sources */, A96862721ACCF13300DDAA6B /* PSTCollectionViewData.m in Sources */, A97DBE331ACAE10800705682 /* LoginViewController.m in Sources */, + A98536721AEB66F9000312BF /* ReportViewController.m in Sources */, A97559A31ACB8CE0004ADA42 /* AWordUser.m in Sources */, A9754A1C1ADC080E0018BAAD /* AudioPlayer.m in Sources */, A95510981AC39E6A0006D16F /* ViewController.m in Sources */, @@ -1345,8 +1400,11 @@ A96862761ACCF13300DDAA6B /* PSTCollectionViewUpdateItem.m in Sources */, A968626E1ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m in Sources */, A9FAD42C1AC923E2007ADC10 /* MessageViewController.m in Sources */, + A985367C1AEB8F89000312BF /* RegistInfoViewController.m in Sources */, + A98536811AEBC7BB000312BF /* SetUserInfoViewController.m in Sources */, A968627A1ACCF13300DDAA6B /* PSTGridLayoutSection.m in Sources */, A96862771ACCF13300DDAA6B /* PSTGridLayoutInfo.m in Sources */, + A985368B1AEBDDAB000312BF /* ModifyPassWordViewController.m in Sources */, A96862751ACCF13300DDAA6B /* PSTCollectionViewLayout.m in Sources */, A96862791ACCF13300DDAA6B /* PSTGridLayoutRow.m in Sources */, A9754A1D1ADC080E0018BAAD /* AutoRecoveringHttpDataSource.m in Sources */, @@ -1374,6 +1432,7 @@ A968624C1ACCF0B400DDAA6B /* README.md in Sources */, A9754A1E1ADC080E0018BAAD /* CoreFoundationDataSource.m in Sources */, A96862701ACCF13300DDAA6B /* PSTCollectionViewCell.m in Sources */, + A98536771AEB7400000312BF /* RegistAccountViewController.m in Sources */, A97559B71ACBD99E004ADA42 /* UIPlaceHolderTextView.m in Sources */, A97C54D41AC8F10F0038818A /* XMFishBaseCode.m in Sources */, A97C54E11AC91DA10038818A /* CommonUtil.m in Sources */, @@ -1381,6 +1440,7 @@ A99AA12D1ADCCB3C00574B12 /* MessageViewModel.m in Sources */, A968626F1ACCF13300DDAA6B /* PSTCollectionView.m in Sources */, A9FAD4351AC925AC007ADC10 /* LoginViewModel.m in Sources */, + A98536861AEBDA1E000312BF /* OurLoginViewController.m in Sources */, A95510921AC39E6A0006D16F /* main.m in Sources */, A98D659D1AD37F18008668EE /* MessageTableViewCell.m in Sources */, A96862711ACCF13300DDAA6B /* PSTCollectionViewController.m in Sources */, diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index cf2aa48..7ed5384 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "123" - endingLineNumber = "123" + startingLineNumber = "125" + endingLineNumber = "125" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -74,11 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "125" - endingLineNumber = "125" + startingLineNumber = "127" + endingLineNumber = "127" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450677704.345854" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "146" - endingLineNumber = "146" + startingLineNumber = "212" + endingLineNumber = "212" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -218,11 +218,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450677704.345854" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "130" - endingLineNumber = "130" + startingLineNumber = "196" + endingLineNumber = "196" landmarkName = "-tableView:heightForRowAtIndexPath:" landmarkType = "5"> @@ -234,11 +234,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450677704.345854" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "116" - endingLineNumber = "116" + startingLineNumber = "182" + endingLineNumber = "182" landmarkName = "-numberOfSectionsInTableView:" landmarkType = "5"> @@ -250,11 +250,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NotePublishViewController.m" - timestampString = "450624994.91475" + timestampString = "451641749.207606" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "69" - endingLineNumber = "69" + startingLineNumber = "77" + endingLineNumber = "77" landmarkName = "-textView:shouldChangeTextInRange:replacementText:" landmarkType = "5"> @@ -282,11 +282,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m" - timestampString = "450066451.852346" + timestampString = "451665615.942671" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "82" - endingLineNumber = "82" + startingLineNumber = "85" + endingLineNumber = "85" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -298,11 +298,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450677704.345854" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "90" - endingLineNumber = "90" + startingLineNumber = "156" + endingLineNumber = "156" landmarkName = "-loadData" landmarkType = "5"> @@ -314,11 +314,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450677704.345854" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "88" - endingLineNumber = "88" + startingLineNumber = "154" + endingLineNumber = "154" landmarkName = "-loadData" landmarkType = "5"> @@ -474,11 +474,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "102" - endingLineNumber = "102" + startingLineNumber = "104" + endingLineNumber = "104" landmarkName = "-sianLoginBtnClick:" landmarkType = "5"> @@ -490,11 +490,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "147" - endingLineNumber = "147" + startingLineNumber = "149" + endingLineNumber = "149" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -522,11 +522,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "131" - endingLineNumber = "131" + startingLineNumber = "133" + endingLineNumber = "133" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -554,11 +554,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "176" - endingLineNumber = "176" + startingLineNumber = "178" + endingLineNumber = "178" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -617,11 +617,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "158" - endingLineNumber = "158" + startingLineNumber = "160" + endingLineNumber = "160" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -633,11 +633,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "450197270.567043" + timestampString = "451664979.302049" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "154" - endingLineNumber = "154" + startingLineNumber = "156" + endingLineNumber = "156" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -713,11 +713,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Note/NoteTableViewCell.m" - timestampString = "450197858.951449" + timestampString = "451547020.189351" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "145" - endingLineNumber = "145" + startingLineNumber = "146" + endingLineNumber = "146" landmarkName = "-setText_Image:" landmarkType = "5"> @@ -729,11 +729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m" - timestampString = "450167209.784582" + timestampString = "451657598.552821" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "35" - endingLineNumber = "35" + startingLineNumber = "38" + endingLineNumber = "38" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -1033,11 +1033,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m" - timestampString = "450631673.558741" + timestampString = "451657851.990071" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "142" - endingLineNumber = "142" + startingLineNumber = "205" + endingLineNumber = "205" landmarkName = "-playWithIndex:" landmarkType = "5"> @@ -1097,11 +1097,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m" - timestampString = "450631673.558741" + timestampString = "451657851.990071" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "59" - endingLineNumber = "59" + startingLineNumber = "122" + endingLineNumber = "122" landmarkName = "-headerRereshing" landmarkType = "5"> @@ -1113,11 +1113,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450631580.476027" + timestampString = "451637210.295209" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "76" - endingLineNumber = "76" + startingLineNumber = "142" + endingLineNumber = "142" landmarkName = "-headerRereshing" landmarkType = "5"> @@ -1161,11 +1161,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/MyNoteViewController.m" - timestampString = "450752234.866664" + timestampString = "451659407.266745" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "52" - endingLineNumber = "52" + startingLineNumber = "156" + endingLineNumber = "156" landmarkName = "-footerRereshing" landmarkType = "5"> @@ -1321,12 +1321,268 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "450774507.719569" + timestampString = "451637210.295209" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "151" + endingLineNumber = "151" + landmarkName = "-loadData" + landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Utility/Tool/Ash_UIUtil.h b/Ash_AWord/Utility/Tool/Ash_UIUtil.h index 96fb046..acd29a3 100644 --- a/Ash_AWord/Utility/Tool/Ash_UIUtil.h +++ b/Ash_AWord/Utility/Tool/Ash_UIUtil.h @@ -116,6 +116,10 @@ */ + (UIColor *)genenalBackgroudColor; +/** + * + */ ++(UIColor *)greenYujianniColor; /** * 按钮颜色：蓝绿色 */ diff --git a/Ash_AWord/Utility/Tool/Ash_UIUtil.m b/Ash_AWord/Utility/Tool/Ash_UIUtil.m index f781cce..626c99e 100644 --- a/Ash_AWord/Utility/Tool/Ash_UIUtil.m +++ b/Ash_AWord/Utility/Tool/Ash_UIUtil.m @@ -471,7 +471,11 @@ { return [UIColor appMainColorAlpha:1]; } ++ (UIColor *)greenYujianniColor +{ + return [UIColor colorWithHexString:@"#61BFA9" alpha:1]; +} /** * 按钮颜色：浅灰色 */ diff --git a/Ash_AWord/Utility/Tool/CommonUtil.h b/Ash_AWord/Utility/Tool/CommonUtil.h index 233f042..95f761f 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.h +++ b/Ash_AWord/Utility/Tool/CommonUtil.h @@ -51,6 +51,10 @@ NetworkType; +(NSString*)timeFromtimeSp:(NSString*)timeSp; //判断是否同一天 +(BOOL)isSameDay:(NSDate*)date1 date2:(NSDate*)date2; + ++ (BOOL) validateUserName:(NSString *)name; + ++ (BOOL) validateNickname:(NSString *)nickname; @end @interface NSString (MD5Extensions) diff --git a/Ash_AWord/Utility/Tool/CommonUtil.m b/Ash_AWord/Utility/Tool/CommonUtil.m index 6ad5aa7..f1c5caf 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.m +++ b/Ash_AWord/Utility/Tool/CommonUtil.m @@ -184,16 +184,16 @@ NSDateFormatter* formatter = [[NSDateFormatter alloc] init]; // [formatter setDateStyle:NSDateFormatterMediumStyle]; // [formatter setTimeStyle:NSDateFormatterShortStyle]; - [formatter setDateFormat:@"yyyy-MM-dd HH:MM"]; + [formatter setDateFormat:@"yyyy-MM-dd HH:MM::ss"]; NSDate * d = [NSDate dateWithTimeIntervalSince1970:[timeSp floatValue]/1000]; - NSTimeInterval late = [d timeIntervalSince1970]*1; + NSTimeInterval late = [d timeIntervalSince1970]; NSString * timeString = [formatter stringFromDate:d]; NSDate * dat = [NSDate dateWithTimeIntervalSinceNow:0]; - NSTimeInterval now = [dat timeIntervalSince1970]*1; + NSTimeInterval now = [dat timeIntervalSince1970]; NSTimeInterval cha = now - late; if (cha/3600 < 1) { @@ -252,10 +252,15 @@ timeString = [NSString stringWithFormat:@"1周前"]; - }else if(num > 10){ + }else if(num > 10 && num <= 31){ -// timeString = [NSString stringWithFormat:@"n天前"]; + timeString = [NSString stringWithFormat:@"%d天前",num]; + }else if (num >31 && num < 365){ + timeString = [NSString stringWithFormat:@"%d月前",num/31]; + }else{ + timeString = [NSString stringWithFormat:@"%d年前",num/365]; + } @@ -273,6 +278,19 @@ [comp1 month] == [comp2 month] && [comp1 year] == [comp2 year]; } ++ (BOOL) validateUserName:(NSString *)name +{ + NSString *userNameRegex = @"^[a-zA-z_][a-zA-Z0-9_]{5,29}+$"; + NSPredicate *userNamePredicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",userNameRegex]; + BOOL B = [userNamePredicate evaluateWithObject:name]; + return B; +} ++ (BOOL) validateNickname:(NSString *)nickname +{ + NSString *nicknameRegex = @"^[\u4e00-\u9fa5]{2,20}$"; + NSPredicate *passWordPredicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",nicknameRegex]; + return [passWordPredicate evaluateWithObject:nickname]; +} @end @implementation NSString (MD5Extensions) diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.h b/Ash_AWord/ViewControllers/Login/LoginViewController.h index a44304c..cba985e 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.h +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.h @@ -16,9 +16,11 @@ @property (weak, nonatomic) IBOutlet UIButton *qqBtn; @property (strong, nonatomic)void (^loginSuccessBlock)(); +- (IBAction)loginBtnClick:(id)sender; @property (weak, nonatomic) IBOutlet UIButton *wxBtn; +- (IBAction)registBtnClick:(id)sender; + (LoginViewController *)shareLoginViewController; diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m index 61fca32..7034325 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m @@ -12,6 +12,8 @@ #import "AppDelegate.h" #import #import "WXApi.h" +#import "RegistAccountViewController.h" +#import "OurLoginViewController.h" @interface LoginViewController () @end @@ -179,6 +181,12 @@ }]; } +- (IBAction)registBtnClick:(id)sender { + RegistAccountViewController* registAccountViewController = [[RegistAccountViewController alloc] init]; + self.navigationController.navigationBarHidden = NO; + [self.navigationController pushViewController:registAccountViewController animated:YES]; +} + + (LoginViewController *)shareLoginViewController { static LoginViewController *loginVC = nil; @@ -210,4 +218,9 @@ [vc presentViewController:nav animated:YES completion:nil]; } +- (IBAction)loginBtnClick:(id)sender { + OurLoginViewController* ourLoginViewController = [[OurLoginViewController alloc] init]; + self.navigationController.navigationBarHidden = NO; + [self.navigationController pushViewController:ourLoginViewController animated:YES]; +} @end diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.xib b/Ash_AWord/ViewControllers/Login/LoginViewController.xib index 64d8ba0..1f33ebe 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -45,7 +45,7 @@ -