Skip to content

陈高翔 / DreamSleep-iOS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d245df36 由 cgx
选项

搭建消息中心、官方通知、收到的赞页面

1 个父辈 6775a078
内嵌 并排
正在显示 38 个修改的文件 包含 598 行增加 和 230 行删除
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D027EE2F27FB52DA004BBA61 /* UIImage+Extras.m */; }; D027EE3027FB52DA004BBA61 /* UIImage+Extras.m in Sources */ = {isa = PBXBuildFile; fileRef = D027EE2F27FB52DA004BBA61 /* UIImage+Extras.m */; };
D02B7E5C28E2A28500218EF7 /* ComDynamicCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E5B28E2A28500218EF7 /* ComDynamicCell.m */; }; D02B7E5C28E2A28500218EF7 /* ComDynamicCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E5B28E2A28500218EF7 /* ComDynamicCell.m */; };
D02B7E5F28E2C89600218EF7 /* ComDynModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E5E28E2C89600218EF7 /* ComDynModel.m */; }; D02B7E5F28E2C89600218EF7 /* ComDynModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E5E28E2C89600218EF7 /* ComDynModel.m */; };
D02B7E6128E2D33900218EF7 /* comList.plist in Resources */ = {isa = PBXBuildFile; fileRef = D02B7E6028E2D33900218EF7 /* comList.plist */; };
D02B7E6428E2D76D00218EF7 /* ComListViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E6328E2D76D00218EF7 /* ComListViewModel.m */; }; D02B7E6428E2D76D00218EF7 /* ComListViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D02B7E6328E2D76D00218EF7 /* ComListViewModel.m */; };
D02D0827287BBEDE005C3A00 /* SleepReadyController.m in Sources */ = {isa = PBXBuildFile; fileRef = D02D0826287BBEDE005C3A00 /* SleepReadyController.m */; }; D02D0827287BBEDE005C3A00 /* SleepReadyController.m in Sources */ = {isa = PBXBuildFile; fileRef = D02D0826287BBEDE005C3A00 /* SleepReadyController.m */; };
D02D082A287BCEF3005C3A00 /* SRTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D02D0829287BCEF3005C3A00 /* SRTipsView.m */; }; D02D082A287BCEF3005C3A00 /* SRTipsView.m in Sources */ = {isa = PBXBuildFile; fileRef = D02D0829287BCEF3005C3A00 /* SRTipsView.m */; };
...@@ -246,6 +245,13 @@ ...@@ -246,6 +245,13 @@
D0DB33A528204E7C00E15914 /* FirstLeadAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A428204E7C00E15914 /* FirstLeadAlertView.m */; }; D0DB33A528204E7C00E15914 /* FirstLeadAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A428204E7C00E15914 /* FirstLeadAlertView.m */; };
D0DB33A828224D5100E15914 /* PromotionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A728224D5100E15914 /* PromotionModel.m */; }; D0DB33A828224D5100E15914 /* PromotionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DB33A728224D5100E15914 /* PromotionModel.m */; };
D0DF90AE2814390000FC0F64 /* BannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DF90AD2814390000FC0F64 /* BannerModel.m */; }; D0DF90AE2814390000FC0F64 /* BannerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0DF90AD2814390000FC0F64 /* BannerModel.m */; };
D0E3563A28F555B5007190EE /* MessageNotiModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3563928F555B5007190EE /* MessageNotiModel.m */; };
D0E3563D28F55A27007190EE /* OfficialNoticeController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3563C28F55A27007190EE /* OfficialNoticeController.m */; };
D0E3564028F55B50007190EE /* PraiseListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3563F28F55B50007190EE /* PraiseListController.m */; };
D0E3564928F56115007190EE /* BaseTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3564828F56115007190EE /* BaseTableViewCell.m */; };
D0E3564C28F56181007190EE /* PraiseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3564B28F56181007190EE /* PraiseCell.m */; };
D0E3564F28F5651C007190EE /* PraiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3564E28F5651C007190EE /* PraiseModel.m */; };
D0E3565328F56CFE007190EE /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E3565228F56CFE007190EE /* BaseViewController.m */; };
D0E41B5D2851E0D1005A7DA4 /* ShareRequestModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E41B5C2851E0D1005A7DA4 /* ShareRequestModel.m */; }; D0E41B5D2851E0D1005A7DA4 /* ShareRequestModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E41B5C2851E0D1005A7DA4 /* ShareRequestModel.m */; };
D0E41B602851E0F6005A7DA4 /* ShareItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E41B5F2851E0F6005A7DA4 /* ShareItem.m */; }; D0E41B602851E0F6005A7DA4 /* ShareItem.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E41B5F2851E0F6005A7DA4 /* ShareItem.m */; };
D0E65FFA2807A654006562F2 /* NSArray+HYBUnicodeReadable.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E65FF42807A654006562F2 /* NSArray+HYBUnicodeReadable.m */; }; D0E65FFA2807A654006562F2 /* NSArray+HYBUnicodeReadable.m in Sources */ = {isa = PBXBuildFile; fileRef = D0E65FF42807A654006562F2 /* NSArray+HYBUnicodeReadable.m */; };
...@@ -387,7 +393,6 @@ ...@@ -387,7 +393,6 @@
D02B7E5B28E2A28500218EF7 /* ComDynamicCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComDynamicCell.m; sourceTree = "<group>"; }; D02B7E5B28E2A28500218EF7 /* ComDynamicCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComDynamicCell.m; sourceTree = "<group>"; };
D02B7E5D28E2C89600218EF7 /* ComDynModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComDynModel.h; sourceTree = "<group>"; }; D02B7E5D28E2C89600218EF7 /* ComDynModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComDynModel.h; sourceTree = "<group>"; };
D02B7E5E28E2C89600218EF7 /* ComDynModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComDynModel.m; sourceTree = "<group>"; }; D02B7E5E28E2C89600218EF7 /* ComDynModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComDynModel.m; sourceTree = "<group>"; };
D02B7E6028E2D33900218EF7 /* comList.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = comList.plist; sourceTree = "<group>"; };
D02B7E6228E2D76D00218EF7 /* ComListViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComListViewModel.h; sourceTree = "<group>"; }; D02B7E6228E2D76D00218EF7 /* ComListViewModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComListViewModel.h; sourceTree = "<group>"; };
D02B7E6328E2D76D00218EF7 /* ComListViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComListViewModel.m; sourceTree = "<group>"; }; D02B7E6328E2D76D00218EF7 /* ComListViewModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComListViewModel.m; sourceTree = "<group>"; };
D02D0825287BBEDE005C3A00 /* SleepReadyController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SleepReadyController.h; sourceTree = "<group>"; }; D02D0825287BBEDE005C3A00 /* SleepReadyController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SleepReadyController.h; sourceTree = "<group>"; };
...@@ -770,6 +775,20 @@ ...@@ -770,6 +775,20 @@
D0DF90AB28142F1300FC0F64 /* DreamSleepDebug.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = DreamSleepDebug.entitlements; sourceTree = "<group>"; }; D0DF90AB28142F1300FC0F64 /* DreamSleepDebug.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = DreamSleepDebug.entitlements; sourceTree = "<group>"; };
D0DF90AC2814390000FC0F64 /* BannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerModel.h; sourceTree = "<group>"; }; D0DF90AC2814390000FC0F64 /* BannerModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BannerModel.h; sourceTree = "<group>"; };
D0DF90AD2814390000FC0F64 /* BannerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerModel.m; sourceTree = "<group>"; }; D0DF90AD2814390000FC0F64 /* BannerModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BannerModel.m; sourceTree = "<group>"; };
D0E3563828F555B5007190EE /* MessageNotiModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MessageNotiModel.h; sourceTree = "<group>"; };
D0E3563928F555B5007190EE /* MessageNotiModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MessageNotiModel.m; sourceTree = "<group>"; };
D0E3563B28F55A27007190EE /* OfficialNoticeController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OfficialNoticeController.h; sourceTree = "<group>"; };
D0E3563C28F55A27007190EE /* OfficialNoticeController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OfficialNoticeController.m; sourceTree = "<group>"; };
D0E3563E28F55B50007190EE /* PraiseListController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PraiseListController.h; sourceTree = "<group>"; };
D0E3563F28F55B50007190EE /* PraiseListController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PraiseListController.m; sourceTree = "<group>"; };
D0E3564728F56115007190EE /* BaseTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseTableViewCell.h; sourceTree = "<group>"; };
D0E3564828F56115007190EE /* BaseTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseTableViewCell.m; sourceTree = "<group>"; };
D0E3564A28F56181007190EE /* PraiseCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PraiseCell.h; sourceTree = "<group>"; };
D0E3564B28F56181007190EE /* PraiseCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PraiseCell.m; sourceTree = "<group>"; };
D0E3564D28F5651C007190EE /* PraiseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PraiseModel.h; sourceTree = "<group>"; };
D0E3564E28F5651C007190EE /* PraiseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PraiseModel.m; sourceTree = "<group>"; };
D0E3565128F56CFE007190EE /* BaseViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
D0E3565228F56CFE007190EE /* BaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
D0E41B5B2851E0D1005A7DA4 /* ShareRequestModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareRequestModel.h; sourceTree = "<group>"; }; D0E41B5B2851E0D1005A7DA4 /* ShareRequestModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareRequestModel.h; sourceTree = "<group>"; };
D0E41B5C2851E0D1005A7DA4 /* ShareRequestModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareRequestModel.m; sourceTree = "<group>"; }; D0E41B5C2851E0D1005A7DA4 /* ShareRequestModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShareRequestModel.m; sourceTree = "<group>"; };
D0E41B5E2851E0F6005A7DA4 /* ShareItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareItem.h; sourceTree = "<group>"; }; D0E41B5E2851E0F6005A7DA4 /* ShareItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShareItem.h; sourceTree = "<group>"; };
...@@ -1545,6 +1564,8 @@ ...@@ -1545,6 +1564,8 @@
D053D0E428F41F1300BB2B84 /* MessageNotiCell.m */, D053D0E428F41F1300BB2B84 /* MessageNotiCell.m */,
D053D0E628F41FB300BB2B84 /* CommentReplyCell.h */, D053D0E628F41FB300BB2B84 /* CommentReplyCell.h */,
D053D0E728F41FB300BB2B84 /* CommentReplyCell.m */, D053D0E728F41FB300BB2B84 /* CommentReplyCell.m */,
D0E3564A28F56181007190EE /* PraiseCell.h */,
D0E3564B28F56181007190EE /* PraiseCell.m */,
); );
path = View; path = View;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1574,7 +1595,10 @@ ...@@ -1574,7 +1595,10 @@
D053D0D528F3BAD500BB2B84 /* ReportController.m */, D053D0D528F3BAD500BB2B84 /* ReportController.m */,
D053D0DD28F40C6A00BB2B84 /* MessageController.h */, D053D0DD28F40C6A00BB2B84 /* MessageController.h */,
D053D0DE28F40C6A00BB2B84 /* MessageController.m */, D053D0DE28F40C6A00BB2B84 /* MessageController.m */,
D02B7E6028E2D33900218EF7 /* comList.plist */, D0E3563B28F55A27007190EE /* OfficialNoticeController.h */,
D0E3563C28F55A27007190EE /* OfficialNoticeController.m */,
D0E3563E28F55B50007190EE /* PraiseListController.h */,
D0E3563F28F55B50007190EE /* PraiseListController.m */,
); );
path = Controller; path = Controller;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1584,12 +1608,16 @@ ...@@ -1584,12 +1608,16 @@
children = ( children = (
D02B7E5D28E2C89600218EF7 /* ComDynModel.h */, D02B7E5D28E2C89600218EF7 /* ComDynModel.h */,
D02B7E5E28E2C89600218EF7 /* ComDynModel.m */, D02B7E5E28E2C89600218EF7 /* ComDynModel.m */,
D0B836F628F1232F006E76C0 /* ComReplyModel.h */,
D0B836F728F1232F006E76C0 /* ComReplyModel.m */,
D0B836F028F11C77006E76C0 /* CommentModel.h */, D0B836F028F11C77006E76C0 /* CommentModel.h */,
D0B836F128F11C77006E76C0 /* CommentModel.m */, D0B836F128F11C77006E76C0 /* CommentModel.m */,
D0B836F328F11CA0006E76C0 /* ReplyModel.h */, D0B836F328F11CA0006E76C0 /* ReplyModel.h */,
D0B836F428F11CA0006E76C0 /* ReplyModel.m */, D0B836F428F11CA0006E76C0 /* ReplyModel.m */,
D0B836F628F1232F006E76C0 /* ComReplyModel.h */, D0E3563828F555B5007190EE /* MessageNotiModel.h */,
D0B836F728F1232F006E76C0 /* ComReplyModel.m */, D0E3563928F555B5007190EE /* MessageNotiModel.m */,
D0E3564D28F5651C007190EE /* PraiseModel.h */,
D0E3564E28F5651C007190EE /* PraiseModel.m */,
); );
path = Model; path = Model;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -1864,6 +1892,30 @@ ...@@ -1864,6 +1892,30 @@
path = InviteFriend; path = InviteFriend;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
D0E3564628F560E4007190EE /* View */ = {
isa = PBXGroup;
children = (
D0E3564728F56115007190EE /* BaseTableViewCell.h */,
D0E3564828F56115007190EE /* BaseTableViewCell.m */,
);
path = View;
sourceTree = "<group>";
};
D0E3565028F56C59007190EE /* Controller */ = {
isa = PBXGroup;
children = (
D0930F102801124E006B497A /* BaseNaviController.h */,
D0930F112801124E006B497A /* BaseNaviController.m */,
D0E3565128F56CFE007190EE /* BaseViewController.h */,
D0E3565228F56CFE007190EE /* BaseViewController.m */,
D055BEBD2825267C00BC11A4 /* DSBaseViewController.h */,
D055BEBE2825267C00BC11A4 /* DSBaseViewController.m */,
D0534F072835D90400F8892E /* DSNaviBarViewController.h */,
D0534F082835D90400F8892E /* DSNaviBarViewController.m */,
);
path = Controller;
sourceTree = "<group>";
};
D0E41B5728519CD1005A7DA4 /* Controller */ = { D0E41B5728519CD1005A7DA4 /* Controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -2161,9 +2213,11 @@ ...@@ -2161,9 +2213,11 @@
children = ( children = (
D07A657A2815897A00C15AF6 /* H5 */, D07A657A2815897A00C15AF6 /* H5 */,
D0B5ECD927F2F410003EDFE3 /* Utils */, D0B5ECD927F2F410003EDFE3 /* Utils */,
D0E3564628F560E4007190EE /* View */,
D027EE2327FB3C99004BBA61 /* Network */, D027EE2327FB3C99004BBA61 /* Network */,
D027EE2A27FB5285004BBA61 /* Category */, D027EE2A27FB5285004BBA61 /* Category */,
D0B5ECBF27F2E0ED003EDFE3 /* DSConfig */, D0B5ECBF27F2E0ED003EDFE3 /* DSConfig */,
D0E3565028F56C59007190EE /* Controller */,
D013CD3D285836CE00F920B4 /* EventTrack */, D013CD3D285836CE00F920B4 /* EventTrack */,
); );
path = Basement; path = Basement;
...@@ -2188,14 +2242,8 @@ ...@@ -2188,14 +2242,8 @@
D0B5ECA427F2D9DE003EDFE3 /* AppDelegate.h */, D0B5ECA427F2D9DE003EDFE3 /* AppDelegate.h */,
D0B5ECA527F2D9DE003EDFE3 /* AppDelegate.m */, D0B5ECA527F2D9DE003EDFE3 /* AppDelegate.m */,
D0B5ECAD27F2D9DE003EDFE3 /* Main.storyboard */, D0B5ECAD27F2D9DE003EDFE3 /* Main.storyboard */,
D0930F102801124E006B497A /* BaseNaviController.h */,
D0930F112801124E006B497A /* BaseNaviController.m */,
D04B3DA927F6EEB40022F8DF /* DSTabBarController.h */, D04B3DA927F6EEB40022F8DF /* DSTabBarController.h */,
D04B3DAA27F6EEB40022F8DF /* DSTabBarController.m */, D04B3DAA27F6EEB40022F8DF /* DSTabBarController.m */,
D055BEBD2825267C00BC11A4 /* DSBaseViewController.h */,
D055BEBE2825267C00BC11A4 /* DSBaseViewController.m */,
D0534F072835D90400F8892E /* DSNaviBarViewController.h */,
D0534F082835D90400F8892E /* DSNaviBarViewController.m */,
); );
path = Root; path = Root;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2366,7 +2414,6 @@ ...@@ -2366,7 +2414,6 @@
D0B5ECB127F2D9E0003EDFE3 /* Assets.xcassets in Resources */, D0B5ECB127F2D9E0003EDFE3 /* Assets.xcassets in Resources */,
D04B3DBD27F6F8090022F8DF /* Profile.storyboard in Resources */, D04B3DBD27F6F8090022F8DF /* Profile.storyboard in Resources */,
D051032F282A4E9200560A0D /* fse.mp3 in Resources */, D051032F282A4E9200560A0D /* fse.mp3 in Resources */,
D02B7E6128E2D33900218EF7 /* comList.plist in Resources */,
D0C09EDA28007D9100709D4C /* relax_lottie.json in Resources */, D0C09EDA28007D9100709D4C /* relax_lottie.json in Resources */,
D0F82D32285C7F8E0058DDB2 /* logo_start_classic@3x.png in Resources */, D0F82D32285C7F8E0058DDB2 /* logo_start_classic@3x.png in Resources */,
D051032E282A4E9200560A0D /* instant_eternity.mp3 in Resources */, D051032E282A4E9200560A0D /* instant_eternity.mp3 in Resources */,
...@@ -2465,6 +2512,7 @@ ...@@ -2465,6 +2512,7 @@
D04B3D9A27F6D4D90022F8DF /* LeadingController.m in Sources */, D04B3D9A27F6D4D90022F8DF /* LeadingController.m in Sources */,
D01D3CCD2873DD6B00E65BAA /* DPScrollNumberLabel.m in Sources */, D01D3CCD2873DD6B00E65BAA /* DPScrollNumberLabel.m in Sources */,
D0031549284DAC0D00CFE94D /* RelaxBodyView.m in Sources */, D0031549284DAC0D00CFE94D /* RelaxBodyView.m in Sources */,
D0E3564C28F56181007190EE /* PraiseCell.m in Sources */,
D0404A2B2870930A0062AD30 /* BeizerView.m in Sources */, D0404A2B2870930A0062AD30 /* BeizerView.m in Sources */,
D053BEE9280F9E310028CCFC /* CloseAlertView.m in Sources */, D053BEE9280F9E310028CCFC /* CloseAlertView.m in Sources */,
D0D00199282C9402004EAFA1 /* NoiseView.m in Sources */, D0D00199282C9402004EAFA1 /* NoiseView.m in Sources */,
...@@ -2518,6 +2566,7 @@ ...@@ -2518,6 +2566,7 @@
D0078C5E28E13DC400054804 /* DynamicDetailView.m in Sources */, D0078C5E28E13DC400054804 /* DynamicDetailView.m in Sources */,
D00291892816CD4500C0573B /* DsCacheUtils.m in Sources */, D00291892816CD4500C0573B /* DsCacheUtils.m in Sources */,
D07DAC902810546A0067A1BF /* DSImagePickerController.m in Sources */, D07DAC902810546A0067A1BF /* DSImagePickerController.m in Sources */,
D0E3564928F56115007190EE /* BaseTableViewCell.m in Sources */,
D070A78E28DF02DE0039C5A7 /* DynamicViewModel.m in Sources */, D070A78E28DF02DE0039C5A7 /* DynamicViewModel.m in Sources */,
D0A1C49228C2084B000975DC /* ArticleRequestModel.m in Sources */, D0A1C49228C2084B000975DC /* ArticleRequestModel.m in Sources */,
D0DF90AE2814390000FC0F64 /* BannerModel.m in Sources */, D0DF90AE2814390000FC0F64 /* BannerModel.m in Sources */,
...@@ -2546,8 +2595,10 @@ ...@@ -2546,8 +2595,10 @@
D0A750FC282DE21D00589B0E /* NoiseAudioCell.m in Sources */, D0A750FC282DE21D00589B0E /* NoiseAudioCell.m in Sources */,
D0C09EE028007E5F00709D4C /* BreatheController.m in Sources */, D0C09EE028007E5F00709D4C /* BreatheController.m in Sources */,
D0A75108282E2A8500589B0E /* NoisePlayBar.m in Sources */, D0A75108282E2A8500589B0E /* NoisePlayBar.m in Sources */,
D0E3564F28F5651C007190EE /* PraiseModel.m in Sources */,
D0078C6228E1425500054804 /* InteractView.m in Sources */, D0078C6228E1425500054804 /* InteractView.m in Sources */,
D0C50B4627FD66FB00DC68F0 /* DSConstUtil.m in Sources */, D0C50B4627FD66FB00DC68F0 /* DSConstUtil.m in Sources */,
D0E3565328F56CFE007190EE /* BaseViewController.m in Sources */,
D01DC95128701ECD0035B78B /* MyPointView.m in Sources */, D01DC95128701ECD0035B78B /* MyPointView.m in Sources */,
D053D0DC28F3C23200BB2B84 /* ReportViewModel.m in Sources */, D053D0DC28F3C23200BB2B84 /* ReportViewModel.m in Sources */,
D0B836FB28F1655E006E76C0 /* DynamicCommentCell.m in Sources */, D0B836FB28F1655E006E76C0 /* DynamicCommentCell.m in Sources */,
...@@ -2597,6 +2648,7 @@ ...@@ -2597,6 +2648,7 @@
D0AEFE7C2817D13400230DC6 /* UITableViewCell+CardRadius.m in Sources */, D0AEFE7C2817D13400230DC6 /* UITableViewCell+CardRadius.m in Sources */,
D01DC957287023C20035B78B /* RankHeadView.m in Sources */, D01DC957287023C20035B78B /* RankHeadView.m in Sources */,
D0D5BB0D286D7A8D00D0507E /* TaskGroupModel.m in Sources */, D0D5BB0D286D7A8D00D0507E /* TaskGroupModel.m in Sources */,
D0E3564028F55B50007190EE /* PraiseListController.m in Sources */,
D053D0DF28F40C6A00BB2B84 /* MessageController.m in Sources */, D053D0DF28F40C6A00BB2B84 /* MessageController.m in Sources */,
D043A8B6287EBA4000226176 /* ReadyItemView.m in Sources */, D043A8B6287EBA4000226176 /* ReadyItemView.m in Sources */,
D09BF331280E570D00E5F06C /* UserModel.m in Sources */, D09BF331280E570D00E5F06C /* UserModel.m in Sources */,
...@@ -2655,10 +2707,12 @@ ...@@ -2655,10 +2707,12 @@
D0F808F52803D4E70097899F /* Track.m in Sources */, D0F808F52803D4E70097899F /* Track.m in Sources */,
D0E65FFC2807A654006562F2 /* NSSet+HYBUnicodeReadable.m in Sources */, D0E65FFC2807A654006562F2 /* NSSet+HYBUnicodeReadable.m in Sources */,
D0C50B3C27FD2EFD00DC68F0 /* PrivacyViewController.m in Sources */, D0C50B3C27FD2EFD00DC68F0 /* PrivacyViewController.m in Sources */,
D0E3563D28F55A27007190EE /* OfficialNoticeController.m in Sources */,
D0AE1E3528281B6F008CEF27 /* TimerProxy.m in Sources */, D0AE1E3528281B6F008CEF27 /* TimerProxy.m in Sources */,
D0498874286E95F2000ACF55 /* DsTaskManager.m in Sources */, D0498874286E95F2000ACF55 /* DsTaskManager.m in Sources */,
D0691E05287FEA04008BFFAB /* SleepReadyRequestModel.m in Sources */, D0691E05287FEA04008BFFAB /* SleepReadyRequestModel.m in Sources */,
D0FAC41D281B817D00D4B859 /* GKPhotoBrowser.m in Sources */, D0FAC41D281B817D00D4B859 /* GKPhotoBrowser.m in Sources */,
D0E3563A28F555B5007190EE /* MessageNotiModel.m in Sources */,
D024CE89287D59FF00FB4320 /* SRMusicView.m in Sources */, D024CE89287D59FF00FB4320 /* SRMusicView.m in Sources */,
D07A4B2A280EA6B600BA0EC0 /* UserInfoTableView.m in Sources */, D07A4B2A280EA6B600BA0EC0 /* UserInfoTableView.m in Sources */,
D05416F7288A57BD0035060B /* AVAudioSession+SXAudioSession.m in Sources */, D05416F7288A57BD0035060B /* AVAudioSession+SXAudioSession.m in Sources */,
......
DreamSleep/DreamSleep/Basement/Controller/BaseViewController.h 0 → 100644
//
// BaseViewController.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
/// 基类控制器
@interface BaseViewController : UIViewController
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Basement/Controller/BaseViewController.m 0 → 100644
//
// BaseViewController.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "BaseViewController.h"
@interface BaseViewController ()
@end
@implementation BaseViewController
- (void)viewDidLoad {
[super viewDidLoad];
}
#pragma mark - 品牌模式
- (NaviStyle)navigationBarStyle {
return NaviStyleDefault;
}
@end
DreamSleep/DreamSleep/Basement/View/BaseTableViewCell.h 0 → 100644
//
// BaseTableViewCell.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface BaseTableViewCell : UITableViewCell
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Basement/View/BaseTableViewCell.m 0 → 100644
//
// BaseTableViewCell.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "BaseTableViewCell.h"
@implementation BaseTableViewCell
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.backgroundColor = DSClearColor;
}
return self;
}
@end
DreamSleep/DreamSleep/Class/CommunityModule/Controller/MessageController.h
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
// Created by peter on 2022/10/10. // Created by peter on 2022/10/10.
// //
#import <UIKit/UIKit.h> #import "BaseViewController.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/// 社区消息通知页面 /// 社区消息通知页面
@interface MessageController : UIViewController @interface MessageController : BaseViewController
@end @end
......
DreamSleep/DreamSleep/Class/CommunityModule/Controller/MessageController.m
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#import "MessageController.h" #import "MessageController.h"
#import "MessageNotiView.h" #import "MessageNotiView.h"
#import "OfficialNoticeController.h"
#import "PraiseListController.h"
#import "ReplyListController.h"
@interface MessageController () <MessageNotiViewDelegate> @interface MessageController () <MessageNotiViewDelegate>
@property (nonatomic, strong) MessageNotiView *messageNotiView; @property (nonatomic, strong) MessageNotiView *messageNotiView;
...@@ -24,9 +27,20 @@ ...@@ -24,9 +27,20 @@
self.navigationItem.title = @"消息中心"; self.navigationItem.title = @"消息中心";
} }
#pragma mark - 品牌模式 #pragma mark - MessageNotiViewDelegate
- (NaviStyle)navigationBarStyle { - (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
return NaviStyleDefault; if (indexPath.section == 0) {
if (indexPath.row == 0) {
OfficialNoticeController *officialVC = [OfficialNoticeController new];
[self.navigationController pushViewController:officialVC animated:YES];
} else {
PraiseListController *praiseVC = [PraiseListController new];
[self.navigationController pushViewController:praiseVC animated:YES];
}
} else {
ReplyListController *replyList = [ReplyListController new];
[self.navigationController pushViewController:replyList animated:YES];
}
} }
#pragma mark - lazy #pragma mark - lazy
......
DreamSleep/DreamSleep/Class/CommunityModule/Controller/OfficialNoticeController.h 0 → 100644
//
// OfficialNoticeController.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "BaseViewController.h"
NS_ASSUME_NONNULL_BEGIN
/// 官方通知页面
@interface OfficialNoticeController : BaseViewController
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/Controller/OfficialNoticeController.m 0 → 100644
//
// OfficialNoticeController.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "OfficialNoticeController.h"
@interface OfficialNoticeController ()
@end
@implementation OfficialNoticeController
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = @"官方通知";
self.view.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
}
@end
DreamSleep/DreamSleep/Class/CommunityModule/Controller/PraiseListController.h 0 → 100644
//
// PraiseListController.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
/// 点赞列表
@interface PraiseListController : UITableViewController
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/Controller/PraiseListController.m 0 → 100644
//
// PraiseListController.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "PraiseListController.h"
#import "PraiseCell.h"
@interface PraiseListController ()
@property (nonatomic, strong) DSDataSource *dataSource;
@end
@implementation PraiseListController
- (void)viewDidLoad {
[super viewDidLoad];
self.navigationItem.title = @"收到的赞";
NSMutableArray *tmpArr = [NSMutableArray array];
for (int i = 0; i < 10; i++) {
PraiseModel *model = [PraiseModel new];
model.user_profile = @"https://img2.ydniu.com/sleep_ssmain/face_img/1657350090882_1BORX6.jpg";
model.nick_name = @"叽叽歪歪";
model.publish_time = @"2022-09-11";
model.content = @"好高好高好高好高好高好高好";
[tmpArr addObject:model];
}
[self.dataSource addDataArray:tmpArr.copy];
self.tableView.dk_backgroundColorPicker = DKColorPickerWithKey(VCViewBG);
self.tableView.showsVerticalScrollIndicator = NO;
self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[self.tableView registerClass:[PraiseCell class] forCellReuseIdentifier:NSStringFromClass([PraiseCell class])];
self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
}
#pragma mark - UITableViewDelegate, UITableViewDataSource
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
return 97;
}
#pragma mark - lazy
- (DSDataSource *)dataSource {
if (!_dataSource) {
CellConfigureBlock cellBlock = ^(PraiseCell * cell, PraiseModel * model, NSIndexPath * indexPath) {
cell.praiseModel = model;
};
_dataSource = [[DSDataSource alloc] initWithIdentifier:NSStringFromClass([PraiseCell class]) datas:@[] isSection:NO configureBlock:cellBlock];
self.tableView.dataSource = _dataSource;
}
return _dataSource;
}
#pragma mark - 品牌模式
- (NaviStyle)navigationBarStyle {
return NaviStyleDefault;
}
@end
DreamSleep/DreamSleep/Class/CommunityModule/Controller/comList.plist deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>error</key>
<string>&quot;&quot;</string>
<key>result</key>
<array>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>张三</string>
<key>time</key>
<string>1分钟前</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653288028602_1yFqHL.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>2</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>李四</string>
<key>time</key>
<string>半个小时前</string>
<key>content</key>
<string>长沙好好玩，各种美食应有尽有，吃喝玩乐嗨起来，周末约朋友喝茶颜去。。。</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653288005388_7wuK9n.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653277874846_BzEuFF.jpg</string>
</array>
<key>isLike</key>
<true/>
<key>likeCount</key>
<integer>33</integer>
<key>remarkCount</key>
<integer>2</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>李四</string>
<key>time</key>
<string>半个小时前</string>
<key>content</key>
<string>长沙好好玩，各种美食应有尽有，吃喝玩乐嗨起来，周末约朋友喝茶颜去。。。</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653288005388_7wuK9n.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653277874846_BzEuFF.jpg</string>
</array>
<key>isLike</key>
<true/>
<key>likeCount</key>
<integer>33</integer>
<key>remarkCount</key>
<integer>2</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>王五</string>
<key>time</key>
<string>昨天</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653302478340_liIqbO.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301114665_lwDNUG.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301150570_zfQ0jW.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>0</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>王五</string>
<key>time</key>
<string>昨天</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653302478340_liIqbO.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301114665_lwDNUG.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301150570_zfQ0jW.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>0</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>王五</string>
<key>time</key>
<string>昨天</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653302478340_liIqbO.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301114665_lwDNUG.jpg</string>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653301150570_zfQ0jW.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>0</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>异次元</string>
<key>time</key>
<string>3天前</string>
<key>content</key>
<string>觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系&quot;觉知当下，与家人建立和谐关系&quot;</string>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>2</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>张三</string>
<key>time</key>
<string>1分钟前</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653288028602_1yFqHL.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>2</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
<dict>
<key>userIcon</key>
<string>https://img2.ydniu.com/sleep_ssmain/face_img/1658215539163_ZsA0sm.jpg</string>
<key>userName</key>
<string>张三</string>
<key>time</key>
<string>1分钟前</string>
<key>content</key>
<string>国庆放假要好好计划下，健身打卡</string>
<key>imgUrls</key>
<array>
<string>https://img2.ydniu.com/sleep_ssmain/relax/1653288028602_1yFqHL.jpg</string>
</array>
<key>isLike</key>
<false/>
<key>likeCount</key>
<integer>2</integer>
<key>remarkCount</key>
<integer>0</integer>
</dict>
</array>
<key>res_code</key>
<integer>1</integer>
</dict>
</plist>
DreamSleep/DreamSleep/Class/CommunityModule/Model/ComReplyModel.h
...@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
FOUNDATION_EXTERN UIFont * const CommentContentFont; FOUNDATION_EXTERN UIFont * const CommentContentFont;
/// 评论回复model /// 动态评论回复model
@interface ComReplyModel : NSObject @interface ComReplyModel : NSObject
/// 评论model /// 评论model
@property (nonatomic, strong) CommentModel *commentModel; @property (nonatomic, strong) CommentModel *commentModel;
......
DreamSleep/DreamSleep/Class/CommunityModule/Model/MessageNotiModel.h 0 → 100644
//
// MessageNotiModel.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
/// 消息中心官方通知和收到点赞数据model
@interface MessageNotiModel : NSObject
@property (nonatomic, copy) NSString *iconName;
@property (nonatomic, copy) NSString *title;
@property (nonatomic, copy) NSString *detail;
@property (nonatomic, assign) int messageCount;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/Model/MessageNotiModel.m 0 → 100644
//
// MessageNotiModel.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "MessageNotiModel.h"
@implementation MessageNotiModel
@end
DreamSleep/DreamSleep/Class/CommunityModule/Model/PraiseModel.h 0 → 100644
//
// PraiseModel.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface PraiseModel : NSObject
/// 头像
@property (nonatomic, copy) NSString *user_profile;
/// 昵称
@property (nonatomic, copy) NSString *nick_name;
/// 回复时间
@property (nonatomic, copy) NSString *publish_time;
/// 内容
@property (nonatomic, copy) NSString *content;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/Model/PraiseModel.m 0 → 100644
//
// PraiseModel.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "PraiseModel.h"
@implementation PraiseModel
@end
DreamSleep/DreamSleep/Class/CommunityModule/View/CommentReplyCell.m
...@@ -9,15 +9,12 @@ ...@@ -9,15 +9,12 @@
@implementation CommentReplyCell @implementation CommentReplyCell
- (void)awakeFromNib { - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
[super awakeFromNib]; if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
// Initialization code self.selectionStyle = UITableViewCellSelectionStyleNone;
} self.backgroundColor = DSClearColor;
}
- (void)setSelected:(BOOL)selected animated:(BOOL)animated { return self;
[super setSelected:selected animated:animated];
// Configure the view for the selected state
} }
@end @end
DreamSleep/DreamSleep/Class/CommunityModule/View/MessageNotiCell.h
...@@ -6,12 +6,13 @@ ...@@ -6,12 +6,13 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "MessageNotiModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
/// 消息中心顶部官方通知和点赞通知cell /// 消息中心顶部官方通知和点赞通知cell
@interface MessageNotiCell : UITableViewCell @interface MessageNotiCell : UITableViewCell
@property (nonatomic, strong) MessageNotiModel *messageNotiModel;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/View/MessageNotiCell.m
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
@property (nonatomic, strong) UIImageView *icon; @property (nonatomic, strong) UIImageView *icon;
@property (nonatomic, strong) UILabel *titleLab; @property (nonatomic, strong) UILabel *titleLab;
@property (nonatomic, strong) UILabel *detailLab; @property (nonatomic, strong) UILabel *detailLab;
@property (nonatomic, strong) UILabel *mesCountLab;
@end @end
@implementation MessageNotiCell @implementation MessageNotiCell
...@@ -23,23 +24,76 @@ ...@@ -23,23 +24,76 @@
[self.contentView addSubview:self.icon]; [self.contentView addSubview:self.icon];
[self.contentView addSubview:self.titleLab]; [self.contentView addSubview:self.titleLab];
[self.contentView addSubview:self.detailLab]; [self.contentView addSubview:self.detailLab];
[self.contentView addSubview:self.mesCountLab];
[self.icon mas_makeConstraints:^(MASConstraintMaker *make) { [self.icon mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.contentView).offset(30); make.left.equalTo(self.contentView).offset(15);
make.top.equalTo(self.contentView); make.top.equalTo(self.contentView).offset(18);
make.size.mas_equalTo(CGSizeMake(40, 40)); make.size.mas_equalTo(CGSizeMake(40, 40));
}]; }];
[self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.icon.mas_right).offset(14); make.left.equalTo(self.icon.mas_right).offset(12);
make.top.equalTo(self.icon); make.top.equalTo(self.icon);
make.right.equalTo(self.contentView).offset(-30); make.right.equalTo(self.contentView).offset(-50);
}]; }];
[self.detailLab mas_makeConstraints:^(MASConstraintMaker *make) { [self.detailLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.titleLab); make.left.equalTo(self.titleLab);
make.bottom.equalTo(self.icon); make.bottom.equalTo(self.icon);
make.right.equalTo(self.titleLab);
}];
[self.mesCountLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.centerY.equalTo(self.contentView);
make.right.equalTo(self.contentView).offset(-15);
make.size.mas_equalTo(CGSizeMake(20, 20));
}]; }];
} }
return self; return self;
} }
- (void)setMessageNotiModel:(MessageNotiModel *)messageNotiModel {
_messageNotiModel = messageNotiModel;
self.icon.image = [UIImage imageNamed:messageNotiModel.iconName];
self.titleLab.text = messageNotiModel.title;
self.detailLab.text = messageNotiModel.detail;
self.mesCountLab.hidden = !messageNotiModel.messageCount;
self.mesCountLab.text = [NSString stringWithFormat:@"%d", messageNotiModel.messageCount];
}
#pragma mark - lazy
- (UIImageView *)icon {
if (!_icon) {
_icon = [UIImageView new];
_icon.dk_alphaPicker = DKAlphaPickerWithAlphas(1, .5, .5);
[_icon cornerRadius:20];
}
return _icon;
}
- (UILabel *)titleLab {
if (!_titleLab) {
_titleLab = [UILabel labWithFont:BoldFont(15)];
_titleLab.dk_textColorPicker = DKColorPickerWithKey(Dk_TITLE);
}
return _titleLab;
}
- (UILabel *)detailLab {
if (!_detailLab) {
_detailLab = [UILabel labWithFont:SysFont(14)];
_detailLab.dk_textColorPicker = DKColorPickerWithColors(SubTitleColor, ColorFromHexA(0xFFFFFF, .5), DSWhite);
}
return _detailLab;
}
- (UILabel *)mesCountLab {
if (!_mesCountLab) {
_mesCountLab = [UILabel labWithTextColor:DSWhite font:SysFont(12)];
_mesCountLab.backgroundColor = ColorFromHex(0xF04B77);
_mesCountLab.textAlignment = NSTextAlignmentCenter;
[_mesCountLab cornerRadius:10];
}
return _mesCountLab;
}
@end @end
DreamSleep/DreamSleep/Class/CommunityModule/View/MessageNotiView.h
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@protocol MessageNotiViewDelegate <NSObject> @protocol MessageNotiViewDelegate <NSObject>
- (void)didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
@end @end
/// 消息通知view /// 消息通知view
......
DreamSleep/DreamSleep/Class/CommunityModule/View/MessageNotiView.m
...@@ -104,4 +104,10 @@ static int secFooterHeight = 8; ...@@ -104,4 +104,10 @@ static int secFooterHeight = 8;
} }
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (self.messageDelegate && [self.messageDelegate respondsToSelector:@selector(didSelectRowAtIndexPath:)]) {
[self.messageDelegate didSelectRowAtIndexPath:indexPath];
}
}
@end @end
DreamSleep/DreamSleep/Class/CommunityModule/View/PraiseCell.h 0 → 100644
//
// PraiseCell.h
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "BaseTableViewCell.h"
#import "PraiseModel.h"
NS_ASSUME_NONNULL_BEGIN
/// 点赞cell
@interface PraiseCell : BaseTableViewCell
@property (nonatomic, strong) PraiseModel *praiseModel;
@end
NS_ASSUME_NONNULL_END
DreamSleep/DreamSleep/Class/CommunityModule/View/PraiseCell.m 0 → 100644
//
// PraiseCell.m
// DreamSleep
//
// Created by peter on 2022/10/11.
//
#import "PraiseCell.h"
@interface PraiseCell ()
@property (nonatomic, strong) UIImageView *userIcon;
@property (nonatomic, strong) UILabel *userNameLab;
@property (nonatomic, strong) UILabel *timeLab;
@property (nonatomic, strong) UILabel *tipLab;
@property (nonatomic, strong) UILabel *contentLab;
@end
@implementation PraiseCell
- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
[self.contentView addSubview:self.userIcon];
[self.contentView addSubview:self.userNameLab];
[self.contentView addSubview:self.timeLab];
[self.contentView addSubview:self.tipLab];
[self.contentView addSubview:self.contentLab];
[self.userIcon mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.contentView).offset(15);
make.top.equalTo(self.contentView).offset(15);
make.size.mas_equalTo(CGSizeMake(40, 40));
}];
[self.timeLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.contentView).offset(18);
make.right.equalTo(self.contentView).offset(-15);
}];
[self.tipLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.userNameLab);
make.bottom.equalTo(self.userIcon);
}];
[self.contentLab mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.userIcon.mas_bottom).offset(7);
make.left.equalTo(self.contentView).offset(73);
}];
}
return self;
}
- (void)setPraiseModel:(PraiseModel *)praiseModel {
_praiseModel = praiseModel;
[self.userIcon yy_setImageWithURL:[NSURL URLWithString:praiseModel.user_profile] placeholder:[UIImage defaultPlaceholderWithSize:CGSizeMake(40, 40)]];
self.userNameLab.text = praiseModel.nick_name;
self.timeLab.text = praiseModel.publish_time;
[self.timeLab sizeToFit];
self.contentLab.text = praiseModel.content;
[self.userNameLab mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.userIcon.mas_right).offset(12);
make.top.equalTo(self.userIcon);
make.right.equalTo(self.timeLab.mas_left).offset(-30);
}];
}
#pragma mark - lazy
- (UIImageView *)userIcon {
if (!_userIcon) {
_userIcon = [UIImageView new];
[_userIcon cornerRadius:20];
_userIcon.dk_alphaPicker = DKAlphaPickerWithAlphas(1.f, 0.5f, 0.1f);
}
return _userIcon;
}
- (UILabel *)userNameLab {
if (!_userNameLab) {
_userNameLab = [UILabel labWithFont:BoldFont(15)];
_userNameLab.dk_textColorPicker = DKColorPickerWithKey(Dk_TITLE);
}
return _userNameLab;
}
- (UILabel *)timeLab {
if (!_timeLab) {
_timeLab = [UILabel labWithFont:SysFont(12)];
_timeLab.textAlignment = NSTextAlignmentRight;
_timeLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3), DSWhite);
}
return _timeLab;
}
- (UILabel *)tipLab {
if (!_tipLab) {
_tipLab = [UILabel labWithFont:SysFont(12)];
_tipLab.text = @"赞了你的动态";
_tipLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .3), DSWhite);
}
return _tipLab;
}
- (UILabel *)contentLab {
if (!_contentLab) {
_contentLab = [UILabel labWithFont:SysFont(14)];
_contentLab.dk_textColorPicker = DKColorPickerWithColors(SmallTextColor, ColorFromHexA(0xFFFFFF, .4), DSWhite);
}
return _contentLab;
}
@end
DreamSleep/DreamSleep/Resource/Assets.xcassets/Community/ic_xiaoxi_guanfangtongzhi.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "ic_xiaoxi_guanfangtongzhi.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_xiaoxi_guanfangtongzhi@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_xiaoxi_guanfangtongzhi@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DreamSleep/DreamSleep/Resource/Assets.xcassets/Community/ic_xiaoxi_shoudaodezan.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "ic_xiaoxi_shoudaodezan.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "ic_xiaoxi_shoudaodezan@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "ic_xiaoxi_shoudaodezan@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!