Browse Source

bug和优化完成

Steven 3 years ago
parent
commit
401deb6e10
73 changed files with 437 additions and 208 deletions
  1. BIN
      KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate
  2. 32 16
      KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/course_cell.imageset/course_cell@2x.png
  4. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/course_cell.imageset/course_cell@3x.png
  5. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/message_all.imageset/message_all@2x.png
  6. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/message_all.imageset/message_all@3x.png
  7. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notice_cell.imageset/notice_cell@2x.png
  8. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notice_cell.imageset/notice_cell@3x.png
  9. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/Contents.json
  10. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@2x.png
  11. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@3x.png
  12. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/Contents.json
  13. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/notifer_course@2x.png
  14. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/notifer_course@3x.png
  15. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/Contents.json
  16. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/notifer_evaluate@2x.png
  17. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/notifer_evaluate@3x.png
  18. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/Contents.json
  19. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/notifer_groupChat@2x.png
  20. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/notifer_groupChat@3x.png
  21. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/Contents.json
  22. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/notifer_homework@2x.png
  23. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/notifer_homework@3x.png
  24. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/Contents.json
  25. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/notifer_income@2x.png
  26. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/notifer_income@3x.png
  27. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/Contents.json
  28. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/notifer_live@2x.png
  29. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/notifer_live@3x.png
  30. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/Contents.json
  31. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/notifer_musianAuth@2x.png
  32. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/notifer_musianAuth@3x.png
  33. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/Contents.json
  34. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/notifer_music@2x.png
  35. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/notifer_music@3x.png
  36. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/Contents.json
  37. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/notifer_teacherAuth@2x.png
  38. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/notifer_teacherAuth@3x.png
  39. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/Contents.json
  40. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/notifer_unknow@2x.png
  41. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/notifer_unknow@3x.png
  42. 22 0
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/Contents.json
  43. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/notifer_video@2x.png
  44. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/notifer_video@3x.png
  45. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/Contents.json
  46. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/notifer_vip@2x.png
  47. BIN
      KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/notifer_vip@3x.png
  48. 2 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h
  49. 3 1
      KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m
  50. 3 3
      KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch
  51. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m
  52. 4 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m
  53. 2 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/Model/TableCourseModel.h
  54. 16 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Course/Model/TableCourseModel.m
  55. 3 7
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m
  56. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/Controller/EvaluateDetailViewController.m
  57. 5 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/WithdrawViewController.m
  58. 10 11
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m
  59. 1 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.h
  60. 3 40
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.m
  61. 17 93
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.xib
  62. 36 6
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferMessageCell.m
  63. 8 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferMessageCell.xib
  64. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/VefiCodeLoginController.m
  65. 7 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m
  66. 1 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Model/StyleVideoModel.h
  67. 8 4
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Model/StyleVideoModel.m
  68. 14 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleVideoView.m
  69. 28 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleVideoView.xib
  70. 2 2
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/AccompanyCourseCell.m
  71. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m
  72. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m
  73. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyViewController.m

BIN
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 32 - 16
KulexiuForTeacher/KulexiuForTeacher.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -51,22 +51,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "570036BC-1F44-4D53-85E4-84993C8F7165"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForTeacher/Module/Home/Homework/View/HomeworkBodyView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "206"
-            endingLineNumber = "206"
-            landmarkName = "-tableView:didSelectRowAtIndexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "F6AE391F-E02C-4603-ACA6-42F574A4F88C"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
@@ -336,5 +320,37 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6BFAE737-EFF4-4FD5-ABCA-3C988B517CA0"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Home/EvaluateCourse/View/EvaluateCourseBodyView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "113"
+            endingLineNumber = "113"
+            landmarkName = "-requestData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "72B58754-F7FC-4CFF-A8B4-F0D4609A27DD"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "KulexiuForTeacher/Module/Mine/CreateStyle/Controller/MyStyleViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "76"
+            endingLineNumber = "76"
+            landmarkName = "-requestMyStyle"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/course_cell.imageset/course_cell@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/course_cell.imageset/course_cell@3x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/message_all.imageset/message_all@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/message_all.imageset/message_all@3x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notice_cell.imageset/notice_cell@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notice_cell.imageset/notice_cell@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_accompany@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_accompany@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_accompany.imageset/notifer_accompany@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_course@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_course@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/notifer_course@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_course.imageset/notifer_course@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_evaluate@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_evaluate@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/notifer_evaluate@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_evaluate.imageset/notifer_evaluate@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_groupChat@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_groupChat@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/notifer_groupChat@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_groupChat.imageset/notifer_groupChat@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_homework@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_homework@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/notifer_homework@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_homework.imageset/notifer_homework@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_income@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_income@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/notifer_income@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_income.imageset/notifer_income@3x.png


+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notice_cell.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "notice_cell@2x.png",
+      "filename" : "notifer_live@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "notice_cell@3x.png",
+      "filename" : "notifer_live@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/notifer_live@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_live.imageset/notifer_live@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_musianAuth@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_musianAuth@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/notifer_musianAuth@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_musianAuth.imageset/notifer_musianAuth@3x.png


+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/message_all.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "message_all@2x.png",
+      "filename" : "notifer_music@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "message_all@3x.png",
+      "filename" : "notifer_music@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/notifer_music@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_music.imageset/notifer_music@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_teacherAuth@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_teacherAuth@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/notifer_teacherAuth@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_teacherAuth.imageset/notifer_teacherAuth@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_unknow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_unknow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/notifer_unknow@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_unknow.imageset/notifer_unknow@3x.png


+ 22 - 0
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "notifer_video@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "notifer_video@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/notifer_video@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_video.imageset/notifer_video@3x.png


+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/course_cell.imageset/Contents.json → KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "course_cell@2x.png",
+      "filename" : "notifer_vip@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "course_cell@3x.png",
+      "filename" : "notifer_vip@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/notifer_vip@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MessageCenter/notifer_vip.imageset/notifer_vip@3x.png


+ 2 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.h

@@ -199,10 +199,11 @@ NS_ASSUME_NONNULL_BEGIN
  
  @param post post
  @param mobile 手机号码
+ @param type type    PASSWD  LOGIN BANK PHONE
  @param success 成功
  @param faliure 失败
  */
-+ (void)sendSmsRequest:(NSString *)post mobile:(NSString *)mobile success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)sendSmsRequest:(NSString *)post mobile:(NSString *)mobile type:(NSString *)type success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /api-teacher/code/verifyImageCode
 

