diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index 61baa2f..b3c5412 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -28,6 +28,9 @@ A93442001ACA919F00A6B233 /* tabbarVoiceClick@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A93441FD1ACA919F00A6B233 /* tabbarVoiceClick@2x.png */; }; A93442031ACA981D00A6B233 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A93442011ACA981D00A6B233 /* Default-568h@2x.png */; }; A93442041ACA981D00A6B233 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A93442021ACA981D00A6B233 /* Default@2x.png */; }; + A94D0EDD1AD5757A0002DEB1 /* UpdateViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A94D0EDC1AD5757A0002DEB1 /* UpdateViewModel.m */; }; + A94DF6351AD4D94E00DCDCB0 /* MyNoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A94DF6331AD4D94E00DCDCB0 /* MyNoteViewController.m */; }; + A94DF6361AD4D94E00DCDCB0 /* MyNoteViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A94DF6341AD4D94E00DCDCB0 /* MyNoteViewController.xib */; }; A95510921AC39E6A0006D16F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510911AC39E6A0006D16F /* main.m */; }; A95510951AC39E6A0006D16F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510941AC39E6A0006D16F /* AppDelegate.m */; }; A95510981AC39E6A0006D16F /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A95510971AC39E6A0006D16F /* ViewController.m */; }; @@ -85,6 +88,8 @@ A97559CF1ACBF0BC004ADA42 /* btn_good@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97559C91ACBF0BC004ADA42 /* btn_good@2x.png */; }; A97559D01ACBF0BC004ADA42 /* btn_share_clicked@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97559CA1ACBF0BC004ADA42 /* btn_share_clicked@2x.png */; }; A97559D11ACBF0BC004ADA42 /* btn_share@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97559CB1ACBF0BC004ADA42 /* btn_share@2x.png */; }; + A97883881AD369DF00D46477 /* mainCellDingClick@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97883871AD369DF00D46477 /* mainCellDingClick@2x.png */; }; + A978838A1AD36A0500D46477 /* mainCellDing@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97883891AD36A0500D46477 /* mainCellDing@2x.png */; }; A97C54CD1AC8F10F0038818A /* BaseViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54BD1AC8F10F0038818A /* BaseViewModel.m */; }; A97C54CF1AC8F10F0038818A /* NSString+HXAddtions.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54C11AC8F10F0038818A /* NSString+HXAddtions.m */; }; A97C54D01AC8F10F0038818A /* PropertyEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = A97C54C31AC8F10F0038818A /* PropertyEntity.m */; }; @@ -119,6 +124,8 @@ A97DBE481ACAE7F600705682 /* smalliconWeixin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE471ACAE7F600705682 /* smalliconWeixin@2x.png */; }; A97DBE4C1ACAEBE300705682 /* first-login-sina@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE4B1ACAEBE300705682 /* first-login-sina@2x.png */; }; A97DBE4E1ACAED4900705682 /* camera-close-select@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A97DBE4D1ACAED4900705682 /* camera-close-select@2x.png */; }; + A98D659D1AD37F18008668EE /* MessageTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A98D659B1AD37F18008668EE /* MessageTableViewCell.m */; }; + A98D659E1AD37F18008668EE /* MessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98D659C1AD37F18008668EE /* MessageTableViewCell.xib */; }; A98F98521ACA29B5007C4594 /* libSocialQQ.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A98F98481ACA29B5007C4594 /* libSocialQQ.a */; }; A98F98531ACA29B5007C4594 /* TencentOpenAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A98F98491ACA29B5007C4594 /* TencentOpenAPI.framework */; }; A98F98541ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A98F984A1ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle */; }; @@ -135,6 +142,7 @@ A98F986B1ACA2FA9007C4594 /* BaseRefreshViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A98F98691ACA2FA9007C4594 /* BaseRefreshViewController.m */; }; A98F986C1ACA2FA9007C4594 /* BaseRefreshViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A98F986A1ACA2FA9007C4594 /* BaseRefreshViewController.xib */; }; A9B4E39F1AC9908E00A1DBDF /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9B4E39C1AC9908E00A1DBDF /* libMobClickLibrary.a */; }; + A9BE23BF1ACD8CA20032171A /* libSocialSina.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BE23BD1ACD8CA20032171A /* libSocialSina.a */; }; A9FAD4221AC922A5007ADC10 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD4201AC922A5007ADC10 /* MainViewController.m */; }; A9FAD4231AC922A5007ADC10 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9FAD4211AC922A5007ADC10 /* MainViewController.xib */; }; A9FAD4271AC922BE007ADC10 /* NoteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD4251AC922BE007ADC10 /* NoteViewController.m */; }; @@ -169,6 +177,11 @@ A93441FD1ACA919F00A6B233 /* tabbarVoiceClick@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tabbarVoiceClick@2x.png"; sourceTree = ""; }; A93442011ACA981D00A6B233 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; A93442021ACA981D00A6B233 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + A94D0EDB1AD5757A0002DEB1 /* UpdateViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateViewModel.h; sourceTree = ""; }; + A94D0EDC1AD5757A0002DEB1 /* UpdateViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UpdateViewModel.m; sourceTree = ""; }; + A94DF6321AD4D94E00DCDCB0 /* MyNoteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyNoteViewController.h; sourceTree = ""; }; + A94DF6331AD4D94E00DCDCB0 /* MyNoteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyNoteViewController.m; sourceTree = ""; }; + A94DF6341AD4D94E00DCDCB0 /* MyNoteViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyNoteViewController.xib; sourceTree = ""; }; A955108C1AC39E6A0006D16F /* Ash_AWord.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ash_AWord.app; sourceTree = BUILT_PRODUCTS_DIR; }; A95510901AC39E6A0006D16F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A95510911AC39E6A0006D16F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -267,6 +280,8 @@ A97559C91ACBF0BC004ADA42 /* btn_good@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_good@2x.png"; sourceTree = ""; }; A97559CA1ACBF0BC004ADA42 /* btn_share_clicked@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_share_clicked@2x.png"; sourceTree = ""; }; A97559CB1ACBF0BC004ADA42 /* btn_share@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "btn_share@2x.png"; sourceTree = ""; }; + A97883871AD369DF00D46477 /* mainCellDingClick@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mainCellDingClick@2x.png"; sourceTree = ""; }; + A97883891AD36A0500D46477 /* mainCellDing@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mainCellDing@2x.png"; sourceTree = ""; }; A97C54BC1AC8F10F0038818A /* BaseViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewModel.h; sourceTree = ""; }; A97C54BD1AC8F10F0038818A /* BaseViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewModel.m; sourceTree = ""; }; A97C54C01AC8F10F0038818A /* NSString+HXAddtions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+HXAddtions.h"; sourceTree = ""; }; @@ -325,6 +340,9 @@ A97DBE471ACAE7F600705682 /* smalliconWeixin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "smalliconWeixin@2x.png"; sourceTree = ""; }; A97DBE4B1ACAEBE300705682 /* first-login-sina@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "first-login-sina@2x.png"; sourceTree = ""; }; A97DBE4D1ACAED4900705682 /* camera-close-select@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "camera-close-select@2x.png"; sourceTree = ""; }; + A98D659A1AD37F18008668EE /* MessageTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageTableViewCell.h; sourceTree = ""; }; + A98D659B1AD37F18008668EE /* MessageTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageTableViewCell.m; sourceTree = ""; }; + A98D659C1AD37F18008668EE /* MessageTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageTableViewCell.xib; sourceTree = ""; }; A98F98481ACA29B5007C4594 /* libSocialQQ.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialQQ.a; sourceTree = ""; }; A98F98491ACA29B5007C4594 /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = ""; }; A98F984A1ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TencentOpenApi_IOS_Bundle.bundle; sourceTree = ""; }; @@ -348,6 +366,8 @@ A9B4E39C1AC9908E00A1DBDF /* libMobClickLibrary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libMobClickLibrary.a; sourceTree = ""; }; A9B4E39D1AC9908E00A1DBDF /* MobClick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClick.h; sourceTree = ""; }; A9B4E39E1AC9908E00A1DBDF /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = ""; }; + A9BE23BD1ACD8CA20032171A /* libSocialSina.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialSina.a; sourceTree = ""; }; + A9BE23BE1ACD8CA20032171A /* UMSocialSinaHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSocialSinaHandler.h; sourceTree = ""; }; A9FAD41F1AC922A5007ADC10 /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainViewController.h; sourceTree = ""; }; A9FAD4201AC922A5007ADC10 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = ""; }; A9FAD4211AC922A5007ADC10 /* MainViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainViewController.xib; sourceTree = ""; }; @@ -382,6 +402,7 @@ A98F98561ACA29B5007C4594 /* libWeChatSDK.a in Frameworks */, A98F98531ACA29B5007C4594 /* TencentOpenAPI.framework in Frameworks */, A98F98521ACA29B5007C4594 /* libSocialQQ.a in Frameworks */, + A9BE23BF1ACD8CA20032171A /* libSocialSina.a in Frameworks */, 018BA697D81ADF73A75A2345 /* libPods.a in Frameworks */, A9B4E39F1AC9908E00A1DBDF /* libMobClickLibrary.a in Frameworks */, A98F98551ACA29B5007C4594 /* libSocialWechat.a in Frameworks */, @@ -392,6 +413,15 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + A94D0EDA1AD5753A0002DEB1 /* My */ = { + isa = PBXGroup; + children = ( + A94D0EDB1AD5757A0002DEB1 /* UpdateViewModel.h */, + A94D0EDC1AD5757A0002DEB1 /* UpdateViewModel.m */, + ); + path = My; + sourceTree = ""; + }; A95510831AC39E6A0006D16F = { isa = PBXGroup; children = ( @@ -466,6 +496,9 @@ A9617A511ACC27860024AE4A /* SetUpViewController.h */, A9617A521ACC27860024AE4A /* SetUpViewController.m */, A9617A531ACC27860024AE4A /* SetUpViewController.xib */, + A94DF6321AD4D94E00DCDCB0 /* MyNoteViewController.h */, + A94DF6331AD4D94E00DCDCB0 /* MyNoteViewController.m */, + A94DF6341AD4D94E00DCDCB0 /* MyNoteViewController.xib */, ); path = My; sourceTree = ""; @@ -602,6 +635,7 @@ A97C54B71AC8F0370038818A /* ViewControllers */ = { isa = PBXGroup; children = ( + A98D65971AD37BDF008668EE /* Message */, A9617A501ACC274C0024AE4A /* My */, A97559AE1ACBC615004ADA42 /* Note */, A97DBE2F1ACAE0F100705682 /* Login */, @@ -614,6 +648,8 @@ A97C54B81AC8F0370038818A /* ViewModels */ = { isa = PBXGroup; children = ( + A94D0EDA1AD5753A0002DEB1 /* My */, + A98D65981AD37D99008668EE /* Message */, A97559BC1ACBE6B7004ADA42 /* Note */, A9FAD4331AC925AC007ADC10 /* LoginViewModel.h */, A9FAD4341AC925AC007ADC10 /* LoginViewModel.m */, @@ -624,6 +660,7 @@ A97C54B91AC8F0370038818A /* Views */ = { isa = PBXGroup; children = ( + A98D65991AD37EFD008668EE /* Message */, A97559C01ACBEE71004ADA42 /* Note */, ); path = Views; @@ -717,6 +754,8 @@ A97C54E21AC91FD70038818A /* Resource */ = { isa = PBXGroup; children = ( + A97883891AD36A0500D46477 /* mainCellDing@2x.png */, + A97883871AD369DF00D46477 /* mainCellDingClick@2x.png */, A968627D1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png */, A968627B1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png */, A9617A561ACC2EBC0024AE4A /* mine-setting-icon-click@2x.png */, @@ -822,9 +861,34 @@ path = Login; sourceTree = ""; }; + A98D65971AD37BDF008668EE /* Message */ = { + isa = PBXGroup; + children = ( + ); + path = Message; + sourceTree = ""; + }; + A98D65981AD37D99008668EE /* Message */ = { + isa = PBXGroup; + children = ( + ); + path = Message; + sourceTree = ""; + }; + A98D65991AD37EFD008668EE /* Message */ = { + isa = PBXGroup; + children = ( + A98D659A1AD37F18008668EE /* MessageTableViewCell.h */, + A98D659B1AD37F18008668EE /* MessageTableViewCell.m */, + A98D659C1AD37F18008668EE /* MessageTableViewCell.xib */, + ); + path = Message; + sourceTree = ""; + }; A98F98461ACA29B5007C4594 /* UMSocial_Sdk_Extra_Frameworks */ = { isa = PBXGroup; children = ( + A9BE23BC1ACD8CA20032171A /* Sina */, A98F98471ACA29B5007C4594 /* TencentOpenAPI */, A98F984C1ACA29B5007C4594 /* Wechat */, ); @@ -874,6 +938,15 @@ path = UMAnalytics_Sdk_3.4.6; sourceTree = ""; }; + A9BE23BC1ACD8CA20032171A /* Sina */ = { + isa = PBXGroup; + children = ( + A9BE23BD1ACD8CA20032171A /* libSocialSina.a */, + A9BE23BE1ACD8CA20032171A /* UMSocialSinaHandler.h */, + ); + path = Sina; + sourceTree = ""; + }; A9FAD41E1AC92293007ADC10 /* Main */ = { isa = PBXGroup; children = ( @@ -991,6 +1064,7 @@ A955109B1AC39E6A0006D16F /* Main.storyboard in Resources */, A97559A51ACB9748004ADA42 /* setup-head-default@2x.png in Resources */, A97DBE3F1ACAE29E00705682 /* Icon.png in Resources */, + A94DF6361AD4D94E00DCDCB0 /* MyNoteViewController.xib in Resources */, A97DBE3D1ACAE29E00705682 /* Icon-Small.png in Resources */, A93441ED1ACA8C8F00A6B233 /* defaultUserIcon.png in Resources */, A97559CF1ACBF0BC004ADA42 /* btn_good@2x.png in Resources */, @@ -1003,6 +1077,7 @@ A97C54FE1AC933AD0038818A /* UMSocialLocalizable.strings in Resources */, A93441E91ACA8AD200A6B233 /* Profile_filter_ImageIcon@2x.png in Resources */, A97C55041AC933AD0038818A /* UMShareEditViewControlleriPad.xib in Resources */, + A978838A1AD36A0500D46477 /* mainCellDing@2x.png in Resources */, A98F98541ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */, A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */, @@ -1020,6 +1095,7 @@ A97559C51ACBEE99004ADA42 /* NoteTableViewCell.xib in Resources */, A9617A551ACC27860024AE4A /* SetUpViewController.xib in Resources */, A97559D11ACBF0BC004ADA42 /* btn_share@2x.png in Resources */, + A98D659E1AD37F18008668EE /* MessageTableViewCell.xib in Resources */, A93441E11ACA89AA00A6B233 /* Profile_filter_voiceIcon@2x.png in Resources */, A97C55031AC933AD0038818A /* UMShareEditViewController.xib in Resources */, A97DBE4E1ACAED4900705682 /* camera-close-select@2x.png in Resources */, @@ -1028,6 +1104,7 @@ A97559A81ACB9DE4004ADA42 /* navigationButtonPublish@2x.png in Resources */, A97559CE1ACBF0BC004ADA42 /* btn_good_clicked@2x.png in Resources */, A97DBE3C1ACAE29E00705682 /* Icon-Small-50@2x.png in Resources */, + A97883881AD369DF00D46477 /* mainCellDingClick@2x.png in Resources */, A97C55061AC933AD0038818A /* UMSnsAccountViewController.xib in Resources */, A97559CD1ACBF0BC004ADA42 /* btn_bad@2x.png in Resources */, A93441F71ACA918100A6B233 /* tabbarSetup@2x.png in Resources */, @@ -1125,9 +1202,11 @@ A97C54CF1AC8F10F0038818A /* NSString+HXAddtions.m in Sources */, A96862501ACCF12300DDAA6B /* DACircularProgressView.m in Sources */, A95510951AC39E6A0006D16F /* AppDelegate.m in Sources */, + A94D0EDD1AD5757A0002DEB1 /* UpdateViewModel.m in Sources */, A97C54D11AC8F10F0038818A /* RequireEngine.m in Sources */, A96862731ACCF13300DDAA6B /* PSTCollectionViewFlowLayout.m in Sources */, A96862441ACCF0B400DDAA6B /* MWGridCell.m in Sources */, + A94DF6351AD4D94E00DCDCB0 /* MyNoteViewController.m in Sources */, A96862741ACCF13300DDAA6B /* PSTCollectionViewItemKey.m in Sources */, A96862451ACCF0B400DDAA6B /* MWGridViewController.m in Sources */, A97C54D01AC8F10F0038818A /* PropertyEntity.m in Sources */, @@ -1141,6 +1220,7 @@ A968626F1ACCF13300DDAA6B /* PSTCollectionView.m in Sources */, A9FAD4351AC925AC007ADC10 /* LoginViewModel.m in Sources */, A95510921AC39E6A0006D16F /* main.m in Sources */, + A98D659D1AD37F18008668EE /* MessageTableViewCell.m in Sources */, A96862711ACCF13300DDAA6B /* PSTCollectionViewController.m in Sources */, A96862431ACCF0B400DDAA6B /* MWCaptionView.m in Sources */, ); @@ -1272,6 +1352,7 @@ "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI", "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Wechat", "$(PROJECT_DIR)/Ash_AWord/Vender/UMAnalytics_Sdk_3.4.6", + "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", ); PRODUCT_NAME = "$(TARGET_NAME)"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; @@ -1297,6 +1378,7 @@ "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI", "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Wechat", "$(PROJECT_DIR)/Ash_AWord/Vender/UMAnalytics_Sdk_3.4.6", + "$(PROJECT_DIR)/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina", ); PRODUCT_NAME = "$(TARGET_NAME)"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; 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 ec56e32..93dbee3 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -10,11 +10,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/AppDelegate.m" - timestampString = "449628804.640986" + timestampString = "449679166.085695" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "94" - endingLineNumber = "94" + startingLineNumber = "95" + endingLineNumber = "95" landmarkName = "-setUmeng" landmarkType = "5"> @@ -26,11 +26,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/AppDelegate.m" - timestampString = "449487306.916401" + timestampString = "449679166.085695" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "58" - endingLineNumber = "58" + startingLineNumber = "59" + endingLineNumber = "59" landmarkName = "-application:handleOpenURL:" landmarkType = "5"> @@ -42,11 +42,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/AppDelegate.m" - timestampString = "449487307.6863" + timestampString = "449679166.085695" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "65" - endingLineNumber = "65" + startingLineNumber = "66" + endingLineNumber = "66" landmarkName = "-application:openURL:sourceApplication:annotation:" landmarkType = "5"> @@ -58,11 +58,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "449628804.640986" + timestampString = "450197270.567043" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "79" - endingLineNumber = "79" + startingLineNumber = "123" + endingLineNumber = "123" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -74,11 +74,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Login/LoginViewController.m" - timestampString = "449628804.640986" + timestampString = "450197270.567043" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "81" - endingLineNumber = "81" + startingLineNumber = "125" + endingLineNumber = "125" landmarkName = "-weixinLoginBtnClick:" landmarkType = "5"> @@ -106,11 +106,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "449676821.867894" + timestampString = "450197601.430116" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "116" - endingLineNumber = "116" + startingLineNumber = "145" + endingLineNumber = "145" landmarkName = "-tableView:cellForRowAtIndexPath:" landmarkType = "5"> @@ -163,38 +163,6 @@ landmarkType = "5"> - - - - - - - - @@ -266,11 +234,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "449676821.867894" + timestampString = "450197601.430116" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "100" - endingLineNumber = "100" + startingLineNumber = "129" + endingLineNumber = "129" landmarkName = "-tableView:heightForRowAtIndexPath:" landmarkType = "5"> @@ -282,11 +250,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Main/NoteViewController.m" - timestampString = "449676821.867894" + timestampString = "450197601.430116" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "86" - endingLineNumber = "86" + startingLineNumber = "115" + endingLineNumber = "115" landmarkName = "-numberOfSectionsInTableView:" landmarkType = "5"> @@ -298,11 +266,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/ViewControllers/Note/NotePublishViewController.m" - timestampString = "449627906.406541" + timestampString = "450197270.567043" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "66" - endingLineNumber = "66" + startingLineNumber = "68" + endingLineNumber = "68" landmarkName = "-textView:shouldChangeTextInRange:replacementText:" landmarkType = "5"> @@ -326,18 +294,506 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/AppDelegate.m b/Ash_AWord/AppDelegate.m index 3700872..14475d4 100644 --- a/Ash_AWord/AppDelegate.m +++ b/Ash_AWord/AppDelegate.m @@ -10,6 +10,7 @@ #import "UMSocial.h" #import "UMSocialWechatHandler.h" #import "UMSocialQQHandler.h" +#import "UMSocialSinaHandler.h" #import "MobClick.h" #import "MainViewController.h" @interface AppDelegate () @@ -92,7 +93,8 @@ [UMSocialData setAppKey:kUmengAppkey]; [UMSocialWechatHandler setWXAppId:kWXAppId appSecret:kWXAppSecret url:@"http://www.xiaoyu.com"]; [UMSocialQQHandler setQQWithAppId:kQQAppId appKey:kQQAppSecret url:@"http://www.xiaoyu.com"]; - + [UMSocialSinaHandler openSSOWithRedirectURL:@"http://sns.whalecloud.com/sina2/callback"]; + [MobClick startWithAppkey:kUmengAppkey reportPolicy:REALTIME channelId:@"App Store"]; NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; [MobClick setAppVersion:version]; diff --git a/Ash_AWord/Config/Common.h b/Ash_AWord/Config/Common.h index cb21d51..49e49db 100644 --- a/Ash_AWord/Config/Common.h +++ b/Ash_AWord/Config/Common.h @@ -29,7 +29,7 @@ /** * app store上的Apple ID */ -#define kAppleID 957252253 +#define kAppleID 983458853 /** * 系统版本 @@ -78,6 +78,15 @@ #define kUmengAppkey @"551cf898fd98c586460011d1" +/** + * 友盟的数据 + */ +#define kUmen_wxlogin @"wxlogin" +#define kUmen_qqlogin @"qqlogin" +#define kUmen_sinalogin @"sinalogin" +#define kUmen_note @"note" +#define kUmen_addnote @"addnote" +#define kUmen_logout @"logout" /** * 调整图片的宽度 */ diff --git a/Ash_AWord/Info.plist b/Ash_AWord/Info.plist index 1bb4ef3..7b2a417 100644 --- a/Ash_AWord/Info.plist +++ b/Ash_AWord/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - OneWord + 遇见你 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFiles @@ -51,6 +51,14 @@ wx8fbd37e4da758bbd + + CFBundleURLName + sina + CFBundleURLSchemes + + sina.54abd4a4fd98c51d33000807 + + CFBundleVersion 1 diff --git a/Ash_AWord/PrefixHeader.pch b/Ash_AWord/PrefixHeader.pch index a087fa2..e8914e3 100644 --- a/Ash_AWord/PrefixHeader.pch +++ b/Ash_AWord/PrefixHeader.pch @@ -36,6 +36,8 @@ #import "Ash_UIUtil.h" #import "Mantle.h" #import "SVWebViewController.h" +#import "MobClick.h" +#import "LoginViewController.h" #endif #endif diff --git a/Ash_AWord/Resource/iconWeixin@2x.png b/Ash_AWord/Resource/iconWeixin@2x.png index 28ead6f..d457c16 100644 Binary files a/Ash_AWord/Resource/iconWeixin@2x.png and b/Ash_AWord/Resource/iconWeixin@2x.png differ diff --git a/Ash_AWord/Resource/mainCellDing@2x.png b/Ash_AWord/Resource/mainCellDing@2x.png new file mode 100644 index 0000000..ec48241 Binary files /dev/null and b/Ash_AWord/Resource/mainCellDing@2x.png differ diff --git a/Ash_AWord/Resource/mainCellDingClick@2x.png b/Ash_AWord/Resource/mainCellDingClick@2x.png new file mode 100644 index 0000000..71e10c3 Binary files /dev/null and b/Ash_AWord/Resource/mainCellDingClick@2x.png differ diff --git a/Ash_AWord/Utility/Network/BaseViewModel.h b/Ash_AWord/Utility/Network/BaseViewModel.h index d7590d1..f6bd593 100644 --- a/Ash_AWord/Utility/Network/BaseViewModel.h +++ b/Ash_AWord/Utility/Network/BaseViewModel.h @@ -11,7 +11,7 @@ @interface BaseViewModel : MTLModel -@property (nonatomic, readonly) NSInteger errCode; +@property (nonatomic, readonly) NSNumber* errCode; @property (nonatomic, readonly) NSString *errMessage; - (BOOL)success; diff --git a/Ash_AWord/Utility/Network/BaseViewModel.m b/Ash_AWord/Utility/Network/BaseViewModel.m index 30afac8..eb2b0ba 100644 --- a/Ash_AWord/Utility/Network/BaseViewModel.m +++ b/Ash_AWord/Utility/Network/BaseViewModel.m @@ -12,7 +12,7 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey { return @{ @"errCode": @"ret", - @"errMessage": @"errMessage", + @"errMessage": @"msg", }; } @@ -27,12 +27,12 @@ - (BOOL)success { - return (self.errCode == 0); + return (self.errCode.integerValue == 0); } - (BOOL)needLogin { - return (self.errCode == 1001); + return (self.errCode.integerValue == 1001); } @end diff --git a/Ash_AWord/Utility/Tool/CommonUtil.h b/Ash_AWord/Utility/Tool/CommonUtil.h index b825e44..49fe28b 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.h +++ b/Ash_AWord/Utility/Tool/CommonUtil.h @@ -48,6 +48,8 @@ NetworkType; * NSdate返回与指定NSdate相差天数的新的NSDate */ +(NSDate*)newDateWithDate:(NSDate*)oldDate withOffSetDay:(NSInteger)day; +//时间戳转时间 ++(NSString*)timeFromtimeSp:(NSString*)timeSp; //判断是否同一天 +(BOOL)isSameDay:(NSDate*)date1 date2:(NSDate*)date2; @end diff --git a/Ash_AWord/Utility/Tool/CommonUtil.m b/Ash_AWord/Utility/Tool/CommonUtil.m index 370884f..6ad5aa7 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.m +++ b/Ash_AWord/Utility/Tool/CommonUtil.m @@ -179,6 +179,89 @@ [adcomps setDay:day]; return [calendar dateByAddingComponents:adcomps toDate:oldDate options:0]; } ++(NSString*)timeFromtimeSp:(NSString*)timeSp +{ + NSDateFormatter* formatter = [[NSDateFormatter alloc] init]; + // [formatter setDateStyle:NSDateFormatterMediumStyle]; + // [formatter setTimeStyle:NSDateFormatterShortStyle]; + [formatter setDateFormat:@"yyyy-MM-dd HH:MM"]; + NSDate * d = [NSDate dateWithTimeIntervalSince1970:[timeSp floatValue]/1000]; + + NSTimeInterval late = [d timeIntervalSince1970]*1; + + NSString * timeString = [formatter stringFromDate:d]; + + NSDate * dat = [NSDate dateWithTimeIntervalSinceNow:0]; + + NSTimeInterval now = [dat timeIntervalSince1970]*1; + + NSTimeInterval cha = now - late; + if (cha/3600 < 1) { + + timeString = [NSString stringWithFormat:@"%f", cha/60]; + + timeString = [timeString substringToIndex:timeString.length-7]; + + int num= [timeString intValue]; + + if (num < 1) { + + timeString = [NSString stringWithFormat:@"刚刚"]; + + }else{ + + timeString = [NSString stringWithFormat:@"%@分钟前", timeString]; + + } + + } + + if (cha/3600 > 1 && cha/86400 < 1) { + + timeString = [NSString stringWithFormat:@"%f", cha/3600]; + + timeString = [timeString substringToIndex:timeString.length-7]; + + timeString = [NSString stringWithFormat:@"%@小时前", timeString]; + + } + + if (cha/86400 > 1) + + { + + timeString = [NSString stringWithFormat:@"%f", cha/86400]; + + timeString = [timeString substringToIndex:timeString.length-7]; + + int num = [timeString intValue]; + + if (num < 2) { + + timeString = [NSString stringWithFormat:@"昨天"]; + + }else if(num == 2){ + + timeString = [NSString stringWithFormat:@"前天"]; + + }else if (num > 2 && num <7){ + + timeString = [NSString stringWithFormat:@"%@天前", timeString]; + + }else if (num >= 7 && num <= 10) { + + timeString = [NSString stringWithFormat:@"1周前"]; + + }else if(num > 10){ + +// timeString = [NSString stringWithFormat:@"n天前"]; + + } + + + } + return timeString; +} +(BOOL)isSameDay:(NSDate *)date1 date2:(NSDate *)date2 { NSCalendar* calendar = [NSCalendar currentCalendar]; diff --git a/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/UMSocialSinaHandler.h b/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/UMSocialSinaHandler.h new file mode 100644 index 0000000..f8d2369 --- /dev/null +++ b/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/UMSocialSinaHandler.h @@ -0,0 +1,15 @@ +// +// UMSocialSinaHandler.h +// SocialSDK +// +// Created by yeahugo on 14-6-11. +// Copyright (c) 2014年 Umeng. All rights reserved. +// + +#import + +@interface UMSocialSinaHandler : NSObject + ++(void)openSSOWithRedirectURL:(NSString *)redirectURL; + +@end diff --git a/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/libSocialSina.a b/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/libSocialSina.a new file mode 100644 index 0000000..eb846d8 Binary files /dev/null and b/Ash_AWord/Vender/UMSocial_Sdk_Extra_Frameworks/Sina/libSocialSina.a differ diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.h b/Ash_AWord/ViewControllers/Login/LoginViewController.h index 518dac0..a44304c 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.h +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.h @@ -10,11 +10,14 @@ @interface LoginViewController : UIViewController - (IBAction)qqLoginBtnClick:(id)sender; +- (IBAction)sianLoginBtnClick:(id)sender; - (IBAction)weixinLoginBtnClick:(id)sender; - (IBAction)closeBtnClick:(id)sender; +@property (weak, nonatomic) IBOutlet UIButton *qqBtn; @property (strong, nonatomic)void (^loginSuccessBlock)(); +@property (weak, nonatomic) IBOutlet UIButton *wxBtn; + (LoginViewController *)shareLoginViewController; diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m index bc2c98c..eb2d3a6 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.m +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m @@ -10,6 +10,8 @@ #import "LoginViewModel.h" #import "UMSocial.h" #import "AppDelegate.h" +#import +#import "WXApi.h" @interface LoginViewController () @end @@ -19,6 +21,13 @@ - (void)viewDidLoad { [super viewDidLoad]; // Do any additional setup after loading the view from its nib. + if (![QQApi isQQInstalled]) { + _qqBtn.hidden = YES; + } + if (![WXApi isWXAppInstalled]) { + _wxBtn.hidden = YES; + } + } -(void)viewWillAppear:(BOOL)animated { @@ -42,6 +51,8 @@ - (IBAction)qqLoginBtnClick:(id)sender { + [MobClick event:kUmen_qqlogin attributes:nil]; + UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToQQ]; snsPlatform.loginClickHandler(self,[UMSocialControllerService defaultControllerService],YES,^(UMSocialResponseEntity *response){ @@ -66,8 +77,41 @@ } +- (IBAction)sianLoginBtnClick:(id)sender { + [MobClick event:kUmen_sinalogin attributes:nil]; + + UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToSina]; + + snsPlatform.loginClickHandler(self,[UMSocialControllerService defaultControllerService],YES,^(UMSocialResponseEntity *response){ + + // 获取微博用户名、uid、token等 + + if (response.responseCode == UMSResponseCodeSuccess) { + + 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) { + gender = @"女"; + } + NSString* openid = [NSString stringWithFormat:@"%ld",((NSNumber*)[response.data objectForKey:@"uid"]).integerValue]; + [self loginWithOpenId:openid withName:[response.data objectForKey:@"screen_name"] withGender:gender withFigureUrl:[response.data objectForKey:@"profile_image_url"]]; + }else{ + [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; + } + }]; + + }}); +} + - (IBAction)weixinLoginBtnClick:(id)sender { + [MobClick event:kUmen_wxlogin attributes:nil]; + UMSocialSnsPlatform *snsPlatform = [UMSocialSnsPlatformManager getSocialPlatformWithName:UMShareToWechatSession]; snsPlatform.loginClickHandler(self,[UMSocialControllerService defaultControllerService],YES,^(UMSocialResponseEntity *response){ @@ -130,7 +174,8 @@ [MBProgressHUD errorHudWithView:self.view label:kSSoErrorTips hidesAfter:1.0]; } } failedBlock:^(NSError *error) { - + [MBProgressHUD hideAllHUDsForView:self.view animated:YES]; + }]; } diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.xib b/Ash_AWord/ViewControllers/Login/LoginViewController.xib index d90155b..fbb7fb2 100644 --- a/Ash_AWord/ViewControllers/Login/LoginViewController.xib +++ b/Ash_AWord/ViewControllers/Login/LoginViewController.xib @@ -7,7 +7,9 @@ + + @@ -43,20 +45,43 @@ + + + + + + + + + - + + + + + + + + + @@ -127,18 +141,20 @@ + - + - + + @@ -164,16 +180,16 @@ - + - - + +