Merge branch 'institution' into developer

# Conflicts:
#	KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj
#	KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/Controller/AccountDeleteViewController.m
#	KulexiuForStudent/Podfile.lock
#	KulexiuForStudent/Pods/Manifest.lock
#	KulexiuForStudent/Pods/Pods.xcodeproj/project.pbxproj
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/AFNetworking.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Bugly.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/CHIPageControl.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/IQKeyboardManager.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JCore.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JPush.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXCategoryView.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/JXPagingView.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MBProgressHUD.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJExtension.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/MJRefresh.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Masonry.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent-KulexiuForStudentUITests.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudent.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Pods-KulexiuForStudentTests.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RSKImageCropper.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Reachability.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudIM.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/RongCloudRTC.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SDWebImage.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SSZipArchive.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/SocketRocket.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard-Whiteboard.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/Whiteboard.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/YYModel.xcscheme
#	KulexiuForStudent/Pods/Pods.xcodeproj/xcuserdata/wangzhi.xcuserdatad/xcschemes/ZKCycleScrollView.xcscheme
#	KulexiuForStudent/Pods/Target Support Files/AFNetworking/AFNetworking-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/AFNetworking/AFNetworking.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/AFNetworking/AFNetworking.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Bugly/Bugly.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Bugly/Bugly.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/CHIPageControl/CHIPageControl-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/CHIPageControl/CHIPageControl.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/CHIPageControl/CHIPageControl.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/IQKeyboardManager/IQKeyboardManager.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JCore/JCore.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JCore/JCore.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JPush/JPush.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JPush/JPush.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JXCategoryView/JXCategoryView-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/JXCategoryView/JXCategoryView.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JXCategoryView/JXCategoryView.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JXPagingView/JXPagingView-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/JXPagingView/JXPagingView.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/JXPagingView/JXPagingView.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MBProgressHUD/MBProgressHUD-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/MBProgressHUD/MBProgressHUD.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MBProgressHUD/MBProgressHUD.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MJExtension/MJExtension-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/MJExtension/MJExtension.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MJExtension/MJExtension.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MJRefresh/MJRefresh-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/MJRefresh/MJRefresh.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/MJRefresh/MJRefresh.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Masonry/Masonry-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Masonry/Masonry.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Masonry/Masonry.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Pods-KulexiuForStudent-KulexiuForStudentUITests/Pods-KulexiuForStudent-KulexiuForStudentUITests-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Pods-KulexiuForStudent-KulexiuForStudentUITests/Pods-KulexiuForStudent-KulexiuForStudentUITests-frameworks.sh
#	KulexiuForStudent/Pods/Target Support Files/Pods-KulexiuForStudent/Pods-KulexiuForStudent-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Pods-KulexiuForStudent/Pods-KulexiuForStudent-frameworks.sh
#	KulexiuForStudent/Pods/Target Support Files/Pods-KulexiuForStudentTests/Pods-KulexiuForStudentTests-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/RSKImageCropper/RSKImageCropper-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/RSKImageCropper/RSKImageCropper.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/RSKImageCropper/RSKImageCropper.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Reachability/Reachability-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Reachability/Reachability.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Reachability/Reachability.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/RongCloudIM/RongCloudIM-xcframeworks.sh
#	KulexiuForStudent/Pods/Target Support Files/RongCloudIM/RongCloudIM.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/RongCloudIM/RongCloudIM.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/RongCloudRTC/RongCloudRTC.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/RongCloudRTC/RongCloudRTC.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SDWebImage/SDWebImage-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/SDWebImage/SDWebImage-umbrella.h
#	KulexiuForStudent/Pods/Target Support Files/SDWebImage/SDWebImage.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SDWebImage/SDWebImage.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SSZipArchive/SSZipArchive-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/SSZipArchive/SSZipArchive.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SSZipArchive/SSZipArchive.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SocketRocket/SocketRocket-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/SocketRocket/SocketRocket.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/SocketRocket/SocketRocket.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Whiteboard/ResourceBundle-Whiteboard-Whiteboard-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Whiteboard/Whiteboard-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/Whiteboard/Whiteboard-umbrella.h
#	KulexiuForStudent/Pods/Target Support Files/Whiteboard/Whiteboard.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/Whiteboard/Whiteboard.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/YYModel/YYModel-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/YYModel/YYModel.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/YYModel/YYModel.release.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/ZKCycleScrollView/ZKCycleScrollView-Info.plist
#	KulexiuForStudent/Pods/Target Support Files/ZKCycleScrollView/ZKCycleScrollView.debug.xcconfig
#	KulexiuForStudent/Pods/Target Support Files/ZKCycleScrollView/ZKCycleScrollView.release.xcconfig
#	KulexiuForStudent/Pods/Whiteboard/README-zh.md
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Displayer/WhiteCommonCallbacks.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Displayer/WhiteCommonCallbacks.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Displayer/WhiteDisplayer.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Displayer/WhiteDisplayerState.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteConsts.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteConsts.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteMemberState.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteRoomMember.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteWindowParams.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Object/WhiteWindowParams.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Replayer/WhitePlayerConfig.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Room/WhiteRoom.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Room/WhiteRoom.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Room/WhiteRoomConfig.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Room/WhiteRoomConfig.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/Room/WhiteSDK+Room.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/SDK/WhiteSDK.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/SDK/WhiteSDK.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/SDK/WhiteSdkConfiguration.h
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Classes/SDK/WhiteSdkConfiguration.m
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Resource/index.html
#	KulexiuForStudent/Pods/Whiteboard/Whiteboard/Resource/main.css