+ 3 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/Base/KSNetworkingManager.m

@@ -566,13 +566,15 @@
  
  @param post post
  @param mobile 手机号码
+ @param type type
  @param success 成功
  @param faliure 失败
  */
-+ (void)sendSmsRequest:(NSString *)post mobile:(NSString *)mobile success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)sendSmsRequest:(NSString *)post mobile:(NSString *)mobile type:(NSString *)type success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodForm];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:mobile forKey:@"mobile"];
+    [parm setValue:type forKey:@"type"];
     NSString *url = [NSString stringWithFormat:@"%@%@",hostURL, @"/api-teacher/code/sendSmsCode"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];
 }

+ 3 - 3
KulexiuForTeacher/KulexiuForTeacher/Common/Define/PrefixHeader.pch

@@ -111,9 +111,9 @@ shouldPrevent = NO; \
 
 //#ifdef DEBUG
 
-#define hostURL (@"http://dev.colexiu.com")
-#define SEALCLASSHOST (@"http://dev.colexiu.com/api-im")
-#define WEBHOST (@"http://dev.colexiu.com/teacher")
+#define hostURL (@"https://dev.colexiu.com")
+#define SEALCLASSHOST (@"https://dev.colexiu.com/api-im")
+#define WEBHOST (@"https://dev.colexiu.com/teacher")
 //#define WEBHOST (@"http://192.168.3.13:5002")
 //#define WEBHOST (@"http://192.168.3.63:5000")
 

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Course/AccompanyCourse/Controller/AccompanyDetailViewController.m

@@ -106,7 +106,7 @@
 }
 
 - (void)requestEvaluateMessage {
-    [KSNetworkingManager selectRepliedRequest:KS_POST courseGroupId:self.courseId courseScheduleId:self.courseGroupId studentId:self.studentId success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager selectRepliedRequest:KS_POST courseGroupId:self.courseGroupId courseScheduleId:self.courseId studentId:self.studentId success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             self.evaluateModel = [[EvaluateDetailModel alloc] initWithDictionary:[dic dictionaryValueForKey:@"data"]];
         }

+ 4 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -81,6 +81,10 @@
     [self.navHeadView.navTitle setText:[formatter stringFromDate:date]];
     
     [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
     [self loadMonthCourse:self.chooseMonth];
     if (![NSString isEmptyString:self.chooseDay]) {
         [self getCourseByDate:self.chooseDay];

+ 2 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Course/Model/TableCourseModel.h

@@ -25,7 +25,8 @@
 @property (nonatomic, strong) NSString *name;
 @property (nonatomic, strong) NSString *startTime;
 @property (nonatomic, strong) NSString *imGroupId;
-
+@property (nonatomic, strong) NSString *studentReplied;
+@property (nonatomic, strong) NSString *teacherReplied;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

+ 16 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Course/Model/TableCourseModel.m

@@ -22,6 +22,8 @@ NSString *const kTableCourseModelCourseType = @"courseType";
 NSString *const kTableCourseModelName = @"name";
 NSString *const kTableCourseModelStartTime = @"startTime";
 NSString *const kTableCourseModelImGroupId = @"imGroupId";
+NSString *const kTableCourseModelStudentReplied= @"studentReplied";
+NSString *const kTableCourseModelTeacherReplied = @"teacherReplied";
 
 @interface TableCourseModel ()
 
@@ -45,6 +47,8 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
 @synthesize name = _name;
 @synthesize startTime = _startTime;
 @synthesize imGroupId = _imGroupId;
+@synthesize teacherReplied = _teacherReplied;
+@synthesize studentReplied = _studentReplied;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -71,7 +75,9 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
             self.courseType = [self objectOrNilForKey:kTableCourseModelCourseType fromDictionary:dict];
             self.name = [self objectOrNilForKey:kTableCourseModelName fromDictionary:dict];
             self.startTime = [self objectOrNilForKey:kTableCourseModelStartTime fromDictionary:dict];
-        self.imGroupId = [self objectOrNilForKey:kTableCourseModelImGroupId fromDictionary:dict];
+            self.imGroupId = [self objectOrNilForKey:kTableCourseModelImGroupId fromDictionary:dict];
+            self.teacherReplied = [self objectOrNilForKey:kTableCourseModelTeacherReplied fromDictionary:dict];
+            self.studentReplied = [self objectOrNilForKey:kTableCourseModelStudentReplied fromDictionary:dict];
     }
     
     return self;
@@ -95,6 +101,9 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
     [mutableDict setValue:self.name forKey:kTableCourseModelName];
     [mutableDict setValue:self.startTime forKey:kTableCourseModelStartTime];
     [mutableDict setValue:self.imGroupId forKey:kTableCourseModelImGroupId];
+    [mutableDict setValue:self.teacherReplied forKey:kTableCourseModelTeacherReplied];
+    [mutableDict setValue:self.studentReplied forKey:kTableCourseModelStudentReplied];
+    
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -135,6 +144,8 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
     self.name = [aDecoder decodeObjectForKey:kTableCourseModelName];
     self.startTime = [aDecoder decodeObjectForKey:kTableCourseModelStartTime];
     self.imGroupId = [aDecoder decodeObjectForKey:kTableCourseModelImGroupId];
+    self.studentReplied = [aDecoder decodeObjectForKey:kTableCourseModelStudentReplied];
+    self.teacherReplied = [aDecoder decodeObjectForKey:kTableCourseModelTeacherReplied];
     return self;
 }
 
@@ -155,6 +166,8 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
     [aCoder encodeObject:_name forKey:kTableCourseModelName];
     [aCoder encodeObject:_startTime forKey:kTableCourseModelStartTime];
     [aCoder encodeObject:_imGroupId forKey:kTableCourseModelImGroupId];
+    [aCoder encodeObject:_studentReplied forKey:kTableCourseModelStudentReplied];
+    [aCoder encodeObject:_teacherReplied forKey:kTableCourseModelTeacherReplied];
     
 }
 
@@ -178,6 +191,8 @@ NSString *const kTableCourseModelImGroupId = @"imGroupId";
         copy.name = [self.name copyWithZone:zone];
         copy.startTime = [self.startTime copyWithZone:zone];
         copy.imGroupId = [self.imGroupId copyWithZone:zone];
+        copy.teacherReplied = [self.teacherReplied copyWithZone:zone];
+        copy.studentReplied = [self.studentReplied copyWithZone:zone];
     }
     
     return copy;

