From 7e7c699536fc4541a7a3f33851d887d5c054dd27 Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Sat, 27 Jun 2015 11:11:41 +0800 Subject: [PATCH] new --- Ash_AWord.xcodeproj/project.pbxproj | 14 + .../xcdebugger/Breakpoints_v2.xcbkptlist | 618 ++++++++++-------- Ash_AWord/Config/AWordDefault.h | 3 + Ash_AWord/Config/AWordDefault.m | 11 + Ash_AWord/Config/AWordUser.h | 3 + Ash_AWord/Config/AWordUser.m | 9 +- Ash_AWord/Config/Common.h | 1 + Ash_AWord/Resource/acitvity_center_new@2x.png | Bin 0 -> 2455 bytes Ash_AWord/Utility/Network/BaseViewModel.h | 2 + Ash_AWord/Utility/Network/BaseViewModel.m | 4 + Ash_AWord/Utility/Tool/Ash_UIUtil.m | 2 +- .../Chat/Call/CallViewController.m | 2 - .../Chat/ChatMainViewController.m | 17 +- .../Login/LoginViewController.m | 2 - .../Login/LoginViewController.xib | 2 +- .../ViewControllers/Main/MainViewController.m | 1 - .../Main/MessageViewController.m | 1 - .../ViewControllers/Main/MyViewController.m | 71 +- .../Message/MessageCommentViewController.m | 1 + .../Message/MessagePublishViewController.m | 6 +- .../My/MyMessageViewController.xib | 8 +- .../My/MyNoteViewController.xib | 8 +- .../My/MyRelateViewController.h | 14 + .../My/MyRelateViewController.m | 170 +++++ .../My/MyRelateViewController.xib | 34 + .../My/PersonalInfoViewController.m | 16 +- .../ViewControllers/My/SetUpViewController.m | 4 +- .../My/SetUserInfoViewController.h | 3 +- .../My/SetUserInfoViewController.m | 73 ++- .../My/SetUserInfoViewController.xib | 19 + .../User/PraiseUserListViewController.m | 1 - .../ViewModels/Common/CommentViewModel.h | 3 + .../ViewModels/Common/CommentViewModel.m | 14 + Ash_AWord/ViewModels/Common/UserViewModel.h | 1 + Ash_AWord/ViewModels/LoginViewModel.h | 5 +- Ash_AWord/ViewModels/LoginViewModel.m | 7 +- Ash_AWord/Views/Common/CommentTableViewCell.h | 3 + Ash_AWord/Views/Common/CommentTableViewCell.m | 23 +- .../Views/Common/CommentTableViewCell.xib | 11 + .../Views/Common/MyMessageTableViewCell.h | 1 + .../Views/Common/MyMessageTableViewCell.m | 5 + .../Views/Common/MyMessageTableViewCell.xib | 2 +- 42 files changed, 871 insertions(+), 324 deletions(-) create mode 100644 Ash_AWord/Resource/acitvity_center_new@2x.png create mode 100644 Ash_AWord/ViewControllers/My/MyRelateViewController.h create mode 100644 Ash_AWord/ViewControllers/My/MyRelateViewController.m create mode 100644 Ash_AWord/ViewControllers/My/MyRelateViewController.xib diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 5ae530a..99dfef2 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -233,6 +233,9 @@ A97CCE2A1B3BE6440046FE17 /* MessageListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97CCE281B3BE6440046FE17 /* MessageListViewController.xib */; }; A97CCE2E1B3BEBDA0046FE17 /* MessageListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A97CCE2C1B3BEBDA0046FE17 /* MessageListTableViewCell.m */; }; A97CCE2F1B3BEBDA0046FE17 /* MessageListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97CCE2D1B3BEBDA0046FE17 /* MessageListTableViewCell.xib */; }; + A97D70F21B3E3BAB0070BE84 /* acitvity_center_new@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97D70F11B3E3BAB0070BE84 /* acitvity_center_new@2x.png */; }; + A97D70F61B3E40520070BE84 /* MyRelateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A97D70F41B3E40520070BE84 /* MyRelateViewController.m */; }; + A97D70F71B3E40520070BE84 /* MyRelateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97D70F51B3E40520070BE84 /* MyRelateViewController.xib */; }; A97DBE331ACAE10800705682 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A97DBE311ACAE10800705682 /* LoginViewController.m */; }; A97DBE341ACAE10800705682 /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE321ACAE10800705682 /* LoginViewController.xib */; }; A97DBE3F1ACAE29E00705682 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE391ACAE29E00705682 /* Icon.png */; }; @@ -831,6 +834,10 @@ A97CCE2B1B3BEBDA0046FE17 /* MessageListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageListTableViewCell.h; sourceTree = ""; }; A97CCE2C1B3BEBDA0046FE17 /* MessageListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageListTableViewCell.m; sourceTree = ""; }; A97CCE2D1B3BEBDA0046FE17 /* MessageListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageListTableViewCell.xib; sourceTree = ""; }; + A97D70F11B3E3BAB0070BE84 /* acitvity_center_new@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "acitvity_center_new@2x.png"; sourceTree = ""; }; + A97D70F31B3E40520070BE84 /* MyRelateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyRelateViewController.h; sourceTree = ""; }; + A97D70F41B3E40520070BE84 /* MyRelateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyRelateViewController.m; sourceTree = ""; }; + A97D70F51B3E40520070BE84 /* MyRelateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyRelateViewController.xib; sourceTree = ""; }; A97DBE301ACAE10800705682 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; A97DBE311ACAE10800705682 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; A97DBE321ACAE10800705682 /* LoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController.xib; sourceTree = ""; }; @@ -1220,6 +1227,9 @@ A97CCE261B3BE6440046FE17 /* MessageListViewController.h */, A97CCE271B3BE6440046FE17 /* MessageListViewController.m */, A97CCE281B3BE6440046FE17 /* MessageListViewController.xib */, + A97D70F31B3E40520070BE84 /* MyRelateViewController.h */, + A97D70F41B3E40520070BE84 /* MyRelateViewController.m */, + A97D70F51B3E40520070BE84 /* MyRelateViewController.xib */, ); path = My; sourceTree = ""; @@ -1922,6 +1932,7 @@ children = ( A9C58DAE1B3AA8EC0007FCDC /* audio */, A9F7F4581B33B51F00317F3E /* back@2x.png */, + A97D70F11B3E3BAB0070BE84 /* acitvity_center_new@2x.png */, A971EDF61B32B7C40023740E /* chatBar_colorMore_audioCall@2x.png */, A971EDF71B32B7C40023740E /* chatBar_colorMore_audioCallSelected@2x.png */, A971EDF81B32B7C40023740E /* chatBar_colorMore_camera@2x.png */, @@ -2588,6 +2599,7 @@ A9C58E091B3AA8EC0007FCDC /* VoiceSearchFeedback018.png in Resources */, A971EE041B32B7C40023740E /* chatBar_colorMore_camera@2x.png in Resources */, A94691CD1B26EACE00B5D26B /* PersonalInfoViewController.xib in Resources */, + A97D70F71B3E40520070BE84 /* MyRelateViewController.xib in Resources */, A96862421ACCF0B400DDAA6B /* LICENCE.txt in Resources */, A985367D1AEB8F89000312BF /* RegistInfoViewController.xib in Resources */, A978CB2D1B3A3D5A00028C4A /* chat_sender_audio_playing_full@2x.png in Resources */, @@ -2679,6 +2691,7 @@ A98536781AEB7400000312BF /* RegistAccountViewController.xib in Resources */, A971EDF01B32B7AF0023740E /* chatBar_more_camera@2x.png in Resources */, A97559CE1ACBF0BC004ADA42 /* btn_good_clicked@2x.png in Resources */, + A97D70F21B3E3BAB0070BE84 /* acitvity_center_new@2x.png in Resources */, A9B6DFE61B2033A80003C1BC /* toolbar_light_comment@2x.png in Resources */, A97883881AD369DF00D46477 /* mainCellDingClick@2x.png in Resources */, A90BA0211AD606B400728393 /* voice-record-level@2x.png in Resources */, @@ -2938,6 +2951,7 @@ A97CCE291B3BE6440046FE17 /* MessageListViewController.m in Sources */, A9FD82BC1B1D544300AC4DC9 /* CommentTableViewCell.m in Sources */, A9B6DFCC1B1FFDB20003C1BC /* CommentTextView.m in Sources */, + A97D70F61B3E40520070BE84 /* MyRelateViewController.m in Sources */, A96F27EE1B2195BA00DA0A66 /* UIImageView+Reloading.m in Sources */, A9B4A9541AEDC3620017C655 /* FeedbackViewController.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 941a73e..f197433 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -426,11 +426,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "456300113.691928" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "105" - endingLineNumber = "105" + startingLineNumber = "103" + endingLineNumber = "103" landmarkName = "-sianLoginBtnClick:" landmarkType = "5"> @@ -442,11 +442,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "456300113.691928" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "150" - endingLineNumber = "150" + startingLineNumber = "148" + endingLineNumber = "148" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -490,11 +490,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "456896495.730218" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "181" - endingLineNumber = "181" + startingLineNumber = "179" + endingLineNumber = "179" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -553,11 +553,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "456302036.416834" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "161" - endingLineNumber = "161" + startingLineNumber = "159" + endingLineNumber = "159" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -569,11 +569,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "456300113.691928" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "157" - endingLineNumber = "157" + startingLineNumber = "155" + endingLineNumber = "155" landmarkName = "-loginWithOpenId:withName:withGender:withFigureUrl:" landmarkType = "5"> @@ -713,11 +713,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "251" - endingLineNumber = "251" + startingLineNumber = "253" + endingLineNumber = "253" landmarkName = "-detectionVoice" landmarkType = "5"> @@ -729,11 +729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "243" - endingLineNumber = "243" + startingLineNumber = "245" + endingLineNumber = "245" landmarkName = "-updateIndicateur" landmarkType = "5"> @@ -745,11 +745,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "220" - endingLineNumber = "220" + startingLineNumber = "222" + endingLineNumber = "222" landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> @@ -761,11 +761,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "230" - endingLineNumber = "230" + startingLineNumber = "232" + endingLineNumber = "232" landmarkName = "-alertView:clickedButtonAtIndex:" landmarkType = "5"> @@ -825,11 +825,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "164" - endingLineNumber = "164" + startingLineNumber = "166" + endingLineNumber = "166" landmarkName = "-audio" landmarkType = "5"> @@ -905,11 +905,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m" - timestampString = "456990925.57948" + timestampString = "457065970.544064" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "219" - endingLineNumber = "219" + startingLineNumber = "218" + endingLineNumber = "218" landmarkName = "-playWithIndex:" landmarkType = "5"> @@ -921,11 +921,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Message/MessagePublishViewController.m" - timestampString = "456990925.57948" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "338" - endingLineNumber = "338" + startingLineNumber = "340" + endingLineNumber = "340" landmarkName = "-audioRecorderDidFinishRecording:successfully:" landmarkType = "5"> @@ -1417,11 +1417,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/SetUserInfoViewController.m" - timestampString = "451814124.498944" + timestampString = "457058491.055767" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "133" - endingLineNumber = "133" + startingLineNumber = "195" + endingLineNumber = "195" landmarkName = "-sureModify" landmarkType = "5"> @@ -1433,11 +1433,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewModels/LoginViewModel.m" - timestampString = "455780346.034645" + timestampString = "457058332.154316" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "104" - endingLineNumber = "104" + startingLineNumber = "106" + endingLineNumber = "106" landmarkName = "+requireModifyInfoWithNickName:withGender:withAvatarImg:" landmarkType = "5"> @@ -2041,11 +2041,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m" - timestampString = "457003304.570546" + timestampString = "457058578.429508" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "191" - endingLineNumber = "191" + startingLineNumber = "205" + endingLineNumber = "205" landmarkName = "-loadData" landmarkType = "5"> @@ -2329,11 +2329,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewModels/Common/CommentViewModel.m" - timestampString = "456031081.291809" + timestampString = "457063831.607644" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "56" - endingLineNumber = "56" + startingLineNumber = "57" + endingLineNumber = "57" landmarkName = "+requireAddCommentWithReconrdId:withContent:WithType:withToUid:" landmarkType = "5"> @@ -2345,11 +2345,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456988908.52767" + timestampString = "457063831.607644" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "71" - endingLineNumber = "71" + startingLineNumber = "77" + endingLineNumber = "77" landmarkName = "-setCommentInfoViewModel:" landmarkType = "5"> @@ -2409,11 +2409,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456988908.52767" + timestampString = "457063831.607644" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "106" - endingLineNumber = "106" + startingLineNumber = "112" + endingLineNumber = "112" landmarkName = "-linkPushed:" landmarkType = "5"> @@ -2425,11 +2425,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m" - timestampString = "457003304.570546" + timestampString = "457058578.429508" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "186" - endingLineNumber = "186" + startingLineNumber = "200" + endingLineNumber = "200" landmarkName = "-loadData" landmarkType = "5"> @@ -2441,11 +2441,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Common/CommentTableViewCell.m" - timestampString = "456988908.52767" + timestampString = "457063831.607644" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "55" - endingLineNumber = "55" + startingLineNumber = "60" + endingLineNumber = "60" landmarkName = "-avatarBtnClick:" landmarkType = "5"> @@ -2505,11 +2505,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m" - timestampString = "457003304.570546" + timestampString = "457058578.429508" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "222" - endingLineNumber = "222" + startingLineNumber = "236" + endingLineNumber = "236" landmarkName = "-loadData" landmarkType = "5"> @@ -2521,11 +2521,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m" - timestampString = "457003304.570546" + timestampString = "457057190.366033" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "53" - endingLineNumber = "53" + startingLineNumber = "54" + endingLineNumber = "54" landmarkName = "-viewDidLoad" landmarkType = "5"> @@ -2729,11 +2729,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456994426.356087" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "286" - endingLineNumber = "286" + startingLineNumber = "287" + endingLineNumber = "287" landmarkName = "-moreViewPhotoAction:" landmarkType = "5"> @@ -2761,11 +2761,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456932343.782105" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "606" - endingLineNumber = "606" + startingLineNumber = "604" + endingLineNumber = "604" landmarkName = "-hangupAction" landmarkType = "5"> @@ -2841,11 +2841,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "645" - endingLineNumber = "645" + startingLineNumber = "646" + endingLineNumber = "646" landmarkName = "-reloadTableViewDataWithMessage:" landmarkType = "5"> @@ -2857,11 +2857,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "646" - endingLineNumber = "646" + startingLineNumber = "647" + endingLineNumber = "647" landmarkName = "-reloadTableViewDataWithMessage:" landmarkType = "5"> @@ -2889,7 +2889,23 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" + startingColumnNumber = "9223372036854775807" + endingColumnNumber = "9223372036854775807" + startingLineNumber = "649" + endingLineNumber = "649" + landmarkName = "-reloadTableViewDataWithMessage:" + landmarkType = "5"> + + + + - - - - @@ -2937,11 +2937,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "726" - endingLineNumber = "726" + startingLineNumber = "727" + endingLineNumber = "727" landmarkName = "-formatMessages:" landmarkType = "5"> @@ -2985,11 +2985,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "796" - endingLineNumber = "796" + startingLineNumber = "797" + endingLineNumber = "797" landmarkName = "-didFetchingMessageAttachments:progress:" landmarkType = "5"> @@ -3049,11 +3049,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "800" - endingLineNumber = "800" + startingLineNumber = "801" + endingLineNumber = "801" landmarkName = "-loadMoreMessages" landmarkType = "5"> @@ -3065,11 +3065,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "805" - endingLineNumber = "805" + startingLineNumber = "806" + endingLineNumber = "806" landmarkName = "-loadMoreMessages" landmarkType = "5"> @@ -3081,11 +3081,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "695" - endingLineNumber = "695" + startingLineNumber = "696" + endingLineNumber = "696" landmarkName = "-formatMessages:" landmarkType = "5"> @@ -3129,11 +3129,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "698" - endingLineNumber = "698" + startingLineNumber = "699" + endingLineNumber = "699" landmarkName = "-formatMessages:" landmarkType = "5"> @@ -3273,11 +3273,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "653" - endingLineNumber = "653" + startingLineNumber = "654" + endingLineNumber = "654" landmarkName = "-didReceiveMessage:" landmarkType = "5"> @@ -3289,11 +3289,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "669" - endingLineNumber = "669" + startingLineNumber = "670" + endingLineNumber = "670" landmarkName = "-didReceiveMessageId:chatter:error:" landmarkType = "5"> @@ -3305,11 +3305,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456931229.064012" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "484" - endingLineNumber = "484" + startingLineNumber = "483" + endingLineNumber = "483" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3321,11 +3321,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456931229.064012" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "518" - endingLineNumber = "518" + startingLineNumber = "516" + endingLineNumber = "516" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3337,11 +3337,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "542" - endingLineNumber = "542" + startingLineNumber = "541" + endingLineNumber = "541" landmarkName = "-didReceiveLocalNotification:" landmarkType = "5"> @@ -3353,11 +3353,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "664" - endingLineNumber = "664" + startingLineNumber = "665" + endingLineNumber = "665" landmarkName = "-didReceiveMessage:" landmarkType = "5"> @@ -3369,11 +3369,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "665" - endingLineNumber = "665" + startingLineNumber = "666" + endingLineNumber = "666" landmarkName = "-didReceiveMessageId:chatter:error:" landmarkType = "5"> @@ -3385,11 +3385,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "424" - endingLineNumber = "424" + startingLineNumber = "423" + endingLineNumber = "423" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3465,11 +3465,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "283" - endingLineNumber = "283" + startingLineNumber = "282" + endingLineNumber = "282" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3481,11 +3481,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "321" - endingLineNumber = "321" + startingLineNumber = "320" + endingLineNumber = "320" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3497,11 +3497,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "366" - endingLineNumber = "366" + startingLineNumber = "365" + endingLineNumber = "365" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3513,11 +3513,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "368" - endingLineNumber = "368" + startingLineNumber = "367" + endingLineNumber = "367" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3609,11 +3609,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "363" - endingLineNumber = "363" + startingLineNumber = "362" + endingLineNumber = "362" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3625,11 +3625,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "360" - endingLineNumber = "360" + startingLineNumber = "359" + endingLineNumber = "359" landmarkName = "-showNotificationWithMessage:" landmarkType = "5"> @@ -3657,11 +3657,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "379" - endingLineNumber = "379" + startingLineNumber = "378" + endingLineNumber = "378" landmarkName = "-didLoginWithInfo:error:" landmarkType = "5"> @@ -3737,11 +3737,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "426" - endingLineNumber = "426" + startingLineNumber = "425" + endingLineNumber = "425" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3753,23 +3753,7 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" - startingColumnNumber = "9223372036854775807" - endingColumnNumber = "9223372036854775807" - startingLineNumber = "454" - endingLineNumber = "454" - landmarkName = "-callSessionStatusChanged:changeReason:error:" - landmarkType = "5"> - - - - + + + + @@ -3801,11 +3801,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "484" - endingLineNumber = "484" + startingLineNumber = "483" + endingLineNumber = "483" landmarkName = "-callOutWithChatter:" landmarkType = "5"> @@ -3817,11 +3817,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "461" - endingLineNumber = "461" + startingLineNumber = "460" + endingLineNumber = "460" landmarkName = "-callOutWithChatter:" landmarkType = "5"> @@ -3833,11 +3833,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "446" - endingLineNumber = "446" + startingLineNumber = "445" + endingLineNumber = "445" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3849,11 +3849,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456994426.356087" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "344" - endingLineNumber = "344" + startingLineNumber = "345" + endingLineNumber = "345" landmarkName = "-moreViewAudioCallAction:" landmarkType = "5"> @@ -3865,11 +3865,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456931229.064012" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "299" - endingLineNumber = "299" + startingLineNumber = "298" + endingLineNumber = "298" landmarkName = "-_beginRing" landmarkType = "5"> @@ -3881,11 +3881,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456931229.064012" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "485" - endingLineNumber = "485" + startingLineNumber = "484" + endingLineNumber = "484" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3897,11 +3897,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "925" - endingLineNumber = "925" + startingLineNumber = "926" + endingLineNumber = "926" landmarkName = "-proximitySensorChanged:" landmarkType = "5"> @@ -3913,11 +3913,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "923" - endingLineNumber = "923" + startingLineNumber = "924" + endingLineNumber = "924" landmarkName = "-proximitySensorChanged:" landmarkType = "5"> @@ -3961,11 +3961,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/MainViewController.m" - timestampString = "456933663.930822" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "492" - endingLineNumber = "492" + startingLineNumber = "491" + endingLineNumber = "491" landmarkName = "-callOutWithChatter:" landmarkType = "5"> @@ -3977,11 +3977,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/Call/CallViewController.m" - timestampString = "456932665.48531" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "496" - endingLineNumber = "496" + startingLineNumber = "495" + endingLineNumber = "495" landmarkName = "-callSessionStatusChanged:changeReason:error:" landmarkType = "5"> @@ -3993,11 +3993,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "505" - endingLineNumber = "505" + startingLineNumber = "506" + endingLineNumber = "506" landmarkName = "-sendTextMessage:" landmarkType = "5"> @@ -4009,11 +4009,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m" - timestampString = "457003304.570546" + timestampString = "457058578.429508" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "389" - endingLineNumber = "389" + startingLineNumber = "403" + endingLineNumber = "403" landmarkName = "-chatBtnClick:" landmarkType = "5"> @@ -4105,11 +4105,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Utility/Network/BaseViewModel.m" - timestampString = "456978249.028854" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "21" - endingLineNumber = "21" + startingLineNumber = "23" + endingLineNumber = "23" landmarkName = "-initWithDictionary:error:" landmarkType = "5"> @@ -4133,15 +4133,15 @@ @@ -4185,11 +4185,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "950" - endingLineNumber = "950" + startingLineNumber = "951" + endingLineNumber = "951" landmarkName = "-routerEventWithName:userInfo:" landmarkType = "5"> @@ -4201,11 +4201,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "806" - endingLineNumber = "806" + startingLineNumber = "807" + endingLineNumber = "807" landmarkName = "-loadMoreMessages" landmarkType = "5"> @@ -4217,11 +4217,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "708" - endingLineNumber = "708" + startingLineNumber = "709" + endingLineNumber = "709" landmarkName = "-formatMessages:" landmarkType = "5"> @@ -4233,11 +4233,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "565" - endingLineNumber = "565" + startingLineNumber = "566" + endingLineNumber = "566" landmarkName = "-formatMessage:" landmarkType = "5"> @@ -4249,11 +4249,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "802" - endingLineNumber = "802" + startingLineNumber = "803" + endingLineNumber = "803" landmarkName = "-loadMoreMessages" landmarkType = "5"> @@ -4265,11 +4265,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "846" - endingLineNumber = "846" + startingLineNumber = "847" + endingLineNumber = "847" landmarkName = "-shouldAckMessage:read:" landmarkType = "5"> @@ -4281,11 +4281,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "868" - endingLineNumber = "868" + startingLineNumber = "869" + endingLineNumber = "869" landmarkName = "-shouldMarkMessageAsRead" landmarkType = "5"> @@ -4297,11 +4297,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "877" - endingLineNumber = "877" + startingLineNumber = "878" + endingLineNumber = "878" landmarkName = "-sendHasReadResponseForMessages:" landmarkType = "5"> @@ -4313,12 +4313,12 @@ moduleName = "Ash_AWord" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/xmfish/Documents/Ash_Soft/Ash_AWord/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "457003304.958387" + timestampString = "457067440.635329" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "877" - endingLineNumber = "877" - offsetFromSymbolStart = "84"> + startingLineNumber = "878" + endingLineNumber = "878" + offsetFromSymbolStart = "64"> + startingLineNumber = "878" + endingLineNumber = "878" + offsetFromSymbolStart = "48"> @@ -4345,11 +4345,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "880" - endingLineNumber = "880" + startingLineNumber = "881" + endingLineNumber = "881" landmarkName = "-sendHasReadResponseForMessages:" landmarkType = "5"> @@ -4361,11 +4361,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "937" - endingLineNumber = "937" + startingLineNumber = "938" + endingLineNumber = "938" landmarkName = "-markMessagesAsRead:" landmarkType = "5"> @@ -4377,11 +4377,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m" - timestampString = "456997414.065256" + timestampString = "457061404.832726" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "549" - endingLineNumber = "549" + startingLineNumber = "550" + endingLineNumber = "550" landmarkName = "-addMessage:" landmarkType = "5"> @@ -4402,5 +4402,85 @@ landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Config/AWordDefault.h b/Ash_AWord/Config/AWordDefault.h index fbecb3b..9e7268f 100644 --- a/Ash_AWord/Config/AWordDefault.h +++ b/Ash_AWord/Config/AWordDefault.h @@ -38,6 +38,9 @@ +(void)setLoginType:(NSInteger)loginType; +(NSInteger)getLoginType; +//设置个性签名 ++(void)setSignature:(NSString*)sinagure; ++(NSString*)getSignature; //保存背景图片 +(BOOL)setHeadBgImg:(UIImage *)headBgImg; +(UIImage*)getHeadBgImg; diff --git a/Ash_AWord/Config/AWordDefault.m b/Ash_AWord/Config/AWordDefault.m index 4222979..c0e4aba 100644 --- a/Ash_AWord/Config/AWordDefault.m +++ b/Ash_AWord/Config/AWordDefault.m @@ -79,6 +79,17 @@ { return [[NSUserDefaults standardUserDefaults] integerForKey:@"logintype"]; } + ++(void)setSignature:(NSString *)sinagure +{ + [[NSUserDefaults standardUserDefaults] setObject:sinagure forKey:@"sinagure"]; + [[NSUserDefaults standardUserDefaults] synchronize]; +} ++(NSString*)getSignature +{ + return [[NSUserDefaults standardUserDefaults] stringForKey:@"sinagure"]; + +} +(BOOL)setHeadBgImg:(UIImage *)headBgImg { NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory,NSUserDomainMask, YES); diff --git a/Ash_AWord/Config/AWordUser.h b/Ash_AWord/Config/AWordUser.h index e57f933..2e1e8b0 100644 --- a/Ash_AWord/Config/AWordUser.h +++ b/Ash_AWord/Config/AWordUser.h @@ -17,6 +17,9 @@ @property (nonatomic, strong) NSString* userGender; @property (nonatomic, assign) NSInteger loginType; //0代表第三方,1代表本地. @property (nonatomic, strong) UIImage* headBgImg; +@property (nonatomic, strong) NSString* signature; +@property (nonatomic, assign)NSInteger myNewFollowerCount; +@property (nonatomic, assign)NSInteger notReadCommentNum; +(AWordUser*)sharedInstance; @end diff --git a/Ash_AWord/Config/AWordUser.m b/Ash_AWord/Config/AWordUser.m index c96de1e..a5acaa4 100644 --- a/Ash_AWord/Config/AWordUser.m +++ b/Ash_AWord/Config/AWordUser.m @@ -22,6 +22,9 @@ static AWordUser *sharedObj = nil; sharedObj.userGender = [AWordDefault getUserGender]; sharedObj.loginType = [AWordDefault getLoginType]; sharedObj.headBgImg = [AWordDefault getHeadBgImg]; + sharedObj.signature = [AWordDefault getSignature]; + sharedObj.notReadCommentNum = 0; + sharedObj.myNewFollowerCount = 0; } return sharedObj; } @@ -63,5 +66,9 @@ static AWordUser *sharedObj = nil; _headBgImg = headBgImg; [AWordDefault setHeadBgImg:headBgImg]; } - +-(void)setSignature:(NSString *)signature +{ + _signature = signature; + [AWordDefault setSignature:signature]; +} @end diff --git a/Ash_AWord/Config/Common.h b/Ash_AWord/Config/Common.h index b7c10fe..469f516 100644 --- a/Ash_AWord/Config/Common.h +++ b/Ash_AWord/Config/Common.h @@ -72,6 +72,7 @@ #define Ash_AWord_API_URL @"http://121.43.150.13/QuestionServer/rs/yjn/post" #define Ash_AWord_First_URL @"http://121.43.150.13" #define Ash_AWord_Share_URL @"http://121.43.150.13/QuestionServer/web" +#define Ash_Aword_Base_URL @"http://121.43.150.13/QuestionServer" //#define Ash_AWord_API_URL @"http://192.168.1.3:8080/QuestionServer" #define Sign_Key @"yjn@jjyy123" diff --git a/Ash_AWord/Resource/acitvity_center_new@2x.png b/Ash_AWord/Resource/acitvity_center_new@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c95c7704a41ed40e870798071960520d726d507e GIT binary patch literal 2455 zcmbVLX;hO}8vcMNQN&@Zf`a4(EJPrCLWrPbLl6^?AVw=-NCJeA#pJ^P4uw)iL@BPg zA*0|@(E&x-3?gJ0L@i4LZn#aXwLwr8VU83R=0?HJ4^My0cXD&L=Xu`czHdP!ZsUVUZBZ(&x_QY_PWt3uQ-vc@r3M$l2h(%1gtCAge@av;Y=x*U&{uIaVlE zCP=X9auv9Tpum;sDxpXwfl&#PB&i|@J>1xgMoGm%==BsXo~vR>lBJ=UY6(A+7cI(^ zi2}svl`Bwz>2x3>-ON+tNBhlNDqAT^lS>qE7&{0JZm?phn2u)=Ng*5ti{VdTa!3RM zlgg%XSQHk4#-jO?Y4{n9FL42r8N&AGF!5~g5*!kZL?*KdG%}kAvPhv&XSiVs4J=fM zBr|rU!0t4c{ij?yODz$?N_DhSnL1Mek;zI}sYzCV5~y6s&ri{`Nx?(r2b zezDu_WoLP&plw}j+w!3gcUq^OZy@sCiksF`sovW4f2z7Oq< z4P7~p@wrr8+@PFczsYl%EUB+37_V!k?Ich3Z0GS`t+Km%%Fp?jWVvNj70LLhfRwpk zBn*n#AefA|HjPn2wi||%4j0}!ekj3lE=sA&Wvo z(A|o40VOqVvG9rr&nL30_#K4Iri}68XovkdSbFQi{NkfnTTx*gAK&1*>;NV*1ozXB zOS|*q;$DA@Sb)*>TZa7e;P60ci?iEO3kX8G#0=beQNj*`CQ0if?OQGweAI7$#8~Wk zx4|J)QrxKQin2sCM3${tTdb8W5y4J~k;Z=O*GioE7{B(^Io)QXOI`npx6g3ib08=f z9dk}LclIHSh25qG!B^`VOK z0R#l0ijy4%J4HSRAS4zYxS~&fWom)DMa`RXPe61jIiXp|y?PQ6tWqn!c~DkvJzUM{ zUNhphYH`rMaDzMc@9%=={&9bID-gI&#bJU zwa{Wb;^fx=@sEFbRD!&8?}5jiu$DBfEd@N>;e90!RrW16hm7@8AcmgMS7 zJei$l&*X%TCr~hY?_|%lf^oVN8i_`h2j}iY(_%AR1UhS8VEn`fEBBpI$@=HkyI*lT zZ>;V!Jy^-cG$p<J@fB6`nr9zn#sfisHn$ z1>_q~^v~-Za$CeuZ5}VuJv(IYivOzftmxWH?_5^-c>y*qds)7*rN3f3=^1jq^T}Vx zgYQ}$k@F89ecIM_{j%21)j2E6$Xueg5VUNx=YVo}GNVha_bdlb| z=V@nM<=%%%^Yz91^|g<)b{TV|oD$KthfP{wpLYp27+aFP+n7_lx@f@d)qZz7SA14M zZxd>tDvZS?8e#3(V>C#aTmP>=|#-MWCH&(a=sv=qP;m1j(+!3$K)OT z<7%&XKn_2GtMU5q(g%-poronD7wo|jECkU2!Tv!BQFpoy25evimzt|~=)hJ8Qlg3L)@=Fn!v z&l5k_os%KwTV2CNgvNaB>2q)Wzk^2-ypZqfe`}d@^Oh|o0D(*NUEJ^3){(_5`nH7i smxgw`s}ls@R$u9_4R_~tzllp##~*obyJ>r98K^cWjKgDBF*oP_7bA|$m;e9( literal 0 HcmV?d00001 diff --git a/Ash_AWord/Utility/Network/BaseViewModel.h b/Ash_AWord/Utility/Network/BaseViewModel.h index 25b23f4..848bde9 100644 --- a/Ash_AWord/Utility/Network/BaseViewModel.h +++ b/Ash_AWord/Utility/Network/BaseViewModel.h @@ -17,6 +17,8 @@ typedef enum { @property (nonatomic, readonly) NSNumber* errCode; @property (nonatomic, readonly) NSString *errMessage; +@property (nonatomic, readonly) NSInteger notReadCommentNum;//用户发表的所有记录的未读评论总数（每个接口都会返回该项） +@property (nonatomic, readonly) NSInteger myNewFollowerCount;//用户上一次加载关注自己的用户列表之后新关注自己的用户数（每个接口都会返回该项） - (BOOL)success; diff --git a/Ash_AWord/Utility/Network/BaseViewModel.m b/Ash_AWord/Utility/Network/BaseViewModel.m index eb2b0ba..b864c7e 100644 --- a/Ash_AWord/Utility/Network/BaseViewModel.m +++ b/Ash_AWord/Utility/Network/BaseViewModel.m @@ -13,6 +13,8 @@ return @{ @"errCode": @"ret", @"errMessage": @"msg", + @"notReadCommentNum": @"notReadCommentNum", + @"myNewFollowerCount": @"myNewFollowerCount", }; } @@ -21,6 +23,8 @@ self = [super initWithDictionary:dictionaryValue error:error]; if (self != nil) { + [AWordUser sharedInstance].notReadCommentNum = _notReadCommentNum; + [AWordUser sharedInstance].myNewFollowerCount = _myNewFollowerCount; } return self; } diff --git a/Ash_AWord/Utility/Tool/Ash_UIUtil.m b/Ash_AWord/Utility/Tool/Ash_UIUtil.m index aa05098..c7a3e70 100644 --- a/Ash_AWord/Utility/Tool/Ash_UIUtil.m +++ b/Ash_AWord/Utility/Tool/Ash_UIUtil.m @@ -512,7 +512,7 @@ + (UIColor *)appMainColorAlpha:(CGFloat)alpha { - return [UIColor colorWithHexString:@"#68d430" alpha:1]; + return [UIColor colorWithHexString:@"#61BFA9" alpha:1]; } + (UIColor *)appNavBackgroundColor diff --git a/Ash_AWord/ViewControllers/Chat/Call/CallViewController.m b/Ash_AWord/ViewControllers/Chat/Call/CallViewController.m index 4a4dc5e..98426a1 100644 --- a/Ash_AWord/ViewControllers/Chat/Call/CallViewController.m +++ b/Ash_AWord/ViewControllers/Chat/Call/CallViewController.m @@ -45,7 +45,6 @@ { if(call.callState == CTCallStateIncoming) { - NSLog(@"Call is incoming"); [_timeTimer invalidate]; [self _stopRing]; @@ -503,7 +502,6 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer if (callSession.status == eCallSessionStatusDisconnected) { [self _stopRing]; - NSLog(@"callSession.status == eCallSessionStatusDisconnected"); _statusLabel.text = @"通话已挂断"; NSString *str = @"通话结束"; if(_timeLength == 0) diff --git a/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m b/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m index e2f7c09..1b178e7 100644 --- a/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m +++ b/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m @@ -199,7 +199,8 @@ completion:^(NSError *error) { if (error) { - NSLog(NSLocalizedString(@"message.startRecordFail", @"failure to start recording")); +// DLog(NSLocalizedString(@"message.startRecordFail", @"failure to start recording")); + } }]; } @@ -256,7 +257,7 @@ NSError *error = nil; [fileman removeItemAtURL:videoURL error:&error]; if (error) { - NSLog(@"failed to remove file, error:%@.", error); + DLog(@"failed to remove file, error:%@.", error); } } EMChatVideo *chatVideo = [[EMChatVideo alloc] initWithFile:[mp4 relativePath] displayName:@"video.mp4"]; @@ -393,16 +394,16 @@ [exportSession exportAsynchronouslyWithCompletionHandler:^{ switch ([exportSession status]) { case AVAssetExportSessionStatusFailed: { - NSLog(@"failed, error:%@.", exportSession.error); + DLog(@"failed, error:%@.", exportSession.error); } break; case AVAssetExportSessionStatusCancelled: { - NSLog(@"cancelled."); + DLog(@"cancelled."); } break; case AVAssetExportSessionStatusCompleted: { - NSLog(@"completed."); + DLog(@"completed."); } break; default: { - NSLog(@"others."); + DLog(@"others."); } break; } dispatch_semaphore_signal(wait); @@ -1128,7 +1129,7 @@ } else { - NSLog(@"Read %@ failed!", localPath); + DLog(@"Read %@ failed!", localPath); } return ; } @@ -1153,7 +1154,7 @@ } else { - NSLog(@"Read %@ failed!", localPath); + DLog(@"Read %@ failed!", localPath); } return ; } diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m index 9d88fe0..7c0557d 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m @@ -93,9 +93,7 @@ UMSocialAccountEntity *snsAccount = [[UMSocialAccountManager socialAccountDictionary] valueForKey:UMShareToSina]; - NSLog(@"username is %@, uid is %@, token is %@ url is %@",snsAccount.userName,snsAccount.usid,snsAccount.accessToken,snsAccount.iconURL); [[UMSocialDataService defaultDataService] requestSnsInformation:UMShareToSina completion:^(UMSocialResponseEntity *response){ - NSLog(@"SnsInformation is %@",response.data); if (response.data) { NSString* gender = @"男"; if ([[response.data objectForKey:@"gender"] integerValue]==0) { diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.xib b/Ash_AWord/ViewControllers/Login/LoginViewController.xib index 62a7efe..e345d6c 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.xib @@ -102,7 +102,7 @@ - + diff --git a/Ash_AWord/ViewControllers/Main/MainViewController.m b/Ash_AWord/ViewControllers/Main/MainViewController.m index 953ef35..3826304 100644 --- a/Ash_AWord/ViewControllers/Main/MainViewController.m +++ b/Ash_AWord/ViewControllers/Main/MainViewController.m @@ -262,7 +262,6 @@ static NSString *kMessageType = @"MessageType"; if (timeInterval < kDefaultPlaySoundInterval) { //如果距离上次响铃和震动时间太短, 则跳过响铃 - NSLog(@"skip ringing & vibration %@, %@", [NSDate date], self.lastPlaySoundDate); return; } diff --git a/Ash_AWord/ViewControllers/Main/MessageViewController.m b/Ash_AWord/ViewControllers/Main/MessageViewController.m index cfa8a9b..e396800 100644 --- a/Ash_AWord/ViewControllers/Main/MessageViewController.m +++ b/Ash_AWord/ViewControllers/Main/MessageViewController.m @@ -163,7 +163,6 @@ [self.tableView reloadData]; } failedBlock:^(NSError *error) { -// _page--; [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0]; [self footerEndRefreshing]; [self headerEndRefreshing]; diff --git a/Ash_AWord/ViewControllers/Main/MyViewController.m b/Ash_AWord/ViewControllers/Main/MyViewController.m index 633daee..c884d70 100644 --- a/Ash_AWord/ViewControllers/Main/MyViewController.m +++ b/Ash_AWord/ViewControllers/Main/MyViewController.m @@ -19,6 +19,8 @@ #import "MainViewController.h" #import "AppDelegate.h" #import "PersonalInfoViewController.h" +#import "PraiseUserListViewController.h" +#import "MyRelateViewController.h" @interface MyViewController () { NSArray* cellTitleArr; @@ -76,11 +78,11 @@ #pragma mark UITableViewDelegate -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 3; + return 5; } -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - if (section == 1) { + if (section == 2 || section == 3) { return 2; } return 1; @@ -88,12 +90,12 @@ -(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { NSString* cellIdentifier = @"cell"; - if (indexPath.section == 2) { + if (indexPath.section == 4 || (indexPath.section==2&&indexPath.row==1) || indexPath.section==1) { cellIdentifier = @"MyMessageTableViewCell"; } UITableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier]; if (!cell) { - if (indexPath.section == 2) { + if (indexPath.section == 4 || (indexPath.section==1&&indexPath.row==1) || indexPath.section==1) { UINib* nib = nil; nib = [UINib nibWithNibName:cellIdentifier bundle:nil]; [tableView registerNib:nib forCellReuseIdentifier:cellIdentifier]; @@ -105,6 +107,8 @@ } + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; + switch (indexPath.section) { case 0: { @@ -122,6 +126,25 @@ } break; case 1: + { + cell.textLabel.text = @"与我相关"; + [(MyMessageTableViewCell*)cell setUnReadColor:[UIColor appMainColor]]; + [(MyMessageTableViewCell*)cell setUnReadCount:[AWordUser sharedInstance].notReadCommentNum]; + } + break; + case 2: + { + if (indexPath.row == 0 ) { + cell.textLabel.text = @"我的关注"; + } + if (indexPath.row == 1) { + cell.textLabel.text = @"我的粉丝"; + [(MyMessageTableViewCell*)cell setUnReadColor:[UIColor appMainColor]]; + [(MyMessageTableViewCell*)cell setUnReadCount:[AWordUser sharedInstance].myNewFollowerCount]; + } + } + break; + case 3: { if (indexPath.row == 0 ) { cell.textLabel.text = @"我发表的图片"; @@ -131,11 +154,13 @@ } } break; - case 2: + case 4: { cell.textLabel.text = @"消息"; NSInteger count = [((AppDelegate*)[UIApplication sharedApplication].delegate).mainViewController setupUnreadMessageCount]; + [(MyMessageTableViewCell*)cell setUnReadColor:[UIColor redColor]]; [(MyMessageTableViewCell*)cell setUnReadCount:count]; + } break; default: @@ -155,14 +180,11 @@ }else{ if([AWordUser sharedInstance].loginType == 1) { -// SetUserInfoViewController* setUserInfoViewController = [[SetUserInfoViewController alloc] init]; -// setUserInfoViewController.hidesBottomBarWhenPushed = YES; -// [self.navigationController pushViewController:setUserInfoViewController animated:YES]; PersonalInfoViewController* personalInfoViewController = [[PersonalInfoViewController alloc] init]; personalInfoViewController.hidesBottomBarWhenPushed = YES; personalInfoViewController.otherUserId = [AWordUser sharedInstance].uid; - [[AppDelegate visibleViewController].navigationController pushViewController:personalInfoViewController animated:YES]; + [self.navigationController pushViewController:personalInfoViewController animated:YES]; } } @@ -170,6 +192,35 @@ } break; case 1: + { + MyRelateViewController* myRelateViewController = [[MyRelateViewController alloc] init]; + myRelateViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:myRelateViewController animated:YES]; + } + break; + case 2: + { + if (![AWordUser sharedInstance].isLogin) + { + [LoginViewController presentLoginViewControllerInView:self success:nil]; + }else + { + PraiseUserListViewController* praiseUserListViewController = [[PraiseUserListViewController alloc] init]; + praiseUserListViewController.targetId = [AWordUser sharedInstance].uid; + praiseUserListViewController.userListType = UserList_Fans_Type; + praiseUserListViewController.hidesBottomBarWhenPushed = YES; + if (indexPath.row == 0) { + praiseUserListViewController.userListType = UserList_Attention_Type; + }else{ + praiseUserListViewController.userListType = UserList_Fans_Type; + } + [self.navigationController pushViewController:praiseUserListViewController animated:YES]; + + } + + } + break; + case 3: { if (![AWordUser sharedInstance].isLogin) { @@ -189,7 +240,7 @@ } break; - case 2: + case 4: { MessageListViewController* messageListViewController = [[MessageListViewController alloc] init]; messageListViewController.hidesBottomBarWhenPushed = YES; diff --git a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m index 0f24e80..4348460 100644 --- a/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m +++ b/Ash_AWord/ViewControllers/Message/MessageCommentViewController.m @@ -219,6 +219,7 @@ cell.commentType = Voice_Type; CommentInfoViewModel* commentInfoViewModel = [_commentInfoArr objectAtIndex:indexPath.row]; + commentInfoViewModel.status = 1; cell.ownerId = _text_Voice.ownerId; [cell setCommentWithUid:^(NSString* ownerId){ [_commentTextView showWithUid:ownerId]; diff --git a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m index 8a9ccdd..ebaaf42 100644 --- a/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m +++ b/Ash_AWord/ViewControllers/Message/MessagePublishViewController.m @@ -153,8 +153,10 @@ AVAudioSession * session = [AVAudioSession sharedInstance]; NSError * sessionError; [session setCategory:AVAudioSessionCategoryPlayAndRecord error:&sessionError]; - if(session == nil) - NSLog(@"Error creating session: %@", [sessionError description]); + if(session == nil){ + DLog(@"Error creating session: %@", [sessionError description]); + + } else [session setActive:YES error:nil]; diff --git a/Ash_AWord/ViewControllers/My/MyMessageViewController.xib b/Ash_AWord/ViewControllers/My/MyMessageViewController.xib index dc41c3f..e3989af 100644 --- a/Ash_AWord/ViewControllers/My/MyMessageViewController.xib +++ b/Ash_AWord/ViewControllers/My/MyMessageViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -16,9 +16,9 @@ - + - + diff --git a/Ash_AWord/ViewControllers/My/MyNoteViewController.xib b/Ash_AWord/ViewControllers/My/MyNoteViewController.xib index 4f98081..fe9cafe 100644 --- a/Ash_AWord/ViewControllers/My/MyNoteViewController.xib +++ b/Ash_AWord/ViewControllers/My/MyNoteViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -16,9 +16,9 @@ - + - + diff --git a/Ash_AWord/ViewControllers/My/MyRelateViewController.h b/Ash_AWord/ViewControllers/My/MyRelateViewController.h new file mode 100644 index 0000000..18ffa8e --- /dev/null +++ b/Ash_AWord/ViewControllers/My/MyRelateViewController.h @@ -0,0 +1,14 @@ +// +// MyRelateViewController.h +// Ash_AWord +// +// Created by xmfish on 15/6/27. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "BaseRefreshViewController.h" + +@interface MyRelateViewController : BaseRefreshViewController +@property (weak, nonatomic) IBOutlet UITableView *tableView; + +@end diff --git a/Ash_AWord/ViewControllers/My/MyRelateViewController.m b/Ash_AWord/ViewControllers/My/MyRelateViewController.m new file mode 100644 index 0000000..fcdbbfc --- /dev/null +++ b/Ash_AWord/ViewControllers/My/MyRelateViewController.m @@ -0,0 +1,170 @@ +// +// MyRelateViewController.m +// Ash_AWord +// +// Created by xmfish on 15/6/27. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "MyRelateViewController.h" +#import "CommentTableViewCell.h" +#import "CommentViewModel.h" +#import "NoteCommentViewController.h" +#import "MessageCommentViewController.h" +@interface MyRelateViewController () +{ + NSMutableArray* _commentInfoArr; + NSInteger _page; + +} +@end + +@implementation MyRelateViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. + _page = 1; + _commentInfoArr = [[NSMutableArray alloc] init]; + + [self customViewDidLoad]; + + self.navigationItem.title = @"与我相关"; + self.tableView.delegate = self; + self.tableView.dataSource = self; + self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine; + + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"已读" style:UIBarButtonItemStyleDone target:self action:@selector(readAll)]; + + [self headerBeginRefreshing]; +} +#pragma mark 标记已读 +-(void)readAll +{ + +} +#pragma mark MJRefreshDelegate +-(void)headerRereshing +{ + _page=1; + [self loadData]; +} +-(void)footerRereshing +{ + + [self loadData]; +} +-(void)loadData +{ + [MobClick event:kUmen_note]; + + PropertyEntity* pro = [CommentViewModel requireLoadMyCommentWithPage:_page withPage_size:DefaultPageSize]; + [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { + + if ([viewModel success]) { + CommentViewModel* commentViewModel = (CommentViewModel*)viewModel; + + if (_page <= 1) { + [_commentInfoArr removeAllObjects]; + } + if (commentViewModel.commentInfoArr) { + [_commentInfoArr addObjectsFromArray:commentViewModel.commentInfoArr]; + } + [self footerEndRefreshing]; + [self headerEndRefreshing]; + if (commentViewModel.commentInfoArr.count + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/ViewControllers/My/PersonalInfoViewController.m b/Ash_AWord/ViewControllers/My/PersonalInfoViewController.m index 4ee6d4a..82bf4a4 100644 --- a/Ash_AWord/ViewControllers/My/PersonalInfoViewController.m +++ b/Ash_AWord/ViewControllers/My/PersonalInfoViewController.m @@ -15,6 +15,7 @@ #import "MessageViewModel.h" #import "UserViewModel.h" #import "ChatMainViewController.h" +#import "SetUserInfoViewController.h" @interface PersonalInfoViewController () { CExpandHeader *_header; @@ -54,11 +55,14 @@ if ([_otherUserId isEqualToString:[AWordUser sharedInstance].uid]) { _bottomView.hidden = YES; _tableBottomHeight.constant = 0.0; + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"修改信息" style:UIBarButtonItemStyleDone target:self action:@selector(modifyInfo)]; } self.tableView.hidden = YES; [DejalActivityView activityViewForView:self.view withLabel:kLoadingTips]; [self headerRereshing]; + + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(headerRereshing) name:kLoginSuccessNotificationName object:nil]; } -(void)viewDidAppear:(BOOL)animated @@ -69,7 +73,9 @@ __weak PersonalInfoViewController *weakself = self; [_personalTopView setuserInfoViewModel:_userViewModel]; - [_personalTopView.headBtn addTarget:self action:@selector(selectHeadImage:) forControlEvents:UIControlEventTouchUpInside]; + if ([_otherUserId isEqualToString:[AWordUser sharedInstance].uid]) { + [_personalTopView.headBtn addTarget:self action:@selector(selectHeadImage:) forControlEvents:UIControlEventTouchUpInside]; + } [_personalTopView setIsSelectImg:^(BOOL isSelectImg){ _isSelectImage = isSelectImg; if (isSelectImg) { @@ -92,6 +98,14 @@ // [self.tableView endUpdates]; } +#pragma mark 修改个人信息 +-(void)modifyInfo +{ + SetUserInfoViewController* setUserInfoViewController = [[SetUserInfoViewController alloc] init]; + setUserInfoViewController.hidesBottomBarWhenPushed = YES; + [self.navigationController pushViewController:setUserInfoViewController animated:YES]; + +} #pragma mark 替换头图 -(void)selectHeadImage:(id)sender { diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m index aeec3bf..6db4615 100644 --- a/Ash_AWord/ViewControllers/My/SetUpViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m @@ -176,7 +176,7 @@ } -(void)showUserNotice { - SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/notice.html",Ash_AWord_API_URL]]]; + SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/notice.html",Ash_Aword_Base_URL]]]; [self.navigationController pushViewController:svWebViewController animated:YES]; } - (void)goToAppraisal @@ -188,7 +188,7 @@ #pragma mark 关于 -(void)showAbout { - SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/about.html",Ash_AWord_API_URL]]]; + SVWebViewController* svWebViewController = [[SVWebViewController alloc] initWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@/about.html",Ash_Aword_Base_URL]]]; [self.navigationController pushViewController:svWebViewController animated:YES]; } #pragma mark UIAlertViewDelegate diff --git a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.h b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.h index 7fa2818..83806f3 100644 --- a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.h +++ b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.h @@ -7,9 +7,10 @@ // #import - +#import "UIPlaceHolderTextView.h" @interface SetUserInfoViewController : UIViewController @property (weak, nonatomic) IBOutlet UIButton *avatarBtn; +@property (weak, nonatomic) IBOutlet UIPlaceHolderTextView *signatureTextView; @property (weak, nonatomic) IBOutlet UIImageView *avatarImageView; @property (weak, nonatomic) IBOutlet UITextField *nickNameTextField; - (IBAction)avatarBtnClick:(id)sender; diff --git a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m index de925fc..4121aad 100644 --- a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m +++ b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.m @@ -8,7 +8,7 @@ #import "SetUserInfoViewController.h" #import "LoginViewModel.h" -@interface SetUserInfoViewController () +@interface SetUserInfoViewController () { UIImage* _avatarImage; } @@ -30,6 +30,22 @@ [_avatarImageView sd_setImageWithURL:[NSURL URLWithString:[AWordUser sharedInstance].userAvatar] placeholderImage:[UIImage imageNamed:@"Icon"]]; _nickNameTextField.text = [AWordUser sharedInstance].userName; _nickNameTextField.placeholder = [AWordUser sharedInstance].userName; + _nickNameTextField.layer.borderColor = [[UIColor lineColor] CGColor]; + + _signatureTextView.layer.borderWidth = 0.5; + _signatureTextView.layer.borderColor = [[UIColor lineColor] CGColor]; + _signatureTextView.layer.cornerRadius = 5; + _signatureTextView.layer.masksToBounds = YES; + + _signatureTextView.font = [UIFont appBoldFontOfSize:14.0]; + if ([AWordUser sharedInstance].signature.length > 0) { + _signatureTextView.placeholder = [AWordUser sharedInstance].signature; + }else{ + _signatureTextView.placeholder = @"还未填写签名"; + + } + + _signatureTextView.delegate = self; UITapGestureRecognizer *singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTap:)]; singleRecognizer.numberOfTapsRequired = 1; @@ -42,6 +58,44 @@ { [self.view endEditing:YES]; } + +//开始编辑输入框的时候，软键盘出现，执行此事件 +-(void)textViewDidBeginEditing:(UITextView *)textView +{ + NSTimeInterval animationDuration = 0.30f; + [UIView beginAnimations:@"ResizeForKeyboard" context:nil]; + [UIView setAnimationDuration:animationDuration]; + + //将视图的Y坐标向上移动offset个单位，以使下面腾出地方用于软键盘的显示 + + self.view.frame = CGRectMake(0.0f, -20, self.view.frame.size.width, self.view.frame.size.height); + + [UIView commitAnimations]; + + +} + + +//当用户按下return键或者按回车键，keyboard消失 +-(BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text +{ + if ([text isEqualToString:@"\n"]) { + [textView resignFirstResponder]; + } + return YES; +} + + +//输入框编辑完成以后，将视图恢复到原始状态 +-(void)textViewDidEndEditing:(UITextView *)textView +{ + NSTimeInterval animationDuration = 0.30f; + [UIView beginAnimations:@"ResizeForKeyboard" context:nil]; + [UIView setAnimationDuration:animationDuration]; + self.view.frame =CGRectMake(0, 64, self.view.frame.size.width, self.view.frame.size.height); + [UIView commitAnimations]; +} + #pragma mark UITextField //开始编辑输入框的时候，软键盘出现，执行此事件 -(void)textFieldDidBeginEditing:(UITextField *)textField @@ -130,7 +184,15 @@ -(void)sureModify { - if ( [_nickNameTextField.text isEqualToString:[AWordUser sharedInstance].userName] && !_avatarImage) { + if (_signatureTextView.text.length > 40) { + [MBProgressHUD errorHudWithView:nil label:@"个性签名要在40字以内" hidesAfter:1.0]; + return; + } + if ([_signatureTextView.text isEqualToString:@""] && [AWordUser sharedInstance].signature.length<=0) { + [MBProgressHUD errorHudWithView:nil label:@"没有内容修改" hidesAfter:1.0]; + return; + } + if ( [_nickNameTextField.text isEqualToString:[AWordUser sharedInstance].userName] && !_avatarImage && [_signatureTextView.text isEqualToString:[AWordUser sharedInstance].signature]) { [MBProgressHUD errorHudWithView:nil label:@"没有内容修改" hidesAfter:1.0]; return; } @@ -143,7 +205,11 @@ if (nickName.length <= 0 || [_nickNameTextField.text isEqualToString:@""]) { nickName = _nickNameTextField.placeholder; } - PropertyEntity* pro = [LoginViewModel requireModifyInfoWithNickName:nickName withGender:@"" withAvatarImg:_avatarImage]; + NSString* signature = _signatureTextView.text; + if (signature.length <= 0 || [_signatureTextView.text isEqualToString:@""]) { + signature = _signatureTextView.placeholder; + } + PropertyEntity* pro = [LoginViewModel requireModifyInfoWithNickName:nickName withGender:@"" withAvatarImg:_avatarImage withSignature:signature]; [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) { LoginViewModel* loginViewModel = (LoginViewModel*)viewModel; [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; @@ -152,6 +218,7 @@ [AWordUser sharedInstance].userName = nickName; [AWordUser sharedInstance].userAvatar = loginViewModel.figureurl; [AWordUser sharedInstance].userGender = @""; + [AWordUser sharedInstance].signature = signature; [[NSNotificationCenter defaultCenter] postNotificationName:kLoginSuccessNotificationName object:nil]; [MBProgressHUD checkHudWithView:nil label:@"修改成功" hidesAfter:1.0]; diff --git a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.xib b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.xib index c925eee..f43724a 100644 --- a/Ash_AWord/ViewControllers/My/SetUserInfoViewController.xib +++ b/Ash_AWord/ViewControllers/My/SetUserInfoViewController.xib @@ -10,6 +10,7 @@ + @@ -60,17 +61,35 @@ + + + + + + + + + + + + + diff --git a/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m index 8137e12..2767119 100644 --- a/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m +++ b/Ash_AWord/ViewControllers/User/PraiseUserListViewController.m @@ -28,7 +28,6 @@ self.navigationItem.title = @"关注"; }else if(_userListType == UserList_Fans_Type){ self.navigationItem.title = @"粉丝"; - } self.tableView.delegate = self; self.tableView.dataSource = self; diff --git a/Ash_AWord/ViewModels/Common/CommentViewModel.h b/Ash_AWord/ViewModels/Common/CommentViewModel.h index c54bab9..37adcf7 100644 --- a/Ash_AWord/ViewModels/Common/CommentViewModel.h +++ b/Ash_AWord/ViewModels/Common/CommentViewModel.h @@ -17,6 +17,7 @@ @property (nonatomic, strong) NSString *createTime; @property (nonatomic, strong) NSString *toUserId; @property (nonatomic, strong) NSString *toUserName; +@property (nonatomic, assign) NSInteger status;//状态。0：未读，1：已读 @property (nonatomic, assign) CommentType commentType; @end @interface CommentViewModel : BaseViewModel @@ -27,4 +28,6 @@ +(PropertyEntity*)requireDelCommentWithCommentId:(NSInteger)commentId; +(PropertyEntity*)requireLoadCommentWithRecordId:(NSInteger)recordId withPage:(NSInteger)page withPage_size:(NSInteger)page_size WithType:(CommentType)commentType; + ++(PropertyEntity*)requireLoadMyCommentWithPage:(NSInteger)page withPage_size:(NSInteger)page_size; @end diff --git a/Ash_AWord/ViewModels/Common/CommentViewModel.m b/Ash_AWord/ViewModels/Common/CommentViewModel.m index 7f1ba28..2c88691 100644 --- a/Ash_AWord/ViewModels/Common/CommentViewModel.m +++ b/Ash_AWord/ViewModels/Common/CommentViewModel.m @@ -20,6 +20,7 @@ @"commentType": @"type", @"toUserId":@"toUserId", @"toUserName":@"toUserName", + @"status" : @"status", }; } @end @@ -83,4 +84,17 @@ }; return pro; } ++(PropertyEntity*)requireLoadMyCommentWithPage:(NSInteger)page withPage_size:(NSInteger)page_size +{ + PropertyEntity *pro = [[PropertyEntity alloc] init]; + pro.requireType = HTTPRequestTypeWithPOSTDATA; + pro.responesOBJ = self.class; + NSDictionary* dic = @{@"page": [NSString stringWithFormat:@"%ld",page], + @"pageSize": [NSString stringWithFormat:@"%ld",page_size], + }; + pro.pro = @{@"root": dic, + @"command": @"10204", + }; + return pro; +} @end diff --git a/Ash_AWord/ViewModels/Common/UserViewModel.h b/Ash_AWord/ViewModels/Common/UserViewModel.h index adeffb7..277e927 100644 --- a/Ash_AWord/ViewModels/Common/UserViewModel.h +++ b/Ash_AWord/ViewModels/Common/UserViewModel.h @@ -19,6 +19,7 @@ @property (nonatomic, strong) NSString *signature; @property (nonatomic, assign) NSInteger followCount; @property (nonatomic, assign) NSInteger followerCount; +@property (nonatomic, assign) BOOL isNew; @end diff --git a/Ash_AWord/ViewModels/LoginViewModel.h b/Ash_AWord/ViewModels/LoginViewModel.h index 03b4f09..4c681f6 100644 --- a/Ash_AWord/ViewModels/LoginViewModel.h +++ b/Ash_AWord/ViewModels/LoginViewModel.h @@ -19,6 +19,9 @@ typedef enum { @property (nonatomic, strong) NSString* uId; //用户id。 @property (nonatomic, strong) NSString* figureurl; @property (nonatomic, strong) NSString* userName; +@property (nonatomic, strong) NSString* gender; +@property (nonatomic, strong) NSString* signature; + + (PropertyEntity *)requireLoginWithOpenId:(NSString*)openId withName:(NSString*)name withGender:(NSString*)gender withFigureUrl:(NSString*)figureUrl; @@ -32,7 +35,7 @@ typedef enum { +(PropertyEntity*)requireModifyPassWord:(NSString*)newPassword withOldPaaaWord:(NSString*)oldPassWord; //修改信息 -+(PropertyEntity*)requireModifyInfoWithNickName:(NSString*)nickName withGender:(NSString*)gender withAvatarImg:(UIImage*)avatarImg; ++(PropertyEntity*)requireModifyInfoWithNickName:(NSString*)nickName withGender:(NSString*)gender withAvatarImg:(UIImage*)avatarImg withSignature:(NSString*)signature; //举报 +(PropertyEntity*)requireReportWith:(Msg_Type)type withMsgId:(NSInteger)msgId withContent:(NSString*)content ; diff --git a/Ash_AWord/ViewModels/LoginViewModel.m b/Ash_AWord/ViewModels/LoginViewModel.m index cd2ebb5..a80bef5 100644 --- a/Ash_AWord/ViewModels/LoginViewModel.m +++ b/Ash_AWord/ViewModels/LoginViewModel.m @@ -15,6 +15,8 @@ [dic setObject:@"uid" forKey:@"uId"]; [dic setObject:@"figureurl" forKey:@"figureurl"]; [dic setObject:@"name" forKey:@"userName"]; + [dic setObject:@"signature" forKey:@"signature"]; + [dic setObject:@"gender" forKey:@"gender"]; return dic; } @@ -94,7 +96,7 @@ return pro; } -+(PropertyEntity*)requireModifyInfoWithNickName:(NSString *)nickName withGender:(NSString *)gender withAvatarImg:(UIImage *)avatarImg ++(PropertyEntity*)requireModifyInfoWithNickName:(NSString *)nickName withGender:(NSString *)gender withAvatarImg:(UIImage *)avatarImg withSignature:(NSString *)signature { PropertyEntity *pro = [[PropertyEntity alloc] init]; pro.requireType = HTTPRequestTypeWithPOSTDATA; @@ -107,7 +109,8 @@ pro.pFile = file; NSDictionary* dic = @{@"gender": gender, - @"name": nickName + @"name": nickName, + @"signature": signature, }; pro.pro = @{@"root": dic, @"command": @"10006",}; diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.h b/Ash_AWord/Views/Common/CommentTableViewCell.h index d9443c3..ce50fc0 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.h +++ b/Ash_AWord/Views/Common/CommentTableViewCell.h @@ -17,11 +17,14 @@ typedef void (^DelCommentSuccess)(void); @property (weak, nonatomic) IBOutlet UILabel *nameLabel; @property (weak, nonatomic) IBOutlet UILabel *timeLabel; @property (weak, nonatomic) IBOutlet UILabel *floorLabel; +@property (weak, nonatomic) IBOutlet UILabel *isNewLabel; @property (weak, nonatomic) IBOutlet DTAttributedTextView *contentTextView; @property (strong, nonatomic)NSString* ownerId; +@property (weak, nonatomic) IBOutlet UIImageView *isNewView; @property (strong, nonatomic)CommentWithUid commentWithUid; @property (strong, nonatomic)DelCommentSuccess delCommentSuccess; +@property (assign,nonatomic)BOOL isAllowReport; @property (assign, nonatomic)CommentType commentType; - (IBAction)avatarBtnClick:(id)sender; -(void)setCommentInfoViewModel:(CommentInfoViewModel*)commentInfoViewModel; diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.m b/Ash_AWord/Views/Common/CommentTableViewCell.m index 038c38d..d42d8a6 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.m +++ b/Ash_AWord/Views/Common/CommentTableViewCell.m @@ -25,6 +25,11 @@ _floorLabel.layer.masksToBounds = YES; _floorLabel.layer.cornerRadius = 8.0; + _isNewLabel.layer.masksToBounds = YES; + _isNewLabel.layer.cornerRadius = 5.0; + + _isNewView.hidden = YES; + _isAllowReport = YES; _contentTextView.textDelegate = self; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTap:)]; @@ -67,6 +72,7 @@ }else{ [self setIsAuthor:NO]; } + _isNewView.hidden = !commentInfoViewModel.status; NSString* content = commentInfoViewModel.content; if (![commentInfoViewModel.toUserId isEqualToString:_ownerId]){ content = [CommentTableViewCell getContentWithCommentInfoViewModel:commentInfoViewModel]; @@ -135,21 +141,26 @@ -(void)longPressToDo:(UILongPressGestureRecognizer *)gesture { + if(gesture.state == UIGestureRecognizerStateBegan) { //启动弹出菜单 NSMutableArray *menuItems = [NSMutableArray array]; - UIMenuItem *messageRepItem = [[UIMenuItem alloc] initWithTitle:@"举报" action:@selector(messageRep:)]; - [menuItems addObject:messageRepItem]; + + if (_isAllowReport) { + UIMenuItem *messageRepItem = [[UIMenuItem alloc] initWithTitle:@"举报" action:@selector(messageRep:)]; + [menuItems addObject:messageRepItem]; + if ([_commentInfoViewModel.ownerId isEqualToString:[AWordUser sharedInstance].uid]) { + UIMenuItem *messageDelItem = [[UIMenuItem alloc] initWithTitle:@"删除" action:@selector(messageDel:)]; + [menuItems addObject:messageDelItem]; + } + } UIMenuItem *messageCopyItem = [[UIMenuItem alloc] initWithTitle:@"复制" action:@selector(messageCopy:)]; [menuItems addObject:messageCopyItem]; - if ([_commentInfoViewModel.ownerId isEqualToString:[AWordUser sharedInstance].uid]) { - UIMenuItem *messageDelItem = [[UIMenuItem alloc] initWithTitle:@"删除" action:@selector(messageDel:)]; - [menuItems addObject:messageDelItem]; - } + UIMenuController *menu = [UIMenuController sharedMenuController]; [menu setMenuItems:menuItems]; diff --git a/Ash_AWord/Views/Common/CommentTableViewCell.xib b/Ash_AWord/Views/Common/CommentTableViewCell.xib index 03f5ca0..86d30ac 100644 --- a/Ash_AWord/Views/Common/CommentTableViewCell.xib +++ b/Ash_AWord/Views/Common/CommentTableViewCell.xib @@ -40,6 +40,13 @@ + + + + + + + @@ -58,6 +65,7 @@ + @@ -77,6 +85,7 @@ + @@ -92,6 +101,7 @@ + @@ -99,6 +109,7 @@ + diff --git a/Ash_AWord/Views/Common/MyMessageTableViewCell.h b/Ash_AWord/Views/Common/MyMessageTableViewCell.h index ee8906f..89164c4 100644 --- a/Ash_AWord/Views/Common/MyMessageTableViewCell.h +++ b/Ash_AWord/Views/Common/MyMessageTableViewCell.h @@ -12,4 +12,5 @@ @property (weak, nonatomic) IBOutlet UILabel *unReadCountLabel; -(void)setUnReadCount:(NSInteger)unReadConut; +-(void)setUnReadColor:(UIColor*)color; @end diff --git a/Ash_AWord/Views/Common/MyMessageTableViewCell.m b/Ash_AWord/Views/Common/MyMessageTableViewCell.m index 0d90adc..3b2b352 100644 --- a/Ash_AWord/Views/Common/MyMessageTableViewCell.m +++ b/Ash_AWord/Views/Common/MyMessageTableViewCell.m @@ -14,6 +14,7 @@ // Initialization code _unReadCountLabel.layer.cornerRadius = 10.0; _unReadCountLabel.layer.masksToBounds = YES; + _unReadCountLabel.hidden = YES; } - (void)setSelected:(BOOL)selected animated:(BOOL)animated { @@ -21,6 +22,10 @@ // Configure the view for the selected state } +-(void)setUnReadColor:(UIColor *)color +{ + _unReadCountLabel.backgroundColor = color; +} -(void)setUnReadCount:(NSInteger)unReadConut { if (unReadConut > 0) { diff --git a/Ash_AWord/Views/Common/MyMessageTableViewCell.xib b/Ash_AWord/Views/Common/MyMessageTableViewCell.xib index 61b6972..487612e 100644 --- a/Ash_AWord/Views/Common/MyMessageTableViewCell.xib +++ b/Ash_AWord/Views/Common/MyMessageTableViewCell.xib @@ -16,7 +16,7 @@ -