KulexiuForStudent/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "fastlane"

KulexiuForStudent/Gemfile.lock

@@ -1,218 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.5)
-      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
-    atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.603.0)
-    aws-sdk-core (3.131.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-    babosa (1.0.4)
-    claide (1.1.0)
-    colored (1.2)
-    colored2 (3.1.2)
-    commander (4.6.0)
-      highline (~> 2.0.0)
-    declarative (0.0.20)
-    digest-crc (0.6.4)
-      rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    emoji_regex (3.2.3)
-    excon (0.92.3)
-    faraday (1.10.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
-      faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.207.0)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.8, < 3.0.0)
-      artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
-      babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander (~> 4.6)
-      dotenv (>= 2.1.1, < 3.0.0)
-      emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
-      faraday (~> 1.0)
-      faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (~> 1.0)
-      fastimage (>= 2.1.0, < 3.0.0)
-      gh_inspector (>= 1.1.2, < 2.0.0)
-      google-apis-androidpublisher_v3 (~> 0.3)
-      google-apis-playcustomapp_v1 (~> 0.1)
-      google-cloud-storage (~> 1.31)
-      highline (~> 2.0)
-      json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
-      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
-      naturally (~> 2.2)
-      optparse (~> 0.1.1)
-      plist (>= 3.1.0, < 4.0.0)
-      rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
-      simctl (~> 1.6.3)
-      terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
-      tty-screen (>= 0.6.3, < 1.0.0)
-      tty-spinner (>= 0.8.0, < 1.0.0)
-      word_wrap (~> 1.0.0)
-      xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
-    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.24.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.7.0)
-      addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
-      mini_mime (~> 1.0)
-      representable (~> 3.0)
-      retriable (>= 2.0, < 4.a)
-      rexml
-      webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.17.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
-      google-cloud-errors (~> 1.0)
-    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.37.0)
-      addressable (~> 2.8)
-      digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
-      google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
-      mini_mime (~> 1.0)
-    googleauth (1.2.0)
-      faraday (>= 0.17.3, < 3.a)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
-      os (>= 0.9, < 2.0)
-      signet (>= 0.16, < 2.a)
-    highline (2.0.3)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
-    os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
-    rake (13.0.6)
-    representable (3.2.0)
-      declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
-      uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
-      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
-    simctl (1.6.8)
-      CFPropertyList
-      naturally
-    terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    trailblazer-option (0.1.2)
-    tty-cursor (0.7.1)
-    tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
-    word_wrap (1.0.0)
-    xcodeproj (1.22.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.1)
-      xcpretty (~> 0.2, >= 0.0.7)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  fastlane
-
-BUNDLED WITH
-   2.3.11

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/WorkspaceSettings.xcsettings

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildLocationStyle</key>
-	<string>UseAppPreferences</string>
-	<key>CustomBuildLocationType</key>
-	<string>RelativeToDerivedData</string>
-	<key>DerivedDataLocationStyle</key>
-	<string>Default</string>
-	<key>IssueFilterStyle</key>
-	<string>ShowActiveSchemeOnly</string>
-	<key>LiveSourceIssuesEnabled</key>
-	<true/>
-	<key>ShowSharedSchemesAutomaticallyEnabled</key>
-	<true/>
-</dict>
-</plist>