+ 3 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -222,14 +222,14 @@
     [self.noticeScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.bottom.mas_equalTo(self.noticeView.adView);
     }];
-    
+    self.noticeView.hidden = YES;
     [self.scrollView addSubview:self.courseView];
     [self.courseView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.noticeView.mas_bottom);
         make.height.mas_equalTo(CGFLOAT_MIN);
     }];
-    
+    self.courseView.hidden = YES;
     [self.scrollView addSubview:self.bodyView];
     CGFloat bodyViewHeight = [self.bodyView getViewHeight];
     [self.bodyView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -255,7 +255,6 @@
             NSArray *countArray = [dic arrayValueForKey:@"data"];
             NSInteger courseCount = 0;
             NSInteger sysCount = 0;
-            NSInteger noticeCount = 0;
             for (NSDictionary *parm in countArray) {
                 if ([[parm stringValueForKey:@"key"] isEqualToString:@"COURSE"]) {
                     courseCount = [parm integerValueForKey:@"value"];
@@ -263,11 +262,8 @@
                 if ([[parm stringValueForKey:@"key"] isEqualToString:@"SYSTEM"]) {
                     sysCount = [parm integerValueForKey:@"value"];
                 }
-                if ([[parm stringValueForKey:@"key"] isEqualToString:@"NOTICE"]) {
-                    noticeCount = [parm integerValueForKey:@"value"];
-                }
             }
-            if (courseCount != 0 || sysCount != 0 || noticeCount != 0) {
+            if (courseCount != 0 || sysCount != 0) {
                 self.navView.dotView.hidden = NO;
             }
             else {

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/EvaluateCourse/Controller/EvaluateDetailViewController.m

@@ -44,7 +44,7 @@
 
 - (void)requestData {
     [self showhud];
-    [KSNetworkingManager selectRepliedRequest:KS_POST courseGroupId:self.courseId courseScheduleId:self.courseGroupId studentId:self.studentId success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager selectRepliedRequest:KS_POST courseGroupId:self.courseGroupId courseScheduleId:self.courseId studentId:self.studentId success:^(NSDictionary * _Nonnull dic) {
         [self removehub];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             self.detailModel = [[EvaluateDetailModel alloc] initWithDictionary:[dic dictionaryValueForKey:@"data"]];

+ 5 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/WithdrawViewController.m

@@ -98,6 +98,11 @@
         [self MBPShow:@"请输入提现金额"];
         return;
     }
+    if ([amountString doubleValue] <= self.drawModel.withdrawalServiceFee) {
+        [self MBPShow:@"提现金额需要大于手续费"];
+        return;
+    }
+    
     [self showhud];
     [KSNetworkingManager withdrawalRequest:KS_POST amountWithdrawal:[amountString doubleValue] bankCardId:[NSString stringWithFormat:@"%.0f",self.drawModel.userBankCard.userBankCardIdentifier] success:^(NSDictionary * _Nonnull dic) {
         [self removehub];

+ 10 - 11
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/Controller/NotiferMessageViewController.m

@@ -22,6 +22,8 @@
 
 @property (nonatomic, strong) NSString *groupType;
 
+@property (nonatomic, assign) BOOL hasUnreadCount;
+
 @end
 
 @implementation NotiferMessageViewController
@@ -32,6 +34,7 @@
     [self allocTitle:@"消息盒子"];
     [self configRightButton];
     [self configUI];
+    self.hasUnreadCount = NO;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -58,6 +61,9 @@
 }
 
 - (void)rightBtnClick {
+    if (self.hasUnreadCount == NO) {
+        return;
+    }
     [KSNetworkingManager batchSetReadRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             [self MBPShow:@"清除成功"];
@@ -112,7 +118,6 @@
             NSArray *countArray = [dic arrayValueForKey:@"data"];
             NSInteger courseCount = 0;
             NSInteger sysCount = 0;
-            NSInteger noticeCount = 0;
             for (NSDictionary *parm in countArray) {
                 if ([[parm stringValueForKey:@"key"] isEqualToString:@"COURSE"]) {
                     courseCount = [parm integerValueForKey:@"value"];
@@ -120,12 +125,11 @@
                 if ([[parm stringValueForKey:@"key"] isEqualToString:@"SYSTEM"]) {
                     sysCount = [parm integerValueForKey:@"value"];
                 }
-                if ([[parm stringValueForKey:@"key"] isEqualToString:@"NOTICE"]) {
-                    noticeCount = [parm integerValueForKey:@"value"];
-                }
             }
-            
-            [self.headView configUnreadCountCourse:courseCount sysMessage:sysCount noticeCount:noticeCount];
+            if (courseCount > 0 || sysCount > 0) {
+                self.hasUnreadCount = YES;
+            }
+            [self.headView configUnreadCountCourse:courseCount sysMessage:sysCount];
         }
         else {
             [self MBPShow:MESSAGEKEY];
@@ -292,11 +296,6 @@
             self.groupType = @"SYSTEM";
         }
             break;
-        case NOTIFER_TYPE_NOTICE:
-        {
-            self.groupType = @"NOTICE";
-        }
-            break;
         default:
             break;
     }

+ 1 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.h

@@ -11,7 +11,6 @@ typedef NS_ENUM(NSInteger, NOTIFER_TYPE) {
     NOTIFER_TYPE_ALL,
     NOTIFER_TYPE_COURSE,
     NOTIFER_TYPE_SYSMSG,
-    NOTIFER_TYPE_NOTICE,
 };
 
 typedef void(^NotiferChooseAction)(NOTIFER_TYPE type);
@@ -23,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)shareIntance;
 
-- (void)configUnreadCountCourse:(NSInteger)courseCount sysMessage:(NSInteger)sysMessageCount noticeCount:(NSInteger)noticeCount;
+- (void)configUnreadCountCourse:(NSInteger)courseCount sysMessage:(NSInteger)sysMessageCount;
 
 - (void)chooseTypeCallback:(NotiferChooseAction)callback;
 

+ 3 - 40
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.m

@@ -21,9 +21,6 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *systemLabel;
 
-@property (weak, nonatomic) IBOutlet UIView *noticeView;
-
-@property (weak, nonatomic) IBOutlet UILabel *noticeLabel;
 
 @property (nonatomic, assign) NOTIFER_TYPE type;
 
@@ -32,7 +29,6 @@
 @property (weak, nonatomic) IBOutlet UILabel *allCountLabel;
 @property (weak, nonatomic) IBOutlet UILabel *courseCountLabel;
 @property (weak, nonatomic) IBOutlet UILabel *systemCountLabel;
-@property (weak, nonatomic) IBOutlet UILabel *noticeCountLabel;
 
 @end
 
@@ -44,7 +40,7 @@
 
 - (void)configDefault {
     self.type = NOTIFER_TYPE_ALL;
-    [self configUnreadCountCourse:0 sysMessage:0 noticeCount:0];
+    [self configUnreadCountCourse:0 sysMessage:0];
 }
 
 + (instancetype)shareIntance {
@@ -58,8 +54,8 @@
     }
 }
 
-- (void)configUnreadCountCourse:(NSInteger)courseCount sysMessage:(NSInteger)sysMessageCount noticeCount:(NSInteger)noticeCount {
-    NSInteger allCount = courseCount + sysMessageCount + noticeCount;
+- (void)configUnreadCountCourse:(NSInteger)courseCount sysMessage:(NSInteger)sysMessageCount {
+    NSInteger allCount = courseCount + sysMessageCount;
     // 全部
     if (allCount <= 0) {
         self.allView.hidden = YES;
@@ -106,22 +102,6 @@
         }
         self.systemCountLabel.text = countString;
     }
-    
-    // 公共
-    if (noticeCount == 0) {
-        self.noticeView.hidden = YES;
-    }
-    else {
-        self.noticeView.hidden = NO;
-        NSString *countString = @"";
-        if (noticeCount > 99) {
-            countString = @"99+";
-        }
-        else {
-            countString = [NSString stringWithFormat:@"%zd",noticeCount];
-        }
-        self.noticeCountLabel.text = countString;
-    }
 }
 
 
@@ -146,12 +126,6 @@
     }
 }
 
-- (IBAction)chooseNotice:(id)sender {
-    self.type = NOTIFER_TYPE_NOTICE;
-    if (self.callback) {
-        self.callback(self.type);
-    }
-}
 
 - (void)setType:(NOTIFER_TYPE)type {
     _type = type;
@@ -161,7 +135,6 @@
             self.allLabel.textColor = HexRGB(0x3333333);
             self.courseLabel.textColor = HexRGB(0x999999);
             self.systemLabel.textColor = HexRGB(0x999999);
-            self.noticeLabel.textColor = HexRGB(0x999999);
         }
             break;
         case NOTIFER_TYPE_COURSE:
@@ -169,7 +142,6 @@
             self.allLabel.textColor = HexRGB(0x999999);
             self.courseLabel.textColor = HexRGB(0x3333333);
             self.systemLabel.textColor = HexRGB(0x999999);
-            self.noticeLabel.textColor = HexRGB(0x999999);
         }
             break;
         case NOTIFER_TYPE_SYSMSG:
@@ -177,15 +149,6 @@
             self.allLabel.textColor = HexRGB(0x999999);
             self.courseLabel.textColor = HexRGB(0x999999);
             self.systemLabel.textColor = HexRGB(0x3333333);
-            self.noticeLabel.textColor = HexRGB(0x999999);
-        }
-            break;
-        case NOTIFER_TYPE_NOTICE:
-        {
-            self.allLabel.textColor = HexRGB(0x999999);
-            self.courseLabel.textColor = HexRGB(0x999999);
-            self.systemLabel.textColor = HexRGB(0x999999);
-            self.noticeLabel.textColor = HexRGB(0x3333333);
         }
             break;
         default:

+ 17 - 93
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferHeadView.xib

@@ -17,23 +17,23 @@
                     <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pkz-EP-p4Q">
-                            <rect key="frame" x="27" y="0.0" width="80.5" height="100"/>
+                            <rect key="frame" x="0.0" y="0.0" width="125" height="100"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="message_all" translatesAutoresizingMaskIntoConstraints="NO" id="N8l-kR-aoj">
-                                    <rect key="frame" x="12" y="22" width="56" height="56"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="56"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="56" id="3Wd-gG-xg9"/>
                                         <constraint firstAttribute="width" constant="56" id="E7d-pn-3mD"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aal-ZD-MlT">
-                                    <rect key="frame" x="27.5" y="79" width="25" height="14.5"/>
+                                    <rect key="frame" x="50" y="79" width="25" height="14.5"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TI9-h7-JQo">
-                                    <rect key="frame" x="52.5" y="54" width="15.5" height="14"/>
+                                    <rect key="frame" x="75" y="54" width="15.5" height="14"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5M-E8-SSs">
                                             <rect key="frame" x="4" y="0.0" width="7.5" height="14"/>
@@ -63,7 +63,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hxb-AV-79g">
-                                    <rect key="frame" x="12" y="22" width="56" height="71.5"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="71.5"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="chooseAll:" destination="iN0-l3-epB" eventType="touchUpInside" id="gxr-MQ-ykS"/>
@@ -85,23 +85,23 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kR0-tA-2uF">
-                            <rect key="frame" x="107.5" y="0.0" width="80" height="100"/>
+                            <rect key="frame" x="125" y="0.0" width="125" height="100"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="message_course" translatesAutoresizingMaskIntoConstraints="NO" id="8Z5-lf-RVU">
-                                    <rect key="frame" x="12" y="22" width="56" height="56"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="56"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="56" id="bfW-hq-s3W"/>
                                         <constraint firstAttribute="height" constant="56" id="yLb-Jd-Kfp"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ql-22-T6t">
-                                    <rect key="frame" x="15" y="79" width="49.5" height="14.5"/>
+                                    <rect key="frame" x="38" y="79" width="49.5" height="14.5"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oMw-71-EQZ">
-                                    <rect key="frame" x="52.5" y="54" width="15.5" height="14"/>
+                                    <rect key="frame" x="75" y="54" width="15.5" height="14"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Ev-de-Era">
                                             <rect key="frame" x="4" y="0.0" width="7.5" height="14"/>
@@ -131,7 +131,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XuM-Lg-sm7">
-                                    <rect key="frame" x="12" y="22" width="56" height="71.5"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="71.5"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="chooseCourse:" destination="iN0-l3-epB" eventType="touchUpInside" id="bWc-aR-VJd"/>
@@ -153,23 +153,23 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QCV-gH-UT2">
-                            <rect key="frame" x="187.5" y="0.0" width="80.5" height="100"/>
+                            <rect key="frame" x="250" y="0.0" width="125" height="100"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="message_system" translatesAutoresizingMaskIntoConstraints="NO" id="ALm-DM-xIP">
-                                    <rect key="frame" x="12" y="22" width="56" height="56"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="56"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="56" id="Av4-mU-hXq"/>
                                         <constraint firstAttribute="height" constant="56" id="gta-F5-xNK"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="系统消息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZT2-JL-dMl">
-                                    <rect key="frame" x="15.5" y="79" width="49.5" height="14.5"/>
+                                    <rect key="frame" x="38" y="79" width="49.5" height="14.5"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PnS-8p-3Z9">
-                                    <rect key="frame" x="52.5" y="54" width="15.5" height="14"/>
+                                    <rect key="frame" x="75" y="54" width="15.5" height="14"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="43u-at-Vor">
                                             <rect key="frame" x="4" y="0.0" width="7.5" height="14"/>
@@ -199,7 +199,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="03g-eS-bHv">
-                                    <rect key="frame" x="12" y="22" width="56" height="71.5"/>
+                                    <rect key="frame" x="34.5" y="22" width="56" height="71.5"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <connections>
                                         <action selector="chooseSystem:" destination="iN0-l3-epB" eventType="touchUpInside" id="baU-me-4pJ"/>
@@ -220,74 +220,6 @@
                                 <constraint firstItem="ZT2-JL-dMl" firstAttribute="bottom" secondItem="03g-eS-bHv" secondAttribute="bottom" id="voU-Gi-fym"/>
                             </constraints>
                         </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fQd-6C-OHk">
-                            <rect key="frame" x="268" y="0.0" width="80" height="100"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="message_notice" translatesAutoresizingMaskIntoConstraints="NO" id="pZt-Oo-gp5">
-                                    <rect key="frame" x="12" y="22" width="56" height="56"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="56" id="Kv2-rZ-mvB"/>
-                                        <constraint firstAttribute="width" constant="56" id="PgP-KG-Z5c"/>
-                                    </constraints>
-                                </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="公告" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HPj-WQ-UEe">
-                                    <rect key="frame" x="27.5" y="79" width="25" height="14.5"/>
-                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                                    <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HFT-lc-XxE">
-                                    <rect key="frame" x="52.5" y="54" width="15.5" height="14"/>
-                                    <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSf-NN-z0H">
-                                            <rect key="frame" x="4" y="0.0" width="7.5" height="14"/>
-                                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
-                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                    <color key="backgroundColor" red="1" green="0.074509803920000006" blue="0.074509803920000006" alpha="1" colorSpace="calibratedRGB"/>
-                                    <constraints>
-                                        <constraint firstAttribute="bottom" secondItem="eSf-NN-z0H" secondAttribute="bottom" id="Ao6-V2-K7x"/>
-                                        <constraint firstAttribute="trailing" secondItem="eSf-NN-z0H" secondAttribute="trailing" constant="4" id="P8c-bz-7La"/>
-                                        <constraint firstItem="eSf-NN-z0H" firstAttribute="top" secondItem="HFT-lc-XxE" secondAttribute="top" id="g29-vT-Syl"/>
-                                        <constraint firstItem="eSf-NN-z0H" firstAttribute="leading" secondItem="HFT-lc-XxE" secondAttribute="leading" constant="4" id="lcq-U7-od2"/>
-                                        <constraint firstAttribute="height" constant="14" id="nVm-N4-ebc"/>
-                                    </constraints>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                            <real key="value" value="7"/>
-                                        </userDefinedRuntimeAttribute>
-                                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                            <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        </userDefinedRuntimeAttribute>
-                                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                            <real key="value" value="1"/>
-                                        </userDefinedRuntimeAttribute>
-                                    </userDefinedRuntimeAttributes>
-                                </view>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gMB-qb-caO">
-                                    <rect key="frame" x="12" y="22" width="56" height="71.5"/>
-                                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                    <connections>
-                                        <action selector="chooseNotice:" destination="iN0-l3-epB" eventType="touchUpInside" id="NbI-SQ-tv4"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstItem="pZt-Oo-gp5" firstAttribute="trailing" secondItem="gMB-qb-caO" secondAttribute="trailing" id="04x-KE-Efe"/>
-                                <constraint firstItem="HFT-lc-XxE" firstAttribute="trailing" secondItem="pZt-Oo-gp5" secondAttribute="trailing" id="1Ki-Zu-wQ9"/>
-                                <constraint firstItem="pZt-Oo-gp5" firstAttribute="centerY" secondItem="fQd-6C-OHk" secondAttribute="centerY" id="6Uc-tu-c8E"/>
-                                <constraint firstItem="pZt-Oo-gp5" firstAttribute="centerX" secondItem="fQd-6C-OHk" secondAttribute="centerX" id="DGp-cN-87P"/>
-                                <constraint firstItem="HFT-lc-XxE" firstAttribute="bottom" secondItem="pZt-Oo-gp5" secondAttribute="bottom" constant="-10" id="DId-eC-xtY"/>
-                                <constraint firstItem="pZt-Oo-gp5" firstAttribute="top" secondItem="gMB-qb-caO" secondAttribute="top" id="I11-F0-hN5"/>
-                                <constraint firstItem="HPj-WQ-UEe" firstAttribute="centerX" secondItem="pZt-Oo-gp5" secondAttribute="centerX" id="QTq-0M-Qj2"/>
-                                <constraint firstItem="pZt-Oo-gp5" firstAttribute="leading" secondItem="gMB-qb-caO" secondAttribute="leading" id="TY7-WD-hzE"/>
-                                <constraint firstItem="HPj-WQ-UEe" firstAttribute="bottom" secondItem="gMB-qb-caO" secondAttribute="bottom" id="dYO-dM-HQn"/>
-                                <constraint firstItem="HPj-WQ-UEe" firstAttribute="top" secondItem="pZt-Oo-gp5" secondAttribute="bottom" constant="1" id="yJD-DK-Eqd"/>
-                            </constraints>
-                        </view>
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
@@ -295,16 +227,12 @@
                         <constraint firstItem="QCV-gH-UT2" firstAttribute="leading" secondItem="kR0-tA-2uF" secondAttribute="trailing" id="5XL-gG-2d1"/>
                         <constraint firstItem="QCV-gH-UT2" firstAttribute="top" secondItem="3Jh-gC-egy" secondAttribute="top" id="83M-kH-ZX2"/>
                         <constraint firstAttribute="bottom" secondItem="QCV-gH-UT2" secondAttribute="bottom" id="9n2-1w-ajk"/>
-                        <constraint firstAttribute="bottom" secondItem="fQd-6C-OHk" secondAttribute="bottom" id="CkM-y7-C53"/>
-                        <constraint firstItem="fQd-6C-OHk" firstAttribute="leading" secondItem="QCV-gH-UT2" secondAttribute="trailing" id="ICS-ae-fgD"/>
                         <constraint firstItem="kR0-tA-2uF" firstAttribute="top" secondItem="3Jh-gC-egy" secondAttribute="top" id="Krt-V9-C5o"/>
                         <constraint firstItem="kR0-tA-2uF" firstAttribute="width" secondItem="Pkz-EP-p4Q" secondAttribute="width" id="KwJ-3g-Oyd"/>
-                        <constraint firstItem="fQd-6C-OHk" firstAttribute="width" secondItem="Pkz-EP-p4Q" secondAttribute="width" id="Lam-1s-b14"/>
-                        <constraint firstItem="fQd-6C-OHk" firstAttribute="top" secondItem="3Jh-gC-egy" secondAttribute="top" id="OmA-Vs-5a4"/>
+                        <constraint firstItem="Pkz-EP-p4Q" firstAttribute="leading" secondItem="3Jh-gC-egy" secondAttribute="leading" id="LuT-hz-fdo"/>
                         <constraint firstItem="QCV-gH-UT2" firstAttribute="width" secondItem="Pkz-EP-p4Q" secondAttribute="width" id="UDC-kF-oA1"/>
                         <constraint firstAttribute="bottom" secondItem="Pkz-EP-p4Q" secondAttribute="bottom" id="Xe3-qK-0uc"/>
-                        <constraint firstAttribute="trailing" secondItem="fQd-6C-OHk" secondAttribute="trailing" constant="27" id="an7-AV-hCa"/>
-                        <constraint firstItem="Pkz-EP-p4Q" firstAttribute="leading" secondItem="3Jh-gC-egy" secondAttribute="leading" constant="27" id="gwc-XA-mID"/>
+                        <constraint firstAttribute="trailing" secondItem="QCV-gH-UT2" secondAttribute="trailing" id="b1S-jd-raB"/>
                         <constraint firstItem="Pkz-EP-p4Q" firstAttribute="top" secondItem="3Jh-gC-egy" secondAttribute="top" id="hzy-aK-mPq"/>
                         <constraint firstAttribute="bottom" secondItem="kR0-tA-2uF" secondAttribute="bottom" id="igt-71-5Ke"/>
                     </constraints>
@@ -327,9 +255,6 @@
                 <outlet property="courseCountLabel" destination="0Ev-de-Era" id="cKf-js-cO3"/>
                 <outlet property="courseLabel" destination="8Ql-22-T6t" id="8Fh-PC-Qtm"/>
                 <outlet property="courseView" destination="oMw-71-EQZ" id="UtK-s0-Kf4"/>
-                <outlet property="noticeCountLabel" destination="eSf-NN-z0H" id="7yQ-Yb-0Zz"/>
-                <outlet property="noticeLabel" destination="HPj-WQ-UEe" id="i39-mh-PC6"/>
-                <outlet property="noticeView" destination="HFT-lc-XxE" id="AEn-pk-RrT"/>
                 <outlet property="systemCountLabel" destination="43u-at-Vor" id="FPQ-la-BzB"/>
                 <outlet property="systemLabel" destination="ZT2-JL-dMl" id="XSb-em-5Kr"/>
                 <outlet property="systemView" destination="PnS-8p-3Z9" id="QV4-d4-ySy"/>
@@ -340,7 +265,6 @@
     <resources>
         <image name="message_all" width="56" height="56"/>
         <image name="message_course" width="56" height="56"/>
-        <image name="message_notice" width="56" height="56"/>
         <image name="message_system" width="56" height="56"/>
     </resources>
 </document>

+ 36 - 6
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferMessageCell.m

@@ -48,15 +48,45 @@
     [paragraphStyle setLineSpacing:4];//调整行间距
     NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:messgage attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x7a7a7a)}];
     self.descMessageLabel.attributedText = attrStr;
