Steven преди 2 години
родител
ревизия
e54d930191
променени са 15 файла, в които са добавени 77 реда и са изтрити 524 реда
  1. BIN
      KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate
  2. 10 494
      KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  3. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_homework.imageset/mine_homework@2x.png
  4. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_homework.imageset/mine_homework@3x.png
  5. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_navBg.imageset/mine_navBg@2x.png
  6. BIN
      KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_navBg.imageset/mine_navBg@3x.png
  7. 6 1
      KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/HomeViewController.m
  8. 13 10
      KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m
  9. 1 1
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindow.h
  10. 3 3
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindow.m
  11. 7 7
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindowManager.m
  12. 4 4
      KulexiuForStudent/KulexiuForStudent/Module/Live/View/KSShopCardView.xib
  13. 15 1
      KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m
  14. 2 0
      KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.h
  15. 16 3
      KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.xib

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


+ 10 - 494
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -5,514 +5,30 @@
    version = "2.0">
    <Breakpoints>
       <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1810CE7E-B98C-4855-A767-4FD2705B3141"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/Extension/NSDictionary+Extension.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "99"
-            endingLineNumber = "99"
-            landmarkName = "-notNullValueForKey:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "205F75D0-6A6C-4FDD-A6BC-37F2AA05C526"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Classroom/Controller/NewClassRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1130"
-            endingLineNumber = "1130"
-            landmarkName = "-didPublishStreams:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "A8141CA8-56A7-4753-AAAB-42AF775D553E"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Classroom/View/MainContainer/ClassroomMainContainer.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "66"
-            endingLineNumber = "66"
-            landmarkName = "-containerViewRenderView:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1E8DF52E-2B68-4E1B-9E6B-1E58C2390AC3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/SealClass/Services/RTC/RTCService.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "432"
-            endingLineNumber = "432"
-            landmarkName = "-exchangeRemoteUserAVStreamToNomalSteam:callback:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "745075B2-9136-4E06-B081-5F6DF7A96093"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonBodyView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "195"
-            endingLineNumber = "195"
-            landmarkName = "-requestData"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "940D3F1F-4955-4A75-ACDD-A025FBC1FD22"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Login/Controller/InstrumentChooseViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "208"
-            endingLineNumber = "208"
-            landmarkName = "-countMessageWithModel:indexPath:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent
-            uuid = "1CD9F766-8711-4450-B290-9343763647ED"
+            uuid = "38D5EE30-90E1-4F47-9497-A24AA734118B"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Classroom/Controller/NewClassRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "973"
-            endingLineNumber = "973"
-            landmarkName = "-renderMainContainerView"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "042CD8D0-51BC-4B36-8962-88F4A3CC0D8E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Course/Controller/CourseViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "510"
-            endingLineNumber = "510"
-            landmarkName = "-chatAction:groupName:isGroup:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "B4B7208F-3113-43C2-975D-D1B5D3486972"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Course/Controller/CourseViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "496"
-            endingLineNumber = "496"
-            landmarkName = "-liveCourseAction:source:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "DAE4D239-9B03-427F-96D0-BE0FA8352796"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Course/Controller/CourseViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "493"
-            endingLineNumber = "493"
-            landmarkName = "-liveCourseAction:source:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "5D69CE6C-4541-4092-97F1-67FB08D6431B"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSUpdateManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "25"
-            endingLineNumber = "25"
-            landmarkName = "+ks_updateWithAPPID:withBundleId:block:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "6549BB2C-1705-4AAC-AB78-1389058721C3"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/UMShare/KSUMShareManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "121"
-            endingLineNumber = "121"
-            landmarkName = "-openShareView"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "56AFEBC7-107E-4CCC-97C1-26F051F313A5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/UMShare/KSUMShareManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "126"
-            endingLineNumber = "126"
-            landmarkName = "-openShareView"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "8508D01A-7C3D-41C4-93F0-1BC2E55E168C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/UMShare/KSUMShareManager.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "142"
-            endingLineNumber = "142"
-            landmarkName = "-openShareView"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F54016B4-70D8-4DD3-8942-BBE4466F239A"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/GifRefresh/KSGifRefreshHeader.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "77"
-            endingLineNumber = "77"
-            landmarkName = "-setState:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "9812269E-7772-40C8-9A99-1A1CECF48691"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Tools/GifRefresh/KSGifRefreshHeader.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "101"
-            endingLineNumber = "101"
-            landmarkName = "-scrollViewContentOffsetDidChange:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F397BF90-27C5-474C-9D0F-3E6C94BACC6F"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSTabBarViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "122"
-            endingLineNumber = "122"
-            landmarkName = "-setAnaimationWithTabBarController:selectViewController:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "002F2288-A397-4DF6-B3D1-F011521708C2"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSTabBarViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "104"
-            endingLineNumber = "104"
-            landmarkName = "-tabBarController:didSelectViewController:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "613263EB-88F2-40D4-80E9-31D3966665AC"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "266"
-            endingLineNumber = "266"
-            landmarkName = "-setUserAgent"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "FCB14E61-608A-420C-8647-6FA260784A4F"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "692"
-            endingLineNumber = "692"
-            landmarkName = "-downloadMidiFile:success:faliure:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "FBA3868A-F678-432B-BABC-3F4821780F32"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "697"
-            endingLineNumber = "697"
-            landmarkName = "-downloadMidiFile:success:faliure:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1144A652-3B1A-4D48-81CF-CDBF4F70E030"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "618"
-            endingLineNumber = "618"
-            landmarkName = "-getSingleTrackNumByName:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "E9D3AC93-6ED0-4C97-8527-68BC82C3FCA0"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "534"
-            endingLineNumber = "534"
-            landmarkName = "-iterate:TrackIndex:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1BCE1EE9-CD40-471A-9BFC-4ECC13BD7C51"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/KSAccompanyWebViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "459"
-            endingLineNumber = "459"
-            landmarkName = "-userContentController:didReceiveScriptMessage:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "BFB9BD2C-C70A-4B3A-8783-AFBEB65DF79F"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "665"
-            endingLineNumber = "665"
-            landmarkName = "-volumeTrackVolumeWithInstrumentId:volume:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "7432A229-68D4-4DE5-B99B-8882B2764B97"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/NoticeCenter/View/NotiferMessageCell.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "47"
-            endingLineNumber = "47"
-            landmarkName = "-configCellWithSource:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "66EFE09F-3A08-4750-B3C7-F7E13A774A3E"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/CloudEngine/MidiPlayer/MidiPlayerEngine.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "652"
-            endingLineNumber = "652"
-            landmarkName = "-volumeTrackVolumeWithInstrumentId:volume:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "C8D8D819-C69D-4F84-9739-680EB2EE9F1C"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseCell.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "45"
-            endingLineNumber = "45"
-            landmarkName = "-configSourceModel:isInCheck:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "09BECFEC-866D-4A1F-B953-C759DA4F4E13"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/View/HomeNavView.h"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "10"
-            endingLineNumber = "10"
-            landmarkName = "NAVACTION"
-            landmarkType = "16">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "1E3F226F-38FA-46AA-9F8D-283D33C1F695"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1282"
-            endingLineNumber = "1282"
-            landmarkName = "-sendLeaveMessageCallback:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "9A08094F-35E5-4ADD-9EF1-C45E09861E3D"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Common/Base/AccompanyLoadingView.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "44"
-            endingLineNumber = "44"
-            landmarkName = "-showLoading"
-            landmarkType = "7">
+            breakpointStackSelectionBehavior = "1"
+            scope = "1"
+            stopOnStyle = "1">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "68418954-D0BC-432D-A65E-7D1287DBEACF"
+            uuid = "6EA5B8EB-FEC6-4AB3-82E0-842B306278EB"
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "KulexiuForStudent/Module/Home/View/HotTalent/HomeHotTalentCell.m"
+            filePath = "KulexiuForStudent/Module/Home/Controller/HomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "100"
-            endingLineNumber = "100"
-            landmarkName = "-configWithSource:callback:"
+            startingLineNumber = "817"
+            endingLineNumber = "817"
+            landmarkName = "-refreshViewLocation"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_homework.imageset/mine_homework@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_homework.imageset/mine_homework@3x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_navBg.imageset/mine_navBg@2x.png


