Steven il y a 1 jour
Parent
commit
c24b03142f
27 fichiers modifiés avec 44 ajouts et 118 suppressions
  1. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/home_message.imageset/home_message@2x.png
  2. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/home_message.imageset/home_message@3x.png
  3. 2 4
      KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/Controller/TenantNotiferCenterController.m
  4. 2 4
      KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m
  5. 1 3
      KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatAddressBodyView.m
  6. 1 3
      KulexiuForStudent/KulexiuForStudent/Module/Course/Controller/CourseViewController.m
  7. 1 5
      KulexiuForStudent/KulexiuForStudent/Module/Course/MusicRoom/View/MusicRoomStudentPageView.m
  8. 1 5
      KulexiuForStudent/KulexiuForStudent/Module/Course/VipCourse/View/ProgramCourseGroupBodyView.m
  9. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeAccompanyCourseView.m
  10. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeGroupCourseView.m
  11. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeLiveCourseView.m
  12. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVIPCourseView.m
  13. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVideoCourseView.m
  14. 2 4
      KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Controller/NotiferMessageViewController.m
  15. 2 3
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomeInformationBodyView.m
  16. 1 3
      KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomePageBodyView.m
  17. 1 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/AddressList/Controller/AddressListViewController.m
  18. 2 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m
  19. 2 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackListViewController.m
  20. 2 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkBodyView.m
  21. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/AccompanyCourseGroup/MyAccompanyCourseGroupView.m
  22. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/GroupCourseGroup/MyGroupCourseGroupView.m
  23. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/LiveCourseGroup/MyLiveCourseGroupView.m
  24. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MusicRoomCourseGroup/MyMusicRoomCourseGroupView.m
  25. 2 4
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m
  26. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VIPCourseGroup/MyVipCourseGroupView.m
  27. 2 6
      KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseGroup/MyVideoCourseGroupView.m

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/home_message.imageset/home_message@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Home/home_message.imageset/home_message@3x.png


+ 2 - 4
KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/Controller/TenantNotiferCenterController.m

@@ -93,10 +93,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 - (void)requestData {
     NSString *groupType = nil;

+ 2 - 4
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/Controller/GroupNoticeViewController.m

@@ -62,10 +62,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)viewWillAppear:(BOOL)animated {

+ 1 - 3
KulexiuForStudent/KulexiuForStudent/Module/Chat/View/ChatAddressBodyView.m

@@ -82,9 +82,7 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 1 - 3
KulexiuForStudent/KulexiuForStudent/Module/Course/Controller/CourseViewController.m

@@ -196,9 +196,7 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.scrollView.mj_header endRefreshing];
-    });
+    [self.scrollView.mj_header endRefreshing];
 }
 
 

+ 1 - 5
KulexiuForStudent/KulexiuForStudent/Module/Course/MusicRoom/View/MusicRoomStudentPageView.m

@@ -68,11 +68,7 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
 }
 
 

+ 1 - 5
KulexiuForStudent/KulexiuForStudent/Module/Course/VipCourse/View/ProgramCourseGroupBodyView.m

@@ -119,11 +119,7 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
 }
 
 

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeAccompanyCourseView.m

@@ -105,12 +105,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)requestData { // 趣纠课程

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeGroupCourseView.m

@@ -79,12 +79,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_header endRefreshing];
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeLiveCourseView.m

@@ -76,12 +76,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_header endRefreshing];
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVIPCourseView.m

@@ -105,12 +105,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)requestData { // VIP课程

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVideoCourseView.m

@@ -94,12 +94,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)requestData { // 视频课

+ 2 - 4
KulexiuForStudent/KulexiuForStudent/Module/Home/NoticeCenter/Controller/NotiferMessageViewController.m

@@ -159,10 +159,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)requestData {

+ 2 - 3
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomeInformationBodyView.m

@@ -61,10 +61,9 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_footer endRefreshing];
 }
+
 - (void)resetAndRefresh {
     [self configDefaultRefresh];
     [self.tableView reloadData];

+ 1 - 3
KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomePageView/HomePageBodyView.m

@@ -73,9 +73,7 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)requestData {

+ 1 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/AddressList/Controller/AddressListViewController.m

@@ -73,9 +73,7 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
 }
 
 - (void)requestData {

+ 2 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m

@@ -412,15 +412,14 @@
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     CGFloat space = scrollView.contentOffset.y;
-    if (space >= kNaviBarHeight) {
+    if (space > 10) {
         self.navView.backgroundColor = [UIColor whiteColor];
         self.navView.lineView.hidden = NO;
     }
     else {
         self.navView.lineView.hidden = YES;
         self.navView.backgroundColor = [UIColor clearColor];
-//        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
-//        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+
     }
 }
 

+ 2 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Feedback/Controller/FeedbackListViewController.m

@@ -121,10 +121,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)requestData {

+ 2 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/Homework/View/HomeworkBodyView.m

@@ -87,10 +87,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/AccompanyCourseGroup/MyAccompanyCourseGroupView.m

@@ -102,12 +102,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/GroupCourseGroup/MyGroupCourseGroupView.m

@@ -84,12 +84,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_header endRefreshing];
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/LiveCourseGroup/MyLiveCourseGroupView.m

@@ -84,12 +84,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_header endRefreshing];
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MusicRoomCourseGroup/MyMusicRoomCourseGroupView.m

@@ -100,12 +100,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 

+ 2 - 4
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m

@@ -69,10 +69,8 @@
 }
 
 - (void)endRefresh {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
+    [self.collectionView.mj_header endRefreshing];
+    [self.collectionView.mj_footer endRefreshing];
 }
 
 - (void)refreshAndRequestData {

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VIPCourseGroup/MyVipCourseGroupView.m

@@ -101,12 +101,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }
 
 

+ 2 - 6
KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseGroup/MyVideoCourseGroupView.m

@@ -97,12 +97,8 @@
 }
 
 - (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
+    [self.tableView.mj_header endRefreshing];
+    [self.tableView.mj_footer endRefreshing];
 }