-    if ([model.group isEqualToString:@"COURSE"]) {
-        [self.messageTypeView setImage:[UIImage imageNamed:@"course_cell"]];
+}
+
+- (NSString *)getTypeImageWithSubType:(NSString *)subType {
+    NSString *typeImg = @"";
+    if ([subType isEqualToString:@"TEACHER_AUTH"]) {
+        typeImg = @"notifer_teacherAuth";
+    }
+    else if ([subType isEqualToString:@"MUSICIAN_AUTH"]) {
+        typeImg = @"notifer_musianAuth";
+    }
+    else if ([subType isEqualToString:@"PRACTICE"]) {
+        typeImg = @"notifer_accompany";
+    }
+    else if ([subType isEqualToString:@"LIVE"]) {
+        typeImg = @"notifer_live";
+    }
+    else if ([subType isEqualToString:@"VIDEO"]) {
+        typeImg = @"notifer_video";
     }
-    else if ([model.group isEqualToString:@"SYSTEM"]) {
-        [self.messageTypeView setImage:[UIImage imageNamed:@"system_cell"]];
+    else if ([subType isEqualToString:@"MUSIC_SHEET"]) {
+        typeImg = @"notifer_music";
     }
-    else if ([model.group isEqualToString:@"NOTICE"]) {
-        [self.messageTypeView setImage:[UIImage imageNamed:@"notice_cell"]];
+    else if ([subType isEqualToString:@"INCOME"]) {
+        typeImg = @"notifer_income";
     }
+    else if ([subType isEqualToString:@"HOMEWORK"]) {
+        typeImg = @"notifer_homework";
+    }
+    else if ([subType isEqualToString:@"EVALUATE"]) {
+        typeImg = @"notifer_evaluate";
+    }
+    else if ([subType isEqualToString:@"GROUP_CHAT"]) {
+        typeImg = @"notifer_groupChat";
+    }
+    else if ([subType isEqualToString:@"VIP"]) {
+        typeImg = @"notifer_vip";
+    }
+    
+    return typeImg;
 }
 
 - (void)setIsRead:(BOOL)isRead {

+ 8 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Home/NotiferMessage/View/NotiferMessageCell.xib

@@ -29,7 +29,7 @@
                         </userDefinedRuntimeAttributes>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上课提醒" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dWN-rA-dKm">
-                        <rect key="frame" x="70" y="22" width="66" height="22"/>
+                        <rect key="frame" x="70" y="22" width="65.5" height="22"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="22" id="Amz-LZ-Qr5"/>
                         </constraints>
@@ -43,14 +43,17 @@
                         <color key="textColor" red="0.47843137254901957" green="0.47843137254901957" blue="0.47843137254901957" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2022-3-25" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PnY-EC-LkF">
-                        <rect key="frame" x="350" y="26" width="59" height="14"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2022-3-25" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PnY-EC-LkF">
+                        <rect key="frame" x="334" y="26" width="75" height="14"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="75" id="icV-kD-Q85"/>
+                        </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="heX-9o-hn0">
-                        <rect key="frame" x="141" y="19" width="6" height="6"/>
+                        <rect key="frame" x="140.5" y="19" width="6" height="6"/>
                         <color key="backgroundColor" red="1" green="0.074509803921568626" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="6" id="4aE-tI-b0y"/>
@@ -75,6 +78,7 @@
                     <constraint firstItem="aCp-hw-uSQ" firstAttribute="top" secondItem="dWN-rA-dKm" secondAttribute="bottom" constant="2" id="X0T-fD-Ccl"/>
                     <constraint firstAttribute="trailing" secondItem="aCp-hw-uSQ" secondAttribute="trailing" constant="16" id="YQg-oV-3Kc"/>
                     <constraint firstItem="3FS-75-ZgU" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="j1p-Kp-mXl"/>
+                    <constraint firstItem="PnY-EC-LkF" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dWN-rA-dKm" secondAttribute="trailing" constant="10" id="kp1-WL-fZj"/>
                     <constraint firstAttribute="trailing" secondItem="PnY-EC-LkF" secondAttribute="trailing" constant="16" id="qnJ-3l-15h"/>
                 </constraints>
             </tableViewCellContentView>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Login/Controller/VefiCodeLoginController.m

@@ -81,7 +81,7 @@
 
 - (void)queryVefiCode {
     [self showhud];
-    [KSNetworkingManager sendSmsRequest:KS_POST mobile:self.phoneNo success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager sendSmsRequest:KS_POST mobile:self.phoneNo type:@"LOGIN" success:^(NSDictionary * _Nonnull dic) {
         [self removehub];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             [self MBPShow:@"验证码已发送"];

+ 7 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -20,6 +20,7 @@
 #import "MyLiveCourseViewController.h"
 #import "MyStyleViewController.h"
 #import "MyBankCardViewController.h"
+#import "MyCourseViewController.h"
 
 
 @interface MineViewController ()
@@ -214,14 +215,16 @@
             [self.navigationController pushViewController:webCtrl animated:YES];
         }
             break;
-        case MINEVIEWTYPE_FINISHCOURSE:
+        case MINEVIEWTYPE_FINISHCOURSE: // 我的课程
         {
-            
+            MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+            [self.navigationController pushViewController:ctrl animated:YES];
         }
             break;
-        case MINEVIEWTYPE_UNFINISHCOURSE:
+        case MINEVIEWTYPE_UNFINISHCOURSE: // 我的课程
         {
-            
+            MyCourseViewController *ctrl = [[MyCourseViewController alloc] init];
+            [self.navigationController pushViewController:ctrl animated:YES];
         }
             break;
         default:

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Model/StyleVideoModel.h

@@ -19,6 +19,7 @@
 @property (nonatomic, strong) NSString *videoUrl;
 @property (nonatomic, strong) NSString *createTime;
 @property (nonatomic, assign) BOOL isChooseVideo; // 是否本地选择的视频
+@property (nonatomic, strong) NSString *authStatus;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;

+ 8 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/Model/StyleVideoModel.m

@@ -15,7 +15,7 @@ NSString *const kStyleVideoModelUpdateTime = @"updateTime";
 NSString *const kStyleVideoModelDescribe = @"describe";
 NSString *const kStyleVideoModelVideoUrl = @"videoUrl";
 NSString *const kStyleVideoModelCreateTime = @"createTime";
-
+NSString *const kStyleVideoModelAuthStatus = @"authStatus";
 
 @interface StyleVideoModel ()
 
@@ -32,7 +32,7 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
 @synthesize describe = _describe;
 @synthesize videoUrl = _videoUrl;
 @synthesize createTime = _createTime;
-
+@synthesize authStatus = _authStatus;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -53,7 +53,7 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
             self.describe = [self objectOrNilForKey:kStyleVideoModelDescribe fromDictionary:dict];
             self.videoUrl = [self objectOrNilForKey:kStyleVideoModelVideoUrl fromDictionary:dict];
             self.createTime = [self objectOrNilForKey:kStyleVideoModelCreateTime fromDictionary:dict];
-
+            self.authStatus = [self objectOrNilForKey:kStyleVideoModelAuthStatus fromDictionary:dict];
     }
     
     return self;
@@ -70,7 +70,8 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
     [mutableDict setValue:self.describe forKey:kStyleVideoModelDescribe];
     [mutableDict setValue:self.videoUrl forKey:kStyleVideoModelVideoUrl];
     [mutableDict setValue:self.createTime forKey:kStyleVideoModelCreateTime];
-
+    [mutableDict setValue:self.authStatus forKey:kStyleVideoModelAuthStatus];
+    
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -104,6 +105,7 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
     self.describe = [aDecoder decodeObjectForKey:kStyleVideoModelDescribe];
     self.videoUrl = [aDecoder decodeObjectForKey:kStyleVideoModelVideoUrl];
     self.createTime = [aDecoder decodeObjectForKey:kStyleVideoModelCreateTime];
+    self.authStatus = [aDecoder decodeObjectForKey:kStyleVideoModelAuthStatus];
     return self;
 }
 
@@ -117,6 +119,7 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
     [aCoder encodeObject:_describe forKey:kStyleVideoModelDescribe];
     [aCoder encodeObject:_videoUrl forKey:kStyleVideoModelVideoUrl];
     [aCoder encodeObject:_createTime forKey:kStyleVideoModelCreateTime];
+    [aCoder encodeObject:_authStatus forKey:kStyleVideoModelAuthStatus];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -132,6 +135,7 @@ NSString *const kStyleVideoModelCreateTime = @"createTime";
         copy.describe = [self.describe copyWithZone:zone];
         copy.videoUrl = [self.videoUrl copyWithZone:zone];
         copy.createTime = [self.createTime copyWithZone:zone];
+        copy.authStatus = [self.createTime copyWithZone:zone];
     }
     
     return copy;

+ 14 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleVideoView.m

@@ -18,6 +18,9 @@
 
 @property (nonatomic, copy) StyleVidelAction callback;
 
+@property (weak, nonatomic) IBOutlet UIView *statusView;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
+
 @end
 
 @implementation MyStyleVideoView
@@ -40,6 +43,17 @@
 
 - (void)configWithSource:(StyleVideoModel *)source {
     [KSVideoHelper getVideoPreviewImageUrl:source.videoUrl forImageView:self.imageView placeholder:[UIImage imageNamed:@"video_placeholder"]];
+    if ([source.authStatus isEqualToString:@"DOING"]) {
+        self.statusView.hidden = NO;
+        self.statusLabel.text = @"审核中";
+    }
+    else if ([source.authStatus isEqualToString:@"UNPASS"]) {
+        self.statusView.hidden = NO;
+        self.statusLabel.text = @"审核失败";
+    }
+    else {
+        self.statusView.hidden = YES;
+    }
 }
 
 - (IBAction)playAction:(id)sender {

+ 28 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleVideoView.xib

@@ -35,14 +35,40 @@
                                         <action selector="playAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="XHr-TW-yDL"/>
                                     </connections>
                                 </button>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="72W-xH-t4Q">
+                                    <rect key="frame" x="7" y="6" width="37" height="16"/>
+                                    <subviews>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="审核中" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KqJ-Gg-WIi">
+                                            <rect key="frame" x="3" y="0.0" width="31" height="16"/>
+                                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                    </subviews>
+                                    <color key="backgroundColor" red="0.99215686274509807" green="0.38039215686274508" blue="0.38039215686274508" alpha="1" colorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="JUj-t1-37C"/>
+                                        <constraint firstItem="KqJ-Gg-WIi" firstAttribute="top" secondItem="72W-xH-t4Q" secondAttribute="top" id="QPX-SE-mNw"/>
+                                        <constraint firstAttribute="bottom" secondItem="KqJ-Gg-WIi" secondAttribute="bottom" id="Tpy-zX-c4N"/>
+                                        <constraint firstItem="KqJ-Gg-WIi" firstAttribute="leading" secondItem="72W-xH-t4Q" secondAttribute="leading" constant="3" id="j6Q-Kj-lNp"/>
+                                        <constraint firstAttribute="trailing" secondItem="KqJ-Gg-WIi" secondAttribute="trailing" constant="3" id="yk1-u8-VW6"/>
+                                    </constraints>
+                                    <userDefinedRuntimeAttributes>
+                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                            <real key="value" value="3"/>
+                                        </userDefinedRuntimeAttribute>
+                                    </userDefinedRuntimeAttributes>
+                                </view>
                             </subviews>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstItem="OZG-D1-yjf" firstAttribute="centerY" secondItem="yW1-Ft-tPa" secondAttribute="centerY" id="2tI-bB-hqQ"/>
                                 <constraint firstAttribute="bottom" secondItem="BIR-6B-TMy" secondAttribute="bottom" id="Ccy-1N-ZoF"/>
+                                <constraint firstItem="72W-xH-t4Q" firstAttribute="leading" secondItem="yW1-Ft-tPa" secondAttribute="leading" constant="7" id="Ph5-n7-JaT"/>
                                 <constraint firstItem="BIR-6B-TMy" firstAttribute="top" secondItem="yW1-Ft-tPa" secondAttribute="top" id="UKh-xX-eOM"/>
                                 <constraint firstItem="OZG-D1-yjf" firstAttribute="centerX" secondItem="yW1-Ft-tPa" secondAttribute="centerX" id="dF4-i4-gfe"/>
                                 <constraint firstAttribute="trailing" secondItem="BIR-6B-TMy" secondAttribute="trailing" id="g1w-vJ-Pko"/>
+                                <constraint firstItem="72W-xH-t4Q" firstAttribute="top" secondItem="yW1-Ft-tPa" secondAttribute="top" constant="6" id="gMR-At-n6w"/>
                                 <constraint firstItem="BIR-6B-TMy" firstAttribute="leading" secondItem="yW1-Ft-tPa" secondAttribute="leading" id="wnO-Lh-PDe"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
@@ -94,6 +120,8 @@
                 <outlet property="deleteButton" destination="eDd-Nb-XT6" id="BRf-MY-RoT"/>
                 <outlet property="imageView" destination="BIR-6B-TMy" id="c3X-du-xBM"/>
                 <outlet property="playButton" destination="OZG-D1-yjf" id="gCd-ZW-DMs"/>
+                <outlet property="statusLabel" destination="KqJ-Gg-WIi" id="8LE-in-UaC"/>
+                <outlet property="statusView" destination="72W-xH-t4Q" id="mst-yv-eoz"/>
             </connections>
             <point key="canvasLocation" x="119.56521739130436" y="-185.49107142857142"/>
         </view>

+ 2 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/AccompanyCourseCell.m

@@ -162,8 +162,8 @@
         self.courseStatus.text = @"已结束";
         self.courseStatus.textColor = HexRGB(0x999999);
         // 判断显示评价还是已评价
-        BOOL hasEvaluate = NO;
-        if (hasEvaluate) {
+        BOOL hasEvaluate = [model.teacherReplied isEqualToString:@"1"] ? YES : NO;
+        if (hasEvaluate == NO) {
             self.type = ACCOMPANY_DETAIL;
             self.opreationButton.userInteractionEnabled = YES;
             [self.opreationButton setTitle:@"评价" forState:UIControlStateNormal];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageCourseView.m

@@ -253,7 +253,7 @@
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
     if (self.selectIndex == 1) {
-        return 100;
+        return 147.0f;
     }
     else if (self.selectIndex == 2) {
         return 150.0f;

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyPhoneChangeController.m

@@ -136,7 +136,7 @@
 
 // 发送短信
 - (void)sendSMSRequestWithParm:(NSDictionary *)parm {
-    [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm stringValueForKey:@"phone"] success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm stringValueForKey:@"phone"] type:@"PHONE" success:^(NSDictionary * _Nonnull dic) {
         [self removehub];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             [self MBPShow:@"验证码已发送"];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/Controller/ModifyViewController.m

@@ -127,7 +127,7 @@
 
 // 发送短信
 - (void)sendSMSRequestWithParm:(NSDictionary *)parm {
-    [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm stringValueForKey:@"phone"] success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager sendSmsRequest:KS_POST mobile:[parm stringValueForKey:@"phone"] type:@"PASSWD" success:^(NSDictionary * _Nonnull dic) {
         [self removehub];
         if ([dic integerValueForKey:@"code"] == 200 && [dic boolValueForKey:@"status"]) {
             [self MBPShow:@"验证码已发送"];