wushenghua/Ash_AWord
1
0
Fork 0
mirror of https://github.com/wu736139669/Ash_AWord.git synced 2026-08-06 06:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改部分接口

Browse Source
This commit is contained in:
wu736139669
2015-06-12 15:11:07 +08:00
parent d6ee649416
commit ec2d16a5a4
28 changed files with 704 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ash_AWord.xcodeproj/project.pbxproj
-6
View File
@@ -138,7 +138,6 @@
A97C54D11AC8F10F0038818A /* RequireEngine.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54C51AC8F10F0038818A /* RequireEngine.m */; };
A97C54D21AC8F10F0038818A /* AFgzipResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54C81AC8F10F0038818A /* AFgzipResponseSerializer.m */; };
A97C54D31AC8F10F0038818A /* XiaoYuAPIClient.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54CA1AC8F10F0038818A /* XiaoYuAPIClient.m */; };
A97C54D41AC8F10F0038818A /* XMFishBaseCode.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54CC1AC8F10F0038818A /* XMFishBaseCode.m */; };
A97C54DD1AC901980038818A /* MBProgressHUD+Util.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54DC1AC901970038818A /* MBProgressHUD+Util.m */; };
A97C54E11AC91DA10038818A /* CommonUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54E01AC91DA10038818A /* CommonUtil.m */; };
A97C54FE1AC933AD0038818A /* UMSocialLocalizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A97C54E41AC933AD0038818A /* UMSocialLocalizable.strings */; };
@@ -441,8 +440,6 @@
A97C54C81AC8F10F0038818A /* AFgzipResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AFgzipResponseSerializer.m; sourceTree = "<group>"; };
A97C54C91AC8F10F0038818A /* XiaoYuAPIClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XiaoYuAPIClient.h; sourceTree = "<group>"; };
A97C54CA1AC8F10F0038818A /* XiaoYuAPIClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XiaoYuAPIClient.m; sourceTree = "<group>"; };
A97C54CB1AC8F10F0038818A /* XMFishBaseCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMFishBaseCode.h; sourceTree = "<group>"; };
A97C54CC1AC8F10F0038818A /* XMFishBaseCode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMFishBaseCode.m; sourceTree = "<group>"; };
A97C54D61AC8FB6C0038818A /* Common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Common.h; sourceTree = "<group>"; };
A97C54D81AC8FCED0038818A /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
A97C54DB1AC901970038818A /* MBProgressHUD+Util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MBProgressHUD+Util.h"; sourceTree = "<group>"; };
@@ -980,8 +977,6 @@
A97C54C61AC8F10F0038818A /* Serializer */,
A97C54C91AC8F10F0038818A /* XiaoYuAPIClient.h */,
A97C54CA1AC8F10F0038818A /* XiaoYuAPIClient.m */,
A97C54CB1AC8F10F0038818A /* XMFishBaseCode.h */,
A97C54CC1AC8F10F0038818A /* XMFishBaseCode.m */,
);
path = Network;
sourceTree = "<group>";
@@ -1672,7 +1667,6 @@
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 */,
A96862491ACCF0B400DDAA6B /* MWTapDetectingView.m in Sources */,
A99AA12D1ADCCB3C00574B12 /* MessageViewModel.m in Sources */,
Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+227 -195
View File
@@ -898,22 +898,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "450621756.661968"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "127"
endingLineNumber = "127"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -930,38 +914,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "450622369.777392"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "126"
endingLineNumber = "126"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "450622372.272634"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "118"
endingLineNumber = "118"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -969,11 +921,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m"
timestampString = "451817100.154543"
timestampString = "455711777.493401"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "212"
endingLineNumber = "212"
startingLineNumber = "215"
endingLineNumber = "215"
landmarkName = "-playWithIndex:"
landmarkType = "5">
</BreakpointContent>
@@ -1017,11 +969,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450753135.973442"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "100"
endingLineNumber = "100"
startingLineNumber = "101"
endingLineNumber = "101"
landmarkName = "-tick"
landmarkType = "5">
</BreakpointContent>
@@ -1033,12 +985,12 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MessageViewController.m"
timestampString = "451817100.154543"
timestampString = "455711777.493401"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "129"
endingLineNumber = "129"
landmarkName = "-headerRereshing"
startingLineNumber = "132"
endingLineNumber = "132"
landmarkName = "-footerRereshing"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
@@ -1058,22 +1010,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m"
timestampString = "452659532.264373"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
landmarkName = "+requireShareWithRecordId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -1113,11 +1049,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450752747.512157"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "51"
endingLineNumber = "51"
startingLineNumber = "52"
endingLineNumber = "52"
landmarkName = "-playBtnClick:"
landmarkType = "5">
</BreakpointContent>
@@ -1129,11 +1065,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450752843.371363"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "90"
endingLineNumber = "90"
startingLineNumber = "91"
endingLineNumber = "91"
landmarkName = "-tick"
landmarkType = "5">
</BreakpointContent>
@@ -1145,11 +1081,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "246"
endingLineNumber = "246"
startingLineNumber = "247"
endingLineNumber = "247"
landmarkName = "-audioPlayer:stateChanged:"
landmarkType = "5">
</BreakpointContent>
@@ -1161,11 +1097,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "251"
endingLineNumber = "251"
startingLineNumber = "252"
endingLineNumber = "252"
landmarkName = "-audioPlayer:didEncounterError:"
landmarkType = "5">
</BreakpointContent>
@@ -1177,11 +1113,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "256"
endingLineNumber = "256"
startingLineNumber = "257"
endingLineNumber = "257"
landmarkName = "-audioPlayer:didStartPlayingQueueItemId:"
landmarkType = "5">
</BreakpointContent>
@@ -1193,23 +1129,7 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "260"
endingLineNumber = "260"
landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "261"
@@ -1225,11 +1145,27 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "451817100.154543"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "266"
endingLineNumber = "266"
startingLineNumber = "262"
endingLineNumber = "262"
landmarkName = "-audioPlayer:didFinishBufferingSourceWithQueueItemId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "267"
endingLineNumber = "267"
landmarkName = "-audioPlayer:didFinishPlayingQueueItemId:withReason:andProgress:andDuration:"
landmarkType = "5">
</BreakpointContent>
@@ -1241,11 +1177,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Message/MessageTableViewCell.m"
timestampString = "450753266.175428"
timestampString = "455713467.245974"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "101"
endingLineNumber = "101"
startingLineNumber = "102"
endingLineNumber = "102"
landmarkName = "-tick"
landmarkType = "5">
</BreakpointContent>
@@ -1273,11 +1209,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/CommonUtil.m"
timestampString = "451475837.570876"
timestampString = "455765642.372532"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "192"
endingLineNumber = "192"
startingLineNumber = "200"
endingLineNumber = "200"
landmarkName = "+timeFromtimeSp:"
landmarkType = "5">
</BreakpointContent>
@@ -1289,11 +1225,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/CommonUtil.m"
timestampString = "451475842.946622"
timestampString = "455765642.372532"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "194"
endingLineNumber = "194"
startingLineNumber = "202"
endingLineNumber = "202"
landmarkName = "+timeFromtimeSp:"
landmarkType = "5">
</BreakpointContent>
@@ -1305,11 +1241,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Tool/CommonUtil.m"
timestampString = "451476200.990193"
timestampString = "455765642.372532"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "201"
endingLineNumber = "201"
startingLineNumber = "209"
endingLineNumber = "209"
landmarkName = "+timeFromtimeSp:"
landmarkType = "5">
</BreakpointContent>
@@ -1493,7 +1429,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/SetUserInfoViewController.m"
@@ -1513,11 +1449,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/LoginViewModel.m"
timestampString = "451814175.191395"
timestampString = "455780346.034645"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "99"
endingLineNumber = "99"
startingLineNumber = "104"
endingLineNumber = "104"
landmarkName = "+requireModifyInfoWithNickName:withGender:withAvatarImg:"
landmarkType = "5">
</BreakpointContent>
@@ -1529,7 +1465,23 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "451814117.694318"
timestampString = "455772130.614624"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "132"
endingLineNumber = "132"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "455772130.614624"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "117"
@@ -1544,22 +1496,6 @@
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "451814118.602149"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "116"
endingLineNumber = "116"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/Note/NoteTableViewCell.m"
timestampString = "455535412.426096"
startingColumnNumber = "9223372036854775807"
@@ -1570,22 +1506,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/MyViewController.m"
timestampString = "451819852.959293"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "130"
endingLineNumber = "130"
landmarkName = "-tableView:didSelectRowAtIndexPath:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -1650,38 +1570,6 @@
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "453352367.640716"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "123"
endingLineNumber = "123"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Utility/Network/RequireEngine.m"
timestampString = "453352369.120388"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "121"
endingLineNumber = "121"
landmarkName = "+requireWithProperty:completionBlock:failedBlock:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
@@ -2133,7 +2021,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Vender/MWPhotoBrowser/MWPhotoBrowser/Classes/MWTapDetectingImageView.m"
@@ -2149,7 +2037,7 @@
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m"
@@ -2169,14 +2057,158 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/My/UpdateViewModel.m"
timestampString = "455345454.899632"
timestampString = "455774426.514313"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "41"
endingLineNumber = "41"
startingLineNumber = "36"
endingLineNumber = "36"
landmarkName = "+requireUpdate"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Pods/AFNetworking/AFNetworking/AFHTTPRequestOperationManager.m"
timestampString = "455770251.549089"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "175"
endingLineNumber = "175"
landmarkName = "-POST:parameters:success:failure:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewControllers/My/PersonalInfoViewController.m"
timestampString = "455785445.670304"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "95"
endingLineNumber = "95"
landmarkName = "-loadData"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m"
timestampString = "455773044.376916"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "92"
endingLineNumber = "92"
landmarkName = "+requireOhterWithOrder_by:withPage:withPage_size:withOtherId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/ViewModels/Note/NoteViewModel.m"
timestampString = "455774684.961607"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "151"
endingLineNumber = "151"
landmarkName = "+requireDelWithRecordId:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "455781096.07119"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "64"
endingLineNumber = "64"
landmarkName = "-imageBtnClick:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "455781110.142847"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "47"
endingLineNumber = "47"
landmarkName = "-voiceBtnClick:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "455781238.68549"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "24"
endingLineNumber = "24"
landmarkName = "-awakeFromNib"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "455781242.45944"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "44"
endingLineNumber = "44"
landmarkName = "-avatarBtnClick:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Ash_AWord/Views/User/PersonalTopView.m"
timestampString = "455781573.755644"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "80"
endingLineNumber = "80"
landmarkName = "-attentionBtnClick:"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Ash_AWord/Config/Common.h
+2 -1
View File
@@ -61,9 +61,10 @@
* 接口地址
*/
#define Ash_AWord_API_URL @"http://121.43.150.13/QuestionServer"
#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_API_URL @"http://192.168.1.3:8080/QuestionServer"
#define Sign_Key @"yjn@jjyy123"
/**
* 微信开放平台信息
Ash_AWord/Utility/Network/BaseViewModel.h
+5 -1
View File
@@ -8,7 +8,11 @@
#import "MTLModel.h"
#import "MTLJSONAdapter.h"
#import "NSString+HXAddtions.h"
typedef enum {
Order_by_Time = 0,
Order_by_Good = 1,
}Order_by;
@interface BaseViewModel : MTLModel<MTLJSONSerializing>
@property (nonatomic, readonly) NSNumber* errCode;
Ash_AWord/Utility/Network/PropertyEntity.m
+16 -18
View File
@@ -7,8 +7,7 @@
//
#import "PropertyEntity.h"
#import "XMFishBaseCode.h"
#import "NSString+HXAddtions.h"
@implementation proFile
@end
@@ -17,30 +16,29 @@
- (NSDictionary *)encodePro
{
// XMFishBaseCode *bc = [[XMFishBaseCode alloc] init];
//
// [bc setToken:nil];
// [bc setCallback:_url];
// if (_pro)
// {
// [bc setParams:[NSMutableDictionary dictionaryWithDictionary:_pro]];
// }
//
// NSMutableString *key = [[NSMutableString alloc]initWithString:[bc getBaseCode]];
// [key stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
// NSDictionary *dic = @{@"mkey":key};
NSMutableDictionary* dic;
if (_pro) {
dic = [NSMutableDictionary dictionaryWithDictionary:_pro];
if ([_pro objectForKey:@"root"]) {
dic = [NSMutableDictionary dictionaryWithDictionary:[_pro objectForKey:@"root"]];
}else{
dic = [NSMutableDictionary dictionary];
}
if ([AWordUser sharedInstance].isLogin && [AWordUser sharedInstance].uid) {
[dic setObject:[AWordUser sharedInstance].uid forKey:@"uid"];
}
return dic;
NSString* command = [_pro objectForKey:@"command"];
NSString* version = [CommonUtil getVersion];
NSString* root = [NSString jsonStringWithDictionary:dic];
NSString* sign = [NSString stringWithFormat:@"%@%@%@%@", command, root, version, Sign_Key];
sign = [sign md5];
NSDictionary* resultDic = @{@"root":root,
@"version":version,
@"command":command,
@"sign":sign};
return resultDic;
}
@end
Ash_AWord/Utility/Network/RequireEngine.m
+4 -1
View File
@@ -38,7 +38,7 @@
}
+ (AFHTTPRequestOperation *)requireWithProperty:(PropertyEntity *)proper completionBlock:(CompletionBlock)completionBlock failedBlock:(FailedBlock)failedBlock{
proper.reqURL = @"";
NSString *apiKey = proper.url;
if (proper.pro && proper.pro[@"page"])
{
@@ -114,6 +114,7 @@
return [[XiaoYuAPIClient sharedClient] POST:[proper reqURL]
parameters:[proper encodePro]
constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
if (proper.pFile) {
if ([proper.pFile.name isEqualToString:@"img"]) {
for (int i = 0; i < proper.pFile.img.count; i++) {
UIImage *uploadImage = proper.pFile.img[i];
@@ -125,6 +126,8 @@
}else{
NSData* uploadFile = proper.pFile.img[0];
[formData appendPartWithFileData:uploadFile name:@"1" fileName:@"1.wav" mimeType:@"audio/x-wav"];
}
}
}
success:^(AFHTTPRequestOperation * __unused task, id JSON) {
Ash_AWord/Utility/Network/XMFishBaseCode.h
-27
View File
@@ -1,27 +0,0 @@
//
// XMFishBaseCode.h
// FanLiKa
//
// Created by aDu on 14-10-23.
// Copyright (c) 2014年 xmfish. All rights reserved.
//
#import <Foundation/Foundation.h>
@interface XMFishBaseCode : NSObject
@property (nonatomic, strong, readwrite) NSString *token;
@property (nonatomic, strong, readwrite) NSString *callback;
@property (nonatomic, strong, readwrite) NSMutableDictionary *params;
@property (nonatomic, strong, readwrite) NSString *uid;
@property (nonatomic, strong, readwrite) NSString *username;
@property (nonatomic, strong, readwrite) NSString *cityId;
@property (nonatomic, strong, readwrite) NSString *mobile;
- (NSString *)getBaseCode;
+ (NSString *)getWkey;
@end
Ash_AWord/Utility/Network/XMFishBaseCode.m
-156
View File
@@ -1,156 +0,0 @@
//
// XMFishBaseCode.m
// FanLiKa
//
// Created by aDu on 14-10-23.
// Copyright (c) 2014年 xmfish. All rights reserved.
//
#import "XMFishBaseCode.h"
#import "NSString+HXAddtions.h"
#import "SecureUDID.h"
#import <CoreLocation/CoreLocation.h>
@implementation XMFishBaseCode
static char encodingTable[] = "<Aa0Bb1Cc2Dd3Ee4Ff5Gg6Hh7Ii8Jj9KkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz>";
- (id)init
{
self = [super init];
return self;
}
- (void)setParams:(NSMutableDictionary *)Params
{
if (_params != Params)
{
_params = nil;
_params = Params;
}
}
- (NSString *)getBaseCode
{
NSMutableDictionary *data = [[NSMutableDictionary alloc] init];
NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
data[@"timestamp"] = [NSString stringWithFormat:@"%f", timeStamp];
//app版本号
NSString *appVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
if (appVersion)
{
[data setObject:appVersion forKey:@"appversion"];
}
//网络类型
NSString *netWorkType = [NSString stringWithFormat:@"%d", [CommonUtil networkType]];
[data setObject:netWorkType forKey:@"networktype"];
//设备类型
NSString *deviceName = [CommonUtil getUtsName];
if (deviceName)
{
[data setObject:deviceName forKey:@"devicename"];
}
//唯一的设备号，用于服务端识别游客
NSString *domain = @"com.shengshi.ufun";
NSString *key = @"xmfishufunkey";
NSString *udid = [SecureUDID UDIDForDomain:domain usingKey:key];
if (udid)
{
[data setObject:udid forKey:@"udid"];
}
DLog(@"Http param : %@", data);
return [NSString jsonStringWithDictionary:data];
}
- (NSData *)encode:(const uint8_t*) input length:(NSInteger) length
{
NSInteger _dlen =((length + 2)/3 * 4)+1;
NSMutableData* tmpdata = [NSMutableData dataWithLength:_dlen];
uint8_t* tmpchar = (uint8_t*)tmpdata.mutableBytes;
srand((unsigned)time(NULL));
for (NSInteger i = 0; i < length; i += 3)
{
NSInteger value = 0;
for (NSInteger j = i; j < (i + 3); j++)
{
value <<= 8;
if (j < length)
{
value |= (0xFF & input[j]);
}
}
NSInteger index = (i / 3) * 4;
tmpchar[index + 0] = encodingTable[(value >> 18) & 0x3F];
tmpchar[index + 1] = encodingTable[(value >> 12) & 0x3F];
if ((i + 1) < length)
{
tmpchar[index + 2] = encodingTable[(value >> 6) & 0x3F];
}
else
{
tmpchar[index + 2] = 0;
_dlen--;
}
if ((i + 2) < length)
{
tmpchar[index + 3] = encodingTable[(value >> 0) & 0x3F];
}
else
{
tmpchar[index + 3] = 0;
_dlen--;
}
}
int pos=1+ abs((rand()*1234))%60; //字符偏移量
int add=encodingTable[pos];
int step=((add%_dlen)%5)+4;
NSMutableData *_output = [NSMutableData dataWithLength:_dlen];
uint8_t* output = (uint8_t*)_output.mutableBytes;
tmpchar[_dlen-1]=add;
for (int k = 0; k <= _dlen; k+=step)
{
int m=0;
if (k+step+1 > _dlen)
{
while (m < step && tmpchar[k+m] > 0)
{
output[k+m]=tmpchar[k+m];
m++;
}
}
else
{
while (m < step && tmpchar[k+step-m-1] > 0)
{
output[k+m]=tmpchar[k+step-m-1];
m++;
}
}
}
return _output;
}
- (NSString *)encode:(NSString *)string
{
NSData *rayBety=[string dataUsingEncoding:NSUTF8StringEncoding];
NSData *newBety=[self encode:rayBety.bytes length:rayBety.length];
NSString *newString=[[NSString alloc]initWithData:newBety encoding:NSUTF8StringEncoding];
return newString;
}
+ (NSString *)getWkey
{
return [[[XMFishBaseCode alloc] init] getBaseCode];
}
@end
Ash_AWord/Utility/Network/XiaoYuAPIClient.m
+2
View File
@@ -24,6 +24,8 @@
_sharedClient = [[XiaoYuAPIClient alloc] initWithBaseURL:[NSURL URLWithString:[self getApiBaseString]]];
_sharedClient.securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
// _sharedClient.requestSerializer = [AFJSONRequestSerializer serializer];
// _sharedClient.responseSerializer = [AFHTTPResponseSerializer serializer];
[_sharedClient.requestSerializer setValue:@"text/html" forHTTPHeaderField:@"Content-Type"];
_sharedClient.responseSerializer.acceptableContentTypes = [NSSet setWithObject:@"text/html"];
Ash_AWord/Utility/Tool/CommonUtil.h
+2
View File
@@ -21,6 +21,8 @@ NetworkType;
@interface CommonUtil : NSObject
//获取版本号
+(NSString*)getVersion;
//获取系统网络类型
+ (NetworkType)networkType;
Ash_AWord/Utility/Tool/CommonUtil.m
+8
View File
@@ -20,6 +20,14 @@
@implementation CommonUtil
+(NSString*)getVersion
{
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
NSString *version = [NSString stringWithFormat:@"%@.%@",app_Version, buildVersion];
return version;
}
+ (NetworkType)networkType
{
NSArray *subviews = [[[[UIApplication sharedApplication] valueForKey:@"statusBar"] valueForKey:@"foregroundView"]subviews];
Ash_AWord/ViewControllers/My/MyMessageViewController.m
-1
View File
@@ -229,7 +229,6 @@
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
Text_Voice* text_voice = [_text_voiceArr objectAtIndex:indexPath.section];
return [MessageTableViewCell heightWith:text_voice];
// return 140;
}
-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
Ash_AWord/ViewControllers/My/PersonalInfoViewController.h
+1
View File
@@ -15,4 +15,5 @@
@property (weak, nonatomic) IBOutlet UIView *lineView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *lineHeight;
@property (nonatomic, strong)NSString* otherUserId;
@end
Ash_AWord/ViewControllers/My/PersonalInfoViewController.m
+230 -6
View File
@@ -9,13 +9,21 @@
#import "PersonalInfoViewController.h"
#import "CExpandHeader.h"
#import "PersonalTopView.h"
@interface PersonalInfoViewController ()
#import "NoteViewModel.h"
#import "NoteTableViewCell.h"
#import "MessageTableViewCell.h"
#import "MessageViewModel.h"
@interface PersonalInfoViewController ()<NoteTableViewCellDelegate,MessageTableViewCellDelegate>
{
CExpandHeader *_header;
PersonalTopView* _personalTopView;
NSMutableArray* _imageArr;
NSMutableArray* _voiceArr;
BOOL _isSelectImage;
NSInteger _imagePage;
NSInteger _voicePage;
NSInteger _playIndex;
}
@end
@@ -24,10 +32,130 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
[self customViewDidLoad];
_isSelectImage = YES;
_imagePage = 1;
_voicePage = 1;
_playIndex = -1;
[self.tableView removeHeader];
_imageArr = [[NSMutableArray alloc] init];
_voiceArr = [[NSMutableArray alloc] init];
[self loadData];
}
-(void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
_personalTopView = [Ash_UIUtil instanceXibView:@"PersonalTopView"];
[self.tableView setTableHeaderView:_personalTopView];
__weak PersonalInfoViewController *weakself = self;
[_personalTopView setIsSelectImg:^(BOOL isSelectImg){
_isSelectImage = isSelectImg;
if (isSelectImg) {
if (_imageArr.count <= 0) {
[weakself loadData];
}else{
[weakself.tableView reloadData];
}
}else{
if (_voiceArr.count <= 0) {
[weakself loadData];
}else{
[weakself.tableView reloadData];
}
}
}];
self.tableView.tableHeaderView = _personalTopView;
}
#pragma mark MJRefreshDelegate
-(void)headerRereshing
{
if (_isSelectImage) {
_imagePage = 1;
}else{
_voicePage = 1;
}
[self loadData];
}
-(void)footerRereshing
{
[self loadData];
}
-(void)loadData
{
if (_isSelectImage) {
PropertyEntity* pro;
if (!_otherUserId) {
pro = [NoteViewModel requireMyWithOrder_by:Order_by_Time withPage:_imagePage withPage_size:DefaultPageSize];
}else{
pro = [NoteViewModel requireOhterWithOrder_by:Order_by_Time withPage:_imagePage withPage_size:DefaultPageSize withOtherId:_otherUserId];
}
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
NoteViewModel* noteViewModel = (NoteViewModel*)viewModel;
if (_imagePage <= 1) {
[_imageArr removeAllObjects];
}
if (noteViewModel.text_imagesArr) {
[_imageArr addObjectsFromArray:noteViewModel.text_imagesArr];
}
[self footerEndRefreshing];
[self headerEndRefreshing];
if (noteViewModel.text_imagesArr.count<20) {
[self.tableView removeFooter];
}else{
[self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)];
}
_imagePage++;
[self.tableView reloadData];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
[self footerEndRefreshing];
[self headerEndRefreshing];
}];
}else{
PropertyEntity* pro ;
if (_otherUserId) {
pro = [MessageViewModel requireOhterWithOrder_by:Order_by_Time withPage:_voicePage withPage_size:DefaultPageSize withOtherId:_otherUserId];
}else{
pro = [MessageViewModel requireMyWithOrder_by:Order_by_Time withPage:_voicePage withPage_size:DefaultPageSize];
}
[RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
MessageViewModel* noteViewModel = (MessageViewModel*)viewModel;
if (_voicePage <= 1) {
[_voiceArr removeAllObjects];
}
if (noteViewModel.text_voicesArr) {
[_voiceArr addObjectsFromArray:noteViewModel.text_voicesArr];
}
[self footerEndRefreshing];
[self headerEndRefreshing];
if (noteViewModel.text_voicesArr.count<DefaultPageSize) {
[self.tableView removeFooter];
}else{
[self.tableView addGifFooterWithRefreshingTarget:self refreshingAction:@selector(footerRereshing)];
}
_voicePage++;
[self.tableView reloadData];
} failedBlock:^(NSError *error) {
[MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
[self footerEndRefreshing];
[self headerEndRefreshing];
}];
}
}
- (void)viewWillAppear:(BOOL)animated{
@@ -48,6 +176,102 @@
}
}
#pragma mark UITableViewDelegate
-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
if (_isSelectImage) {
return _imageArr.count;
}else{
return _voiceArr.count;
}
}
-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
return 1;
}
-(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
{
return 0.1;
}
-(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
return 10.0;
}
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
if (_isSelectImage) {
Text_Image* text_image = [_imageArr objectAtIndex:indexPath.section];
return [NoteTableViewCell heightWith:text_image];
}else{
Text_Voice* text_voice = [_voiceArr objectAtIndex:indexPath.section];
return [MessageTableViewCell heightWith:text_voice];
}
}
-(UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
NSString* cellIdentifier = @"NoteTableViewCell";
if (_isSelectImage) {
cellIdentifier = @"NoteTableViewCell";
NoteTableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
if (!cell) {
UINib* nib = [UINib nibWithNibName:@"NoteTableViewCell" bundle:nil];
[tableView registerNib:nib forCellReuseIdentifier:cellIdentifier];
cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
}
cell.selectionStyle = UITableViewCellSelectionStyleNone;
Text_Image* text_image = [_imageArr objectAtIndex:indexPath.section];
cell.delegate = self;
cell.tag = indexPath.section;
[cell setText_Image:text_image];
// if (_isShowDel) {
// cell.closeBtn.hidden = NO;
// cell.closeBtn.tag = indexPath.section;
// cell.timeLabel.hidden = YES;
// [cell.closeBtn addTarget:self action:@selector(msgDel:) forControlEvents:UIControlEventTouchUpInside];
// }
return cell;
}else{
cellIdentifier = [NSString stringWithFormat:@"MessageTableViewCell%ld",indexPath.section];
MessageTableViewCell* cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
if (!cell) {
UINib* nib = [UINib nibWithNibName:@"MessageTableViewCell" bundle:nil];
[tableView registerNib:nib forCellReuseIdentifier:cellIdentifier];
cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifier];
}
cell.selectionStyle = UITableViewCellSelectionStyleNone;
Text_Voice* text_voice = [_voiceArr objectAtIndex:indexPath.section];
[cell setText_Voice:text_voice];
cell.tag = indexPath.section;
cell.delegate = self;
// if (_isShowDel) {
// cell.closeBtn.hidden = NO;
// cell.closeBtn.tag = indexPath.section;
// cell.timeLabel.hidden = YES;
// [cell.closeBtn addTarget:self action:@selector(msgDel:) forControlEvents:UIControlEventTouchUpInside];
// }
return cell;
}
return nil;
}
-(void)playWithIndex:(NSInteger)index
{
if (index != _playIndex) {
if (_playIndex == -1) {
}else{
MessageTableViewCell* cell = (MessageTableViewCell*)[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:_playIndex]];
[cell stopPlay];
}
}
_playIndex = index;
}
#pragma mark NoteCellDelegate
-(void)reportWithIndex:(NSInteger)index
{
// _reportIndex = index;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
Ash_AWord/ViewModels/LoginViewModel.m
+34 -30
View File
@@ -30,14 +30,16 @@
+(PropertyEntity*)requireLoginWithOpenId:(NSString *)openId withName:(NSString *)name withGender:(NSString *)gender withFigureUrl:(NSString *)figureUrl
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/login";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"openid": openId,
NSDictionary* dic = @{@"openid": openId,
@"name": name,
@"gender": gender,
@"figureurl": figureUrl
};
pro.pro = @{@"root": dic,
@"command": @"10002",
};
return pro;
}
@@ -45,46 +47,50 @@
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.reqURL = @"rs/common/register";
pro.responesOBJ = self.class;
proFile *file = [[proFile alloc] init];
file.name = @"img";
file.img = [NSArray arrayWithObject:avatarImg];
pro.pFile = file;
pro.pro = @{@"username": userName,
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
NSDictionary* dic = @{@"username": userName,
@"password": password,
@"gender": gender,
@"name": nickName
};
pro.pro = @{@"root": dic,
@"command": @"10003",
};
return pro;
}
+(PropertyEntity*)requireLoginWithUserName:(NSString *)userName withPassWord:(NSString *)passWord
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/login_local";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"username": userName,
NSDictionary* dic = @{@"username": userName,
@"password": passWord,
};
pro.pro = @{@"root": dic,
@"command": @"10004",
};
return pro;
}
+(PropertyEntity*)requireModifyPassWord:(NSString *)newPassword withOldPaaaWord:(NSString *)oldPassWord
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/edit_password";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"old_password": oldPassWord,
@"new_password": newPassword,
NSDictionary* dic = @{@"oldPassword": oldPassWord,
@"newPassword": newPassword,
};
pro.pro = @{@"root": dic,
@"command": @"10005",
};
return pro;
}
@@ -92,7 +98,6 @@
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.reqURL = @"rs/common/edit_userinfo";
pro.responesOBJ = self.class;
proFile *file = [[proFile alloc] init];
file.name = @"img";
@@ -101,39 +106,38 @@
}
pro.pFile = file;
pro.pro = @{
@"gender": gender,
NSDictionary* dic = @{@"gender": gender,
@"name": nickName
};
pro.pro = @{@"root": dic,
@"command": @"10006",};
return pro;
}
+(PropertyEntity*)requireReportWith:(Msg_Type)type withMsgId:(NSInteger)msgId withContent:(NSString *)content
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/tip_off";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
NSDictionary* dic = @{
@"type": [NSString stringWithFormat:@"%u",type],
@"record_id": [NSString stringWithFormat:@"%ld",(long)msgId],
@"recordId": [NSString stringWithFormat:@"%ld",(long)msgId],
@"content": content,
};
pro.pro = @{@"root": dic,
@"command": @"10007",};
return pro;
}
+(PropertyEntity*)requireFeedbackWithContent:(NSString *)content
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/feedback";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
NSDictionary* dic = @{
@"content": content,
};
pro.pro = @{@"root": dic,
@"command": @"10008",};
return pro;
}
@end
Ash_AWord/ViewModels/Message/MessagePublihViewModel.m
+4 -3
View File
@@ -18,12 +18,13 @@
file.name = @"wav";
file.img = [NSArray arrayWithObject:fileData];;
pro.pFile = file;
pro.reqURL = @"rs/text_voice/add";
pro.responesOBJ = self.class;
// content = [content stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
pro.pro = @{@"content": content,
NSDictionary* dic = @{@"content": content,
@"voiceLength":[NSNumber numberWithInteger:time],
};
pro.pro = @{@"root": dic,
@"command": @"30001",
};
return pro;
}
Ash_AWord/ViewModels/Message/MessageViewModel.h
-4
View File
@@ -7,10 +7,6 @@
//
#import "BaseViewModel.h"
typedef enum {
Order_by_Time = 0,
Order_by_Good = 1,
}Order_by;
@interface Text_Voice : MTLModel<MTLJSONSerializing>
@property (nonatomic, strong)NSString* content;
Ash_AWord/ViewModels/Message/MessageViewModel.m
+39 -26
View File
@@ -60,12 +60,15 @@
+(PropertyEntity*)requireWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/load_public";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",page],
@"page_size": [NSString stringWithFormat:@"%ld",page_size],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",(long)page],
@"pageSize": [NSString stringWithFormat:@"%ld",(long)page_size],
};
pro.pro = @{@"root": dic,
@"command": @"30004",
};
return pro;
@@ -74,13 +77,15 @@
+(PropertyEntity*)requireOhterWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size withOtherId:(NSString *)otherid
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/load_others";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",page],
@"page_size": [NSString stringWithFormat:@"%ld",page_size],
@"target_uid": otherid
@"pageSize": [NSString stringWithFormat:@"%ld",page_size],
@"targetUid": otherid
};
pro.pro = @{@"root": dic,
@"command": @"30003",
};
return pro;
@@ -88,12 +93,14 @@
+(PropertyEntity*)requireMyWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/load_my";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",page],
@"page_size": [NSString stringWithFormat:@"%ld",page_size],
@"pageSize": [NSString stringWithFormat:@"%ld",page_size],
};
pro.pro = @{@"root": dic,
@"command": @"30002",
};
return pro;
@@ -101,39 +108,45 @@
+(PropertyEntity*)requirePraiseWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/praise";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"30005",
};
return pro;
}
+(PropertyEntity*)requireShareWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/share";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"30007",
};
return pro;
}
+(PropertyEntity*)requireDelWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_voice/del";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"30006",
};
return pro;
}
Ash_AWord/ViewModels/My/UpdateViewModel.m
+6 -8
View File
@@ -29,18 +29,16 @@
+(PropertyEntity*)requireUpdate
{
NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
NSString *app_Version = [infoDictionary objectForKey:@"CFBundleShortVersionString"];
NSString *buildVersion = [infoDictionary objectForKey:@"CFBundleVersion"];
NSString *version = [NSString stringWithFormat:@"%@.%@",app_Version, buildVersion];
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithPOST;
pro.reqURL = @"rs/common/get_version";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"version": version,
};
NSDictionary* dic = @{@"version": [CommonUtil getVersion],
};
pro.pro = @{@"root": dic,
@"command": @"10001",
};
return pro;
}
@end
Ash_AWord/ViewModels/Note/NoteCommentViewModel.m
+6 -4
View File
@@ -66,13 +66,15 @@
+(PropertyEntity*)requireAddwithRecordId:(NSString *)recordId withContent:(NSString *)content
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/add_comment";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"record_id": recordId,
NSDictionary* dic = @{@"recordId": recordId,
@"content": content,
};
pro.pro = @{@"root": dic,
@"command": @"10201",
};
return pro;
}
@end
Ash_AWord/ViewModels/Note/NotePublishViewModel.m
+4 -3
View File
@@ -19,10 +19,11 @@
file.name = @"img";
file.img = [NSArray arrayWithObject:image];
pro.pFile = file;
pro.reqURL = @"rs/text_image/add";
pro.responesOBJ = self.class;
// content = [content stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
pro.pro = @{@"content": content,
NSDictionary* dic = @{@"content": content,
};
pro.pro = @{@"root": dic,
@"command": @"20001",
};
return pro;
}
Ash_AWord/ViewModels/Note/NoteViewModel.h
+1 -4
View File
@@ -7,10 +7,7 @@
//
#import "BaseViewModel.h"
typedef enum {
Order_by_Time = 0,
Order_by_Good = 1,
}Order_by;
@interface Text_Image : MTLModel<MTLJSONSerializing>
@property (nonatomic, strong)NSString* content;
Ash_AWord/ViewModels/Note/NoteViewModel.m
+41 -29
View File
@@ -61,80 +61,92 @@
+(PropertyEntity*)requireWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/load_public";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",(long)page],
@"page_size": [NSString stringWithFormat:@"%ld",(long)page_size],
@"pageSize": [NSString stringWithFormat:@"%ld",(long)page_size],
};
pro.pro = @{@"root": dic,
@"command": @"20004",
};
return pro;
}
+(PropertyEntity*)requireOhterWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size withOtherId:(NSString *)otherid
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/load_others";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",page],
@"page_size": [NSString stringWithFormat:@"%ld",page_size],
@"target_uid": otherid
@"pageSize": [NSString stringWithFormat:@"%ld",page_size],
@"targetUid": otherid
};
pro.pro = @{@"root": dic,
@"command": @"20003",
};
return pro;
}
+(PropertyEntity*)requireMyWithOrder_by:(Order_by)order_by withPage:(NSInteger)page withPage_size:(NSInteger)page_size
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/load_my";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{@"order_by": [NSString stringWithFormat:@"%u",order_by],
NSDictionary* dic = @{@"orderBy": [NSString stringWithFormat:@"%u",order_by],
@"page": [NSString stringWithFormat:@"%ld",page],
@"page_size": [NSString stringWithFormat:@"%ld",page_size],
@"pageSize": [NSString stringWithFormat:@"%ld",page_size],
};
pro.pro = @{@"root": dic,
@"command": @"20002",
};
return pro;
}
+(PropertyEntity*)requirePraiseWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/praise";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"20005",
};
return pro;
}
+(PropertyEntity*)requireShareWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/share";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"20007",
};
return pro;
}
+(PropertyEntity*)requireDelWithRecordId:(NSInteger)recordId
{
PropertyEntity *pro = [[PropertyEntity alloc] init];
pro.requireType = HTTPRequestTypeWithGET;
pro.reqURL = @"rs/text_image/del";
pro.requireType = HTTPRequestTypeWithPOSTDATA;
pro.responesOBJ = self.class;
pro.pro = @{
@"record_id": [NSString stringWithFormat:@"%ld",recordId],
NSDictionary* dic = @{
@"recordId": [NSString stringWithFormat:@"%ld",recordId],
};
pro.pro = @{@"root": dic,
@"command": @"20006",
};
return pro;
}
Ash_AWord/Views/Message/MessageTableViewCell.m
+5 -6
View File
@@ -12,6 +12,7 @@
#import "AudioPlayer.h"
#import "AppDelegate.h"
#import "MyMessageViewController.h"
#import "PersonalInfoViewController.h"
@interface MessageTableViewCell()<AudioPlayerDelegate>
@end
@implementation MessageTableViewCell
@@ -267,12 +268,10 @@
}
- (IBAction)avatarBtnClick:(id)sender {
if (![_text_voice.ownerId isEqualToString:[AWordUser sharedInstance].uid] ) {
MyMessageViewController* myNoteViewController = [[MyMessageViewController alloc] init];
myNoteViewController.otherUserId = _text_voice.ownerId;
myNoteViewController.otherName = _text_voice.ownerName;
myNoteViewController.hidesBottomBarWhenPushed = YES;
[[AppDelegate visibleViewController].navigationController pushViewController:myNoteViewController animated:YES];
if (![_text_voice.ownerId isEqualToString:[AWordUser sharedInstance].uid] ) { PersonalInfoViewController* personalInfoViewController = [[PersonalInfoViewController alloc] init];
personalInfoViewController.hidesBottomBarWhenPushed = YES;
personalInfoViewController.otherUserId = _text_voice.ownerId;
[[AppDelegate visibleViewController].navigationController pushViewController:personalInfoViewController animated:YES];
}
}
- (IBAction)closeBtnClick:(id)sender {
Ash_AWord/Views/Note/NoteTableViewCell.m
+3 -8
View File
@@ -201,16 +201,11 @@
}
- (IBAction)avatarBtnClick:(id)sender {
PersonalInfoViewController* personalInfoViewController = [[PersonalInfoViewController alloc] init];
if (![_text_image.ownerId isEqualToString:[AWordUser sharedInstance].uid] ) { PersonalInfoViewController* personalInfoViewController = [[PersonalInfoViewController alloc] init];
personalInfoViewController.hidesBottomBarWhenPushed = YES;
personalInfoViewController.otherUserId = _text_image.ownerId;
[[AppDelegate visibleViewController].navigationController pushViewController:personalInfoViewController animated:YES];
return;
if (![_text_image.ownerId isEqualToString:[AWordUser sharedInstance].uid] ) {
MyNoteViewController* myNoteViewController = [[MyNoteViewController alloc] init];
myNoteViewController.otherUserId = _text_image.ownerId;
myNoteViewController.otherName = _text_image.ownerName;
myNoteViewController.hidesBottomBarWhenPushed = YES;
[[AppDelegate visibleViewController].navigationController pushViewController:myNoteViewController animated:YES];
}
}
Ash_AWord/Views/User/PersonalTopView.h
+2
View File
@@ -7,8 +7,10 @@
//
#import <UIKit/UIKit.h>
typedef void (^IsSelectImage)(BOOL);
@interface PersonalTopView : UIView
@property (strong, nonatomic)IsSelectImage isSelectImg;
@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
@property (weak, nonatomic) IBOutlet UIButton *avatarBtn;
- (IBAction)avatarBtnClick:(id)sender;
Ash_AWord/Views/User/PersonalTopView.m
+6
View File
@@ -56,6 +56,9 @@
[UIView animateWithDuration:0.3 animations:^{
_selectView.frame = frame;
}];
if (_isSelectImg) {
_isSelectImg(NO);
}
}
- (IBAction)imageBtnClick:(id)sender {
if (_isSelectImage == YES) {
@@ -70,6 +73,9 @@
[UIView animateWithDuration:0.3 animations:^{
_selectView.frame = frame;
}];
if (_isSelectImg) {
_isSelectImg(YES);
}
}
- (IBAction)attentionBtnClick:(id)sender {
}
Ash_AWord/Views/User/PersonalTopView.xib
+13 -4
View File
@@ -7,12 +7,12 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="PersonalTopView">
<rect key="frame" x="0.0" y="1" width="320" height="239"/>
<view clipsSubviews="YES" contentMode="scaleToFill" id="iN0-l3-epB" customClass="PersonalTopView">
<rect key="frame" x="0.0" y="0.0" width="320" height="286"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WX9-rs-4F1">
<rect key="frame" x="0.0" y="99" width="320" height="140"/>
<rect key="frame" x="0.0" y="146" width="320" height="140"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VjD-oC-vGz">
<rect key="frame" x="0.0" y="39" width="320" height="101"/>
@@ -188,6 +188,8 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="WX9-rs-4F1" secondAttribute="bottom" id="EHp-jo-kyp"/>
<constraint firstItem="WX9-rs-4F1" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="109" id="fdX-7l-8fh"/>
<constraint firstAttribute="bottom" secondItem="WX9-rs-4F1" secondAttribute="bottom" id="gtr-tG-96M"/>
<constraint firstItem="WX9-rs-4F1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="nQ3-aZ-41G"/>
<constraint firstAttribute="trailing" secondItem="WX9-rs-4F1" secondAttribute="trailing" id="zvw-PO-jv1"/>
@@ -195,7 +197,14 @@
<nil key="simulatedStatusBarMetrics"/>
<nil key="simulatedTopBarMetrics"/>
<nil key="simulatedBottomBarMetrics"/>
<simulatedOrientationMetrics key="simulatedOrientationMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<variation key="default">
<mask key="constraints">
<exclude reference="fdX-7l-8fh"/>
<exclude reference="gtr-tG-96M"/>
</mask>
</variation>
<connections>
<outlet property="attentionBtn" destination="bTo-Vv-aD5" id="Uex-bh-vYt"/>
<outlet property="attentionCountLabel" destination="aTY-fs-6Kn" id="EWv-uA-ptu"/>
@@ -213,7 +222,7 @@
<outlet property="signatureLabel" destination="QPy-Oj-huM" id="zN4-UV-Ef3"/>
<outlet property="voiceBtn" destination="e93-W1-QCy" id="vYg-jZ-5qD"/>
</connections>
<point key="canvasLocation" x="203" y="217.5"/>
<point key="canvasLocation" x="203" y="231"/>
</view>
</objects>
<resources>