BIN
KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Mine/mine_navBg.imageset/mine_navBg@3x.png


+ 6 - 1
KulexiuForStudent/KulexiuForStudent/Module/Home/Controller/HomeViewController.m

@@ -808,7 +808,12 @@
         }];
     }
     else {
-        self.buttonViewHeight = self.buttonArray.count ? buttonViewDefaultHeight : CGFLOAT_MIN;
+        CGFloat spaceCutDown = 0.0f;
+        if (self.noticeArray.count) {
+            spaceCutDown = 20.0f;
+        }
+        
+        self.buttonViewHeight = self.buttonArray.count ? buttonViewDefaultHeight - spaceCutDown : CGFLOAT_MIN;
         [self.buttonContainer mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.left.right.mas_equalTo(self.headView);
             make.top.mas_equalTo(self.bannerView.mas_bottom);

+ 13 - 10
KulexiuForStudent/KulexiuForStudent/Module/Live/Controller/LiveVideoRoomViewController.m

@@ -597,7 +597,7 @@ static int clickPraiseBtnTimes  = 0;
                 NSMutableArray *streamArray = [NSMutableArray array];
                 NSArray *remoteUserArray = [strongSelf.room.remoteUsers mutableCopy];
                 for (RCRTCRemoteUser *user in remoteUserArray) {
-                    if (user.remoteStreams.count) {
+                    if (remoteUserArray.count) {
                         [streamArray addObjectsFromArray:user.remoteStreams];
                     }
                 }
@@ -652,19 +652,21 @@ static int clickPraiseBtnTimes  = 0;
                 [strongSelf.engine.defaultAudioStream setMicrophoneDisable:YES];
                 
                 NSMutableArray *streamArray = [NSMutableArray array];
-                if (strongSelf.room.remoteUsers.count) {
-                    NSArray *remoteUserArray = [strongSelf.room.remoteUsers mutableCopy];
-                    for (RCRTCRemoteUser *user in remoteUserArray) {
-                        if (user.remoteStreams.count) {
-                            [streamArray addObjectsFromArray:user.remoteStreams];
-                            [strongSelf subscribeRemoteResource:streamArray];
-                        }
+                NSArray *remoteUserArray = [strongSelf.room.remoteUsers mutableCopy];
+
+                for (RCRTCRemoteUser *user in remoteUserArray) {
+                    if (user.remoteStreams.count) {
+                        [streamArray addObjectsFromArray:user.remoteStreams];
                     }
                 }
-                if (streamArray.count == 0) {
+                if (streamArray.count) {
+                    [strongSelf subscribeRemoteResource:streamArray];
+                }
+                else {
                     [strongSelf updateVideoViewContainer];
                 }
-
+                
+                
                 strongSelf.micStatus = MICSTATUS_NOMAL;
                 // 刷新麦位状态
                 [strongSelf renderSeatView];
@@ -1230,6 +1232,7 @@ static int clickPraiseBtnTimes  = 0;
 
 // 取消订阅流 Id 所对应的 View
 - (void)unsubscribeRemoteResource:(NSArray<RCRTCInputStream *> *)streams orStreamId:(NSString *)streamId {
+    
     for (RCRTCInputStream *stream in streams) {
         if (stream.mediaType == RTCMediaTypeVideo) {
             streamId = stream.streamId;

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindow.h

@@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, DRAG_ACTION) {
 
 typedef void(^DragClickAction)(DRAG_ACTION action);
 
-@interface KSDragWindow : UIWindow
+@interface KSDragWindow : UIView   // 替换成UIView
 
 @property (nonatomic, strong) UIView *containerView;
 

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindow.m

@@ -23,8 +23,8 @@
 - (instancetype)initWithFrame:(CGRect)frame {
     if (self = [super initWithFrame:frame]) {
         self.backgroundColor  = [UIColor clearColor];
-        self.windowLevel = UIWindowLevelAlert + 2;
-        [self makeKeyAndVisible];
+//        self.windowLevel = UIWindowLevelAlert;
+//        [self makeKeyAndVisible];
         [self addSubview:self.containerView];
         self.containerView.frame = CGRectMake(0, 0, frame.size.width, frame.size.height);
         
@@ -39,7 +39,7 @@
         [self addSubview:self.cancelButton];
         self.cancelButton.frame = CGRectMake(frame.size.width-30, 0, 30, 30);
         
-        [self setRootViewController:[UIViewController new]];
+//        [self setRootViewController:[UIViewController new]];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(statusBarOrientationChange:) name:UIApplicationDidChangeStatusBarOrientationNotification object:nil];
         
     }

+ 7 - 7
KulexiuForStudent/KulexiuForStudent/Module/Live/View/DragWindow/KSDragWindowManager.m

@@ -28,11 +28,11 @@
     [self.dragWindow clickAction:^(DRAG_ACTION action) {
         [weakSelf dragAction:action];
     }];
-   
-    if (@available(iOS 13.0, *)) {
-        NSSet* windowScene = [UIApplication sharedApplication].connectedScenes;
-        self.dragWindow.windowScene = windowScene.anyObject;
-    }
+    [[NSObject getKeyWindow] addSubview:self.dragWindow];
+//    if (@available(iOS 13.0, *)) {
+//        NSSet* windowScene = [UIApplication sharedApplication].connectedScenes;
+//        self.dragWindow.windowScene = windowScene.anyObject;
+//    }
 }
 
 
@@ -62,8 +62,8 @@
 - (void)resignDragWindow {
     _hasShowWindow = NO;
     [self.dragWindow.subviews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-    self.dragWindow.rootViewController = nil;
-    [self.dragWindow resignKeyWindow];
+//    self.dragWindow.rootViewController = nil;
+//    [self.dragWindow resignKeyWindow];
     [self.dragWindow removeFromSuperview];
     _dragWindow = nil;
 }

+ 4 - 4
KulexiuForStudent/KulexiuForStudent/Module/Live/View/KSShopCardView.xib

@@ -19,7 +19,7 @@
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="liveCart_AlertBg" translatesAutoresizingMaskIntoConstraints="NO" id="3lN-YD-l1m">
                             <rect key="frame" x="0.0" y="0.0" width="86" height="181"/>
                         </imageView>
-                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LzX-ss-QR3">
+                        <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LzX-ss-QR3">
                             <rect key="frame" x="13" y="12" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="60" id="SkV-ZH-Lz9"/>
@@ -34,7 +34,7 @@
                                 <action selector="chooseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="hlv-oC-zAR"/>
                             </connections>
                         </button>
-                        <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D77-vR-GET">
+                        <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D77-vR-GET">
                             <rect key="frame" x="13" y="51" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="32" id="loQ-2S-47S"/>
@@ -49,7 +49,7 @@
                                 <action selector="chooseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Gjg-ik-AYI"/>
                             </connections>
                         </button>
-                        <button opaque="NO" tag="1004" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZZq-UP-OkF">
+                        <button opaque="NO" tag="1004" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZZq-UP-OkF">
                             <rect key="frame" x="13" y="90" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="60" id="cDj-Sn-wdz"/>
@@ -64,7 +64,7 @@
                                 <action selector="chooseAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="5wJ-bP-54B"/>
                             </connections>
                         </button>
-                        <button opaque="NO" tag="1005" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AYN-JT-FVH">
+                        <button opaque="NO" tag="1005" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AYN-JT-FVH">
                             <rect key="frame" x="13" y="129" width="60" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="32" id="YE6-Od-QrD"/>

+ 15 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Controller/MineViewController.m

@@ -24,7 +24,7 @@
 #import "FeedbackViewController.h"
 #import "UserInfoManager.h"
 
-@interface MineViewController ()
+@interface MineViewController ()<UIScrollViewDelegate>
 
 @property (nonatomic, strong) MineNavView *navView;
 
@@ -52,6 +52,7 @@
     imageView.frame = CGRectMake(0, 0, kScreenWidth, height);
     [self.view addSubview:imageView];
     self.scrollView.backgroundColor = [UIColor clearColor];
+    self.scrollView.delegate = self;
     
     [self.view addSubview:self.navView];
 
@@ -316,6 +317,19 @@
     [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    CGFloat space = scrollView.contentOffset.y;
+    if (space >= kNaviBarHeight) {
+        self.navView.backgroundColor = [UIColor whiteColor];
+        self.navView.lineView.hidden = NO;
+    }
+    else {
+        self.navView.lineView.hidden = YES;
+        CGFloat rate = space / kNaviBarHeight < 0 ? 0 : space / kNaviBarHeight;
+        self.navView.backgroundColor = HexRGBAlpha(0xffffff, rate);
+    }
+}
+
 /*
 #pragma mark - Navigation
 

+ 2 - 0
KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MineNavView : UIView
 
+@property (weak, nonatomic) IBOutlet UIView *lineView;
+
 + (instancetype)shareInstance;
 
 - (void)mineNavAction:(MineNavAction)action;

+ 16 - 3
KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineNavView.xib

@@ -62,11 +62,19 @@
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RTQ-Sv-T0o">
+                    <rect key="frame" x="0.0" y="87" width="414" height="1"/>
+                    <color key="backgroundColor" red="0.94901960784313721" green="0.94901960784313721" blue="0.94901960784313721" alpha="1" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="HYV-C4-oXh"/>
+                    </constraints>
+                </view>
             </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="Rhc-fA-XQh" firstAttribute="centerY" secondItem="vgD-P2-w5R" secondAttribute="centerY" id="GVr-fJ-FGt"/>
                 <constraint firstAttribute="trailing" secondItem="o7c-br-wf5" secondAttribute="trailing" constant="8" id="Kng-m2-QZf"/>
+                <constraint firstItem="RTQ-Sv-T0o" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="KxJ-gl-1Om"/>
                 <constraint firstItem="o7c-br-wf5" firstAttribute="centerY" secondItem="EJV-LH-t1s" secondAttribute="centerY" id="Oo2-s1-fZ6"/>
                 <constraint firstItem="Rhc-fA-XQh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="15" id="PHG-cd-tYC"/>
                 <constraint firstAttribute="bottom" secondItem="o7c-br-wf5" secondAttribute="bottom" id="UkV-jH-fS0"/>
@@ -74,16 +82,21 @@
                 <constraint firstItem="vVv-Q5-Hup" firstAttribute="trailing" secondItem="Rhc-fA-XQh" secondAttribute="trailing" constant="-4" id="e0R-NI-Hg7"/>
                 <constraint firstItem="vVv-Q5-Hup" firstAttribute="centerY" secondItem="Rhc-fA-XQh" secondAttribute="centerY" id="kls-KX-ELD"/>
                 <constraint firstItem="o7c-br-wf5" firstAttribute="leading" secondItem="EJV-LH-t1s" secondAttribute="trailing" constant="4" id="oxR-ny-WsN"/>
+                <constraint firstAttribute="trailing" secondItem="RTQ-Sv-T0o" secondAttribute="trailing" id="tM4-P6-Xwy"/>
                 <constraint firstItem="EJV-LH-t1s" firstAttribute="centerY" secondItem="Rhc-fA-XQh" secondAttribute="centerY" id="yMc-2K-DQJ"/>
+                <constraint firstAttribute="bottom" secondItem="RTQ-Sv-T0o" secondAttribute="bottom" id="z1D-Me-NTp"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <point key="canvasLocation" x="215.94202898550725" y="-97.098214285714278"/>
+            <connections>
+                <outlet property="lineView" destination="RTQ-Sv-T0o" id="E8Q-Rz-5XQ"/>
+            </connections>
+            <point key="canvasLocation" x="134.78260869565219" y="-97.098214285714278"/>
         </view>
     </objects>
     <resources>
         <image name="mine_scan" width="21" height="21"/>
-        <image name="mine_setting" width="21" height="20"/>
+        <image name="mine_setting" width="24" height="24"/>
     </resources>
 </document>