KulexiuForStudent/KulexiuForStudent/AppDelegate+AppService.h

@@ -0,0 +1,19 @@
+//
+//  AppDelegate+AppService.h
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2023/8/7.
+//
+
+#import "AppDelegate.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface AppDelegate (AppService)
+
+//单例
++ (AppDelegate *)shareAppDelegate;
+
+@end
+
+NS_ASSUME_NONNULL_END

KulexiuForStudent/KulexiuForStudent/AppDelegate+AppService.m

@@ -0,0 +1,16 @@
+//
+//  AppDelegate+AppService.m
+//  KulexiuForTeacher
+//
+//  Created by 王智 on 2023/8/7.
+//
+
+#import "AppDelegate+AppService.h"
+
+@implementation AppDelegate (AppService)
+
++ (AppDelegate *)shareAppDelegate{
+    return (AppDelegate *)[[UIApplication sharedApplication] delegate];
+}
+
+@end

KulexiuForStudent/KulexiuForStudent/AppDelegate.h

@@ -6,14 +6,18 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "KSTabBarViewController.h"
+
 #import "LoginViewController.h"
 #import "CustomNavViewController.h"
+#import "CustomTabBarController.h"
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate>
 
+@property (nonatomic, strong) NSData *deviceToken;
+
 @property (strong, nonatomic) UIWindow *window;
-@property (nonatomic, strong) KSTabBarViewController *tabBarController;
+
+@property (nonatomic, strong) CustomTabBarController *tabBarController;
 
 //记录当前界面是否支持横竖屏旋转
 @property (assign, nonatomic)BOOL allowAutoRotate;
@@ -36,5 +40,11 @@
 
 - (void)displayUnreadMessageCount;
 
+- (void)noteIMNewsCount:(NSInteger)count;
+
+- (void)clearIMNewsCount;
+
+- (void)refreshThemeColorAndConfig;
+
 @end
 

KulexiuForStudent/KulexiuForStudent/AppDelegate.m

@@ -6,13 +6,13 @@
 //
 
 #import "AppDelegate.h"
+#import "KSTabBarViewController.h"
+#import "InstitutionTabBarController.h"
 #import <AppTrackingTransparency/AppTrackingTransparency.h>
 #import "KSUpdateManager.h"
 #import "KSUpdateAlert.h"
 #import "KSNetworkAccessibleManager.h"
 #import <Bugly/Bugly.h>
-#import <RongIMLib/RongIMLib.h>
-#import <RongIMKit/RongIMKit.h>
 
 #import <UMCommon/UMCommon.h>
 
@@ -28,9 +28,7 @@
 #import "UrlDecode.h"
 #import "KSBaseWKWebViewController.h"
 #import "UserInfoManager.h"
-#import "KSIMService.h"
-#import "RCConnectionManager.h"
-#import "KSRCIMDataSource.h"
+
 #import "WXApi.h"
 #import "GuideViewController.h"
 #import "HomeworkDetailViewController.h"
@@ -39,21 +37,13 @@
 #import "LaunchAnimationViewController.h"
 #import "KSEnterLiveroomManager.h"
 
-@interface RCNaviDataInfo : NSObject
-
-@property (nonatomic, assign) NSTimeInterval uploadVideoDurationLimit;
-
-@end
-
-@interface RCNaviDataManager : NSObject
-
-@property (nonatomic, strong) RCNaviDataInfo *naviData;
-
-+ (instancetype)sharedInstance;
+#import "TXIMLinsenter.h"
+#import <TUICore/TUIConfig.h>
+#import <TUIChat/TUIChat.h>
 
-@end
+@import TXLiteAVSDK_Professional;
 
-@interface AppDelegate ()<RCIMReceiveMessageDelegate,WXApiDelegate,JPUSHRegisterDelegate>
+@interface AppDelegate ()<WXApiDelegate,JPUSHRegisterDelegate,V2TXLivePremierObserver>
 
 @property (nonatomic, assign) BOOL isNeedUpdate;
 
@@ -92,6 +82,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     // Override point for customization after application launch.
     [self networkEnableCheck];
+    [self initTXRTCConfig];
     [self registerSDK];
     [Bugly startWithAppId:@"adfcb3bc3d"];
     
@@ -102,15 +93,17 @@
         [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
     }
     
-    [[UITabBar appearance] setTranslucent:NO];
     // 全局配置光标颜色
-    [[UITextField appearance] setTintColor:THEMECOLOR];
-    [[UITextView appearance] setTintColor:THEMECOLOR];
+    [[UITextField appearance] setTintColor:CLIENT_THEMECOLOR];
+    [[UITextView appearance] setTintColor:CLIENT_THEMECOLOR];
     
     // 配置极光推送
     [self configJPUSHWithLaunchOptions:launchOptions];
-    // 融云相关配置
-    [self configIM];
+
+    
+    // 腾讯群相关
+   [self configTXIM];
+    
     LaunchAnimationViewController *animationVC = [[LaunchAnimationViewController alloc] init];
     MJWeakSelf;
     [animationVC launchAnimationFinish:^{
@@ -144,13 +137,21 @@
      */
     [self registerRemoteNotification:application];
 
-    if(@available(iOS 11.0, *)){
-        
-        [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[UIDocumentBrowserViewController class]]].tintColor = THEMECOLOR;
-    }
+    [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[UIDocumentBrowserViewController class]]].tintColor = CLIENT_THEMECOLOR;
     return YES;
 }
 
+- (void)refreshThemeColorAndConfig {
+    // 全局配置光标颜色
+    NSLog(@"------ %zd",[UserDefaultObjectForKey(TENANT_ID) integerValue]);
+    [[UITextField appearance] setTintColor:CLIENT_THEMECOLOR];
+    [[UITextView appearance] setTintColor:CLIENT_THEMECOLOR];
+    
+    [UINavigationBar appearanceWhenContainedInInstancesOfClasses:@[[UIDocumentBrowserViewController class]]].tintColor = CLIENT_THEMECOLOR;
+    TUIConfig *config = [TUIConfig defaultConfig];
+    config.defaultGroupAvatarImage = [UIImage imageNamed:CLIENT_GROUP_LOGO];
+}
+
 - (void)configRootVC {
     BOOL hasLaunchGuide = UserDefaultBoolForKey(FIRST_LOGIN_KEY);
     if (hasLaunchGuide == NO) {
@@ -167,22 +168,19 @@
         }
         else {
             [KSNetworkingManager configRequestHeader];
+            NSInteger tenantId = [UserDefaultObjectForKey(TENANT_ID) integerValue];
+            if (tenantId != -1) {
+                [KSNetworkingManager addHeader:[NSString stringWithFormat:@"%zd", tenantId] forKey:@"coopId"];
+            }
             [USER_MANAGER queryUserInfoSendLoginUMCount];
             [self initTableBar];
-            self.window.rootViewController=_tabBarController;
         }
     }
     [self versionCheck];
 }
 
 - (void)displayUnreadMessageCount {
-    int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[ @(ConversationType_PRIVATE),@(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-    ]];
-    if (unreadMsgCount >= 1) {
-        [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-    } else {
-        [self.tabBarController clearNewsWithIndex:2];
-    }
+    [self countUnreadMessage];
 }
 
 - (void)registerSDK {
@@ -285,69 +283,29 @@
             advertisingIdentifier:nil];
 }
 
-- (void)configIM {
-    [RCNaviDataManager sharedInstance].naviData.uploadVideoDurationLimit = 480.0f;
-    // 6tnym1br6pv07 正式环境key   c9kqb3rdc451j test
-    [[RCIM sharedRCIM] initWithAppKey:RCIM_KEY];
-    
-    //IMKit连接状态的监听器
-    [[RCIM sharedRCIM] setConnectionStatusDelegate:KSRMLINK];
-    //IMKit消息接收的监听器
-    [[RCIM sharedRCIM] setReceiveMessageDelegate:self];
-    // 信息提供者
-    [RCIM sharedRCIM].userInfoDataSource = KSRMDataSource;
-    [[RCIM sharedRCIM] setGroupInfoDataSource:KSRMDataSource];
-    // 群名片信息提供者
-    [[RCIM sharedRCIM] setGroupUserInfoDataSource:KSRMDataSource];
-    // 群成员数据源
-    [RCIM sharedRCIM].groupMemberDataSource = KSRMDataSource;
-    
-    //开启消息@功能（只支持群聊和讨论组, App需要实现群成员数据源groupMemberDataSource）
-    RCKitConfigCenter.message.enableMessageMentioned = YES;
-    //是否关闭本地通知，默认是打开的
-    RCKitConfigCenter.message.disableMessageNotificaiton = NO;
-    // 会话界面设置
-    RCKitConfigCenter.ui.globalMessageAvatarStyle = RC_USER_AVATAR_RECTANGLE;
-    RCKitConfigCenter.ui.globalMessagePortraitSize = CGSizeMake(40, 40);
-    // 会话列表头像设置
-    RCKitConfigCenter.ui.globalConversationAvatarStyle = RC_USER_AVATAR_RECTANGLE;
-    RCKitConfigCenter.ui.globalConversationPortraitSize = CGSizeMake(44, 44);
-    
-    //开启消息撤回功能
-    RCKitConfigCenter.message.enableMessageRecall = YES;
-    // 开启消息合并转发
-    RCKitConfigCenter.message.enableSendCombineMessage = YES;
-    //选择媒体资源时，包含视频文件
-    RCKitConfigCenter.message.isMediaSelectorContainVideo = YES;
-    //设置显示未注册的消息
-    RCKitConfigCenter.message.showUnkownMessage = YES;
-    
-    //开启发送已读回执
-    RCKitConfigCenter.message.enabledReadReceiptConversationTypeList = @[@(ConversationType_PRIVATE), @(ConversationType_GROUP)];
-    
-    //开启输入状态监听
-    RCKitConfigCenter.message.enableTypingStatus = YES;
-    
-    //开启用户信息和群组信息的持久化
-    [RCIM sharedRCIM].enablePersistentUserInfoCache = YES;
-    // 在发送的所有消息中携带当前登录的用户信息
-    [RCIM sharedRCIM].enableMessageAttachUserInfo = YES;
-    // 关闭所有提示音
-    RCKitConfigCenter.message.disableMessageAlertSound = YES;
-    
-    // 设置断线重连时是否踢出重连设备
-        [[RCIMClient sharedRCIMClient] setReconnectKickEnable:YES];
-    
-    // 左右上角按钮颜色
-    RCKitConfigCenter.ui.globalNavigationBarTintColor = HexRGB(0x000000);
-    // 注册消息
-    // 注册消息
-    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatLiveMessage")];
-    [[RCIM sharedRCIM] registerMessageType:NSClassFromString(@"KSChatMusicMessage")];
-    
-    //    [[RCIMClient sharedRCIMClient] setLogLevel:RC_Log_Level_Verbose];
-    //    [self redirectNSlogToDocumentFolder];
+- (void)initTXRTCConfig {
+    [V2TXLivePremier setLicence:CONFIG_TXLiveLicenceURL key:CONFIG_TXLiveLicenceKey];
+    [V2TXLivePremier setObserver:self];
+    NSLog(@"SDK Version = %@", [V2TXLivePremier getSDKVersionStr]);
+}
+
+- (void)configTXIM {
+    TUIConfig *config = [TUIConfig defaultConfig];
+    // 修改默认头像
+    config.defaultAvatarImage = [UIImage imageNamed:USERDEFAULT_LOGO];
+    // 修改默认群组头像
+    config.defaultGroupAvatarImage = [UIImage imageNamed:CLIENT_GROUP_LOGO];
+    // 禁用群组九宫格头像
+    config.avatarType = TAvatarTypeRadiusCorner;
+    config.enableGroupGridAvatar = NO;
+    config.avatarCornerRadius = 4.0f;
+    // 关闭toaset
+    config.enableToast = NO;
     
+    TUIChatConfig *chatConfig = [TUIChatConfig defaultConfig];
+    chatConfig.backgroudColor = HexRGB(0xF8F8F8);
+    chatConfig.enableWelcomeCustomMessage = NO;
+    chatConfig.enableTypingStatus = YES;
 }
 
 #pragma mark - private method
@@ -400,32 +358,34 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     /// Required - 注册 DeviceToken
     [JPUSHService registerDeviceToken:deviceToken];
     
-    // 融云
-    [[RCIMClient sharedRCIMClient] setDeviceTokenData:deviceToken];
+    
+    if ([TXIM_LINSENTER isCurrentUserLoginIM]) {
+        [self registerTXIMDeviceToken:deviceToken];
+    }
+    else {
+        self.deviceToken = deviceToken;
+    }
 }
 
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-    /**
-     * 获取融云推送服务扩展字段2
-     */
-    NSDictionary *pushServiceData = [[RCIMClient sharedRCIMClient] getPushExtraFromRemoteNotification:userInfo];
-    if (pushServiceData) {
-        NSLog(@"该远程推送包含来自融云的推送服务");
-        /**
-         * 统计推送打开率2
-         */
-        [[RCIMClient sharedRCIMClient] recordRemoteNotificationEvent:userInfo];
-        
-        for (id key in [pushServiceData allKeys]) {
-            NSLog(@"key = %@, value = %@", key, pushServiceData[key]);
-        }
-    } else {
-        NSLog(@"该远程推送不包含来自融云的推送服务");
-        // 极光推送
-        [JPUSHService handleRemoteNotification:userInfo];
+- (void)registerTXIMDeviceToken:(NSData *)deviceToken {
+    if (deviceToken) {
+        V2TIMAPNSConfig *config = [[V2TIMAPNSConfig alloc] init];
+        config.businessID = TXOfflinePushCertificateIDForAPNS;
+        config.token = deviceToken;
+        [[V2TIMManager sharedInstance] setAPNS:config succ:^{
+            NSLog(@"%s, succ", __func__);
+        } fail:^(int code, NSString *desc) {
+            NSLog(@"%s, fail, %d, %@", __func__, code, desc);
+        }];
     }
 }
 
+- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
+    
+    // 极光推送
+    [JPUSHService handleRemoteNotification:userInfo];
+}
+
 /**
  * 推送处理4
  * userInfo内容请参考官网文档
@@ -433,25 +393,10 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-implementations"
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo {
-    /**
-     * 统计推送打开率2
-     */
-    [[RCIMClient sharedRCIMClient] recordRemoteNotificationEvent:userInfo];
-    /**
-     * 获取融云推送服务扩展字段2
-     */
-    NSDictionary *pushServiceData = [[RCIMClient sharedRCIMClient] getPushExtraFromRemoteNotification:userInfo];
-    if (pushServiceData) {
-        NSLog(@"该远程推送包含来自融云的推送服务");
-        for (id key in [pushServiceData allKeys]) {
-            NSLog(@"key = %@, value = %@", key, pushServiceData[key]);
-        }
-    } else {
-        NSLog(@"该远程推送不包含来自融云的推送服务");
+
         // 极光推送
         [JPUSHService handleRemoteNotification:userInfo];
     }
-}
 #pragma clang diagnostic pop
 
 - (void)applicationDidEnterBackground:(UIApplication *)application {
@@ -477,13 +422,7 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     if (self.isNeedUpdate) {
         [self versionCheck];
     }
-    RCConnectionStatus status = [[RCIMClient sharedRCIMClient] getConnectionStatus];
-    if (status == ConnectionStatus_Unconnected) {  // 连接失败或未连接 需要重新连接
-        NSString *token = UserDefault(TokenKey);
-        if (![NSString isEmptyString:token]) {
-            [USER_MANAGER checkTokenEnableConnectRongCloud];
-        }
-    }
+
     // 退到后台发送消息
     [[NSNotificationCenter defaultCenter] postNotificationName:@"appEnterForeground" object:nil];
 }
@@ -499,43 +438,6 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
 }
 
-- (void)onRCIMReceiveMessage:(RCMessage *)message left:(int)left {
-    
-    NSLog(@"conversationType----%lu",(unsigned long)message.conversationType);
-    // 此处根据消息类型处理对应信息
-    if (message.conversationType == ConversationType_CHATROOM) { // 聊天室类型为直播
-        [[KSIMService sharedService] ksOnReceivedChatroom:message left:left object:@""];
-    }
-    if (message.conversationType == ConversationType_GROUP && ![message.targetId containsString:@"COURSE"] && ![message.targetId containsString:@"FAN"]) { // 网络教室视频聊天
-        [[RCIMClient sharedRCIMClient] clearMessagesUnreadStatus:ConversationType_GROUP targetId:message.targetId];
-        [[KSIMService sharedService] ksOnReceived:message left:left object:@""];
-    }
-    else {
-        // 此处对单聊、群聊消息处理
-        dispatch_async(dispatch_get_main_queue(), ^{
-        
-            if ([message.content isMemberOfClass:[RCGroupNotificationMessage class]]) {
-                RCGroupNotificationMessage *msg = (RCGroupNotificationMessage *)message.content;
-                if ([msg.operation isEqualToString:GroupNotificationMessage_GroupOperationKicked]) {
-                    //                    [[RCIMClient sharedRCIMClient] removeConversation:ConversationType_GROUP targetId:message.targetId];
-                }
-            }
-            else {
-                int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[
-                @(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-                ]];
-                [UIApplication sharedApplication].applicationIconBadgeNumber = unreadMsgCount;
-                if (unreadMsgCount >= 1) {
-                    [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-                } else {
-                    [self.tabBarController clearNewsWithIndex:2];
-                }
-            }
-        });
-    }
-    
-}
-
 
 #pragma mark- JPUSHRegisterDelegate
 - (void)jpushNotificationAuthorization:(JPAuthorizationStatus)status withInfo:(NSDictionary *)info {
@@ -771,9 +673,9 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSString *newToken = [dic ks_stringValueForKey:@"data"];
             if (![NSString isEmptyString:newToken]) {
-                UserDefaultSet(newToken, RongTokenKey);
+                UserDefaultSet(newToken, IM_TOKEN);
                 [[NSUserDefaults standardUserDefaults] synchronize];
-                [USER_MANAGER checkTokenEnableConnectRongCloud];
+                [USER_MANAGER checkTokenEnableConnectIM];
             }
         }
         else {
@@ -788,19 +690,18 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     if (self.tabBarController) {
         [self.tabBarController removeControllerNotifer];
     }
-
-    self.tabBarController = [[KSTabBarViewController alloc] init];
-    self.window.rootViewController = self.tabBarController;
-    int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[ @(ConversationType_PRIVATE),@(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)
-    ]];
-    if (unreadMsgCount >= 1) {
-        [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-    } else {
-        [self.tabBarController clearNewsWithIndex:2];
+    // -1 为平台用户
+    if ([UserDefaultObjectForKey(TENANT_ID) integerValue] <= 0) {
+        self.tabBarController = [[KSTabBarViewController alloc] init];
+        self.window.rootViewController = self.tabBarController;
+    }
+    else {
+        self.tabBarController = [[InstitutionTabBarController alloc] init];
+        self.window.rootViewController = self.tabBarController;
     }
-    
     [[UITabBar appearance] setBackgroundImage:[[UIImage alloc] init]];
     [[UITabBar appearance] setShadowImage:[[UIImage alloc] init]];
+    [self countUnreadMessage];
 }
 
 - (void)initLoginView {
@@ -813,31 +714,11 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
     // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game.
     
-    RCConnectionStatus status = [[RCIMClient sharedRCIMClient] getConnectionStatus];
-    if (status != ConnectionStatus_SignOut) {
-        int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[@(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)]];
-        application.applicationIconBadgeNumber = unreadMsgCount;
-        if (unreadMsgCount >= 1) {
-            [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-        } else {
-            [self.tabBarController clearNewsWithIndex:2];
-        }
-    }
+    [self countUnreadMessage];
 }
 
 - (void)didReceiveMessageNotification:(NSNotification *)notification {
-    NSNumber *left = [notification.userInfo objectForKey:@"left"];
-    if ([RCIMClient sharedRCIMClient].sdkRunningMode == RCSDKRunningMode_Background && 0 == left.integerValue) {
-        int unreadMsgCount = [[RCIMClient sharedRCIMClient] getUnreadCount:@[@(ConversationType_PRIVATE), @(ConversationType_APPSERVICE), @(ConversationType_GROUP),@(ConversationType_SYSTEM)]];
-        dispatch_async(dispatch_get_main_queue(),^{
-            [UIApplication sharedApplication].applicationIconBadgeNumber = unreadMsgCount;
-            if (unreadMsgCount >= 1) {
-                [self.tabBarController noteNewsWithIndex:2 count:unreadMsgCount];
-            } else {
-                [self.tabBarController clearNewsWithIndex:2];
-            }
-        });
-    }
+    
 }
 
 - (BOOL)handleOutLink:(NSURL *)url {
@@ -1068,5 +949,44 @@ didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
     }
 }
 
+// 统计消息数量
+- (void)countUnreadMessage {
+    if ([TXIM_LINSENTER isCurrentUserLoginIM]) {
+        [TXIM_LINSENTER getUnReadCountCallback:^(NSInteger count) {
+            dispatch_async(dispatch_get_main_queue(),^{
+                NSLog(@"----- %zd",count);
+                [UIApplication sharedApplication].applicationIconBadgeNumber = count;
+                if (count >= 1) {
+                    [self noteIMNewsCount:count];
+                } else {
+                    [self clearIMNewsCount];
+                }
+                
+                NSDictionary *receiveMsg = @{@"unreadCount":@(count)};
+
+                [[NSNotificationCenter defaultCenter] postNotificationName:CHATVIEW_REFRESHSTATUS object:receiveMsg];
+            });
+        }];
+    }
+}
+
+- (void)noteIMNewsCount:(NSInteger)count {
+    if ([self.tabBarController isKindOfClass:[KSTabBarViewController class]]) {
+        [self.tabBarController noteNewsWithIndex:2 count:count];
+    }
+    else {
+        [self.tabBarController noteNewsWithIndex:1 count:count];
+    }
+}
+
+- (void)clearIMNewsCount {
+    if ([self.tabBarController isKindOfClass:[KSTabBarViewController class]]) {
+        [self.tabBarController clearNewsWithIndex:2];
+    }
+    else {
+        [self.tabBarController clearNewsWithIndex:1];
+    }
+
+}
 
 @end

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/chat_teacherTag.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Chat/search_red.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/tx_net_bad.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/tx_net_full.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/tx_net_good.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/tx_net_nomal.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/Titlenetwork/tx_net_none.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/cancle_black.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/mic_off.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/mic_on.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/network_bad.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/network_full.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/network_good.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/network_nomal.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/network_none.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/time_white.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/txClassroom_emtpy.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/tx_highlight_sopt.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/tx_nomal_sopt.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/videoMask_delete 1.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/videoMask_delete.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Classroom/video_close.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Conversation/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Conversation/group_more.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/EmptyStatus/tenant_no_networking.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/EmptyStatus/tenant_wd_img_zwsj.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/album_bg.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/album_placeholder.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/darkPage_switch.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Home/dark_moreMusic.imageset/Contents.json

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