解决bug 重新提审

.gitignore

@@ -516,3 +516,83 @@ Pods/WechatOpenSDK-XCFramework/WechatOpenSDK-XCFramework.xcframework/ios-arm64_i
 Pods/WechatOpenSDK-XCFramework/WechatOpenSDK-XCFramework.xcframework/ios-arm64_i386_x86_64-simulator/Headers/WechatAuthSDK.h
 Pods/WechatOpenSDK-XCFramework/WechatOpenSDK-XCFramework.xcframework/ios-arm64_i386_x86_64-simulator/Headers/WXApi.h
 Pods/WechatOpenSDK-XCFramework/WechatOpenSDK-XCFramework.xcframework/ios-arm64_i386_x86_64-simulator/Headers/WXApiObject.h
+Pods/Hero/README.md
+Pods/Hero/Sources/HeroCompatible.swift
+Pods/Hero/Sources/HeroContext.swift
+Pods/Hero/Sources/HeroModifier+Advanced.swift
+Pods/Hero/Sources/HeroModifier+HeroStringConvertible.swift
+Pods/Hero/Sources/HeroModifier.swift
+Pods/Hero/Sources/HeroPlugin.swift
+Pods/Hero/Sources/HeroTargetState.swift
+Pods/Hero/Sources/HeroTypes.swift
+Pods/Hero/Sources/HeroViewControllerDelegate.swift
+Pods/Hero/Sources/SwiftSupport.swift
+Pods/Hero/Sources/Animator/HeroAnimatorViewContext.swift
+Pods/Hero/Sources/Animator/HeroCoreAnimationViewContext.swift
+Pods/Hero/Sources/Animator/HeroDefaultAnimator.swift
+Pods/Hero/Sources/Animator/HeroViewPropertyViewContext.swift
+Pods/Hero/Sources/Debug Plugin/HeroDebugPlugin.swift
+Pods/Hero/Sources/Debug Plugin/HeroDebugView.swift
+Pods/Hero/Sources/Extensions/Array+HeroModifier.swift
+Pods/Hero/Sources/Extensions/CALayer+Hero.swift
+Pods/Hero/Sources/Extensions/CAMediaTimingFunction+Hero.swift
+Pods/Hero/Sources/Extensions/CG+Hero.swift
+Pods/Hero/Sources/Extensions/DispatchQueue+Hero.swift
+Pods/Hero/Sources/Extensions/Locale+Hero.swift
+Pods/Hero/Sources/Extensions/UIColor+HexString.swift
+Pods/Hero/Sources/Extensions/UIKit+Hero.swift
+Pods/Hero/Sources/Extensions/UIView+Hero.swift
+Pods/Hero/Sources/Extensions/UIViewController+Hero.swift
+Pods/Hero/Sources/Parser/HeroStringConvertible.swift
+Pods/Hero/Sources/Parser/Lexer.swift
+Pods/Hero/Sources/Parser/Nodes.swift
+Pods/Hero/Sources/Parser/Parser.swift
+Pods/Hero/Sources/Parser/Regex.swift
+Pods/Hero/Sources/Preprocessors/BasePreprocessor.swift
+Pods/Hero/Sources/Preprocessors/CascadePreprocessor.swift
+Pods/Hero/Sources/Preprocessors/ConditionalPreprocessor.swift
+Pods/Hero/Sources/Preprocessors/DefaultAnimationPreprocessor.swift
+Pods/Hero/Sources/Preprocessors/IgnoreSubviewModifiersPreprocessor.swift
+Pods/Hero/Sources/Preprocessors/MatchPreprocessor.swift
+Pods/Hero/Sources/Preprocessors/SourcePreprocessor.swift
+Pods/Hero/Sources/Transition/HeroProgressRunner.swift
+Pods/Hero/Sources/Transition/HeroTransition+Animate.swift
+Pods/Hero/Sources/Transition/HeroTransition+Complete.swift
+Pods/Hero/Sources/Transition/HeroTransition+CustomTransition.swift
+Pods/Hero/Sources/Transition/HeroTransition+Interactive.swift
+Pods/Hero/Sources/Transition/HeroTransition+Start.swift
+Pods/Hero/Sources/Transition/HeroTransition+UINavigationControllerDelegate.swift
+Pods/Hero/Sources/Transition/HeroTransition+UITabBarControllerDelegate.swift
+Pods/Hero/Sources/Transition/HeroTransition+UIViewControllerTransitioningDelegate.swift
+Pods/Hero/Sources/Transition/HeroTransition.swift
+Pods/Hero/Sources/Transition/HeroTransitionState.swift
+Pods/JXPhotoBrowser/README.md
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowser.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserAnimatedTransitioning.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserCell.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserDefaultPageIndicator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserFadeAnimator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserImageCell.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserImageView.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserLog.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserNoneAnimator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserNumberPageIndicator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserPageIndicator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserSmoothZoomAnimator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserView.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserZoomAnimator.swift
+Pods/JXPhotoBrowser/Sources/JXPhotoBrowser/JXPhotoBrowserZoomSupportedCell.swift
+Pods/Target Support Files/Hero/Hero-dummy.m
+Pods/Target Support Files/Hero/Hero-Info.plist
+Pods/Target Support Files/Hero/Hero-prefix.pch
+Pods/Target Support Files/Hero/Hero-umbrella.h
+Pods/Target Support Files/Hero/Hero.debug.xcconfig
+Pods/Target Support Files/Hero/Hero.modulemap
+Pods/Target Support Files/Hero/Hero.release.xcconfig
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser-dummy.m
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser-Info.plist
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser-prefix.pch
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser-umbrella.h
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser.debug.xcconfig
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser.modulemap
+Pods/Target Support Files/JXPhotoBrowser/JXPhotoBrowser.release.xcconfig

JiaPeiManage.xcodeproj/project.pbxproj

@@ -1652,7 +1652,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = JiaPeiManage/JiaPeiManage.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1232023080703;
+				CURRENT_PROJECT_VERSION = 1242023090401;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1674,7 +1674,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1695,7 +1695,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = JiaPeiManage/JiaPeiManage.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1232023080703;
+				CURRENT_PROJECT_VERSION = 1242023090401;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1717,7 +1717,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

JiaPeiManage/Sources/Modulars/学员/ViewModel/MeTraineeSearchViewModel.swift

@@ -87,20 +87,38 @@ class MeTraineeSearchViewModel: NSObject {
             
         }else{//绑定的学员+remark=1+ 走原始api
 //            let coachIdStr = (appCoachId == "" ? coachId: "")
-            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
-                .subscribe(onSuccess: { [unowned self] traineeDataModel in
-                    self.rows.removeAll()
-                    self.traineeDataModel = traineeDataModel
-                    self.rows += traineeDataModel.rows!
-                    print("coachInfoListRequest成功")
-                    vc.isEmptyDisplay = true
-                    vc.hideLoadAnimation()
-                    vc.stopRefresh()
-                    vc.tableView.reloadData()
-                }, onError: { error in
-                    vc.stopRefresh()
-                })
-                .disposed(by: vc.disposeBag)
+            if (schoolId==0 && appCoachId == "") {//我的 - 非绑定学员
+                self.cocahService.coachInfoMyListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: { [unowned self] traineeDataModel in
+                        self.rows.removeAll()
+                        self.traineeDataModel = traineeDataModel
+                        self.rows += traineeDataModel.rows!
+                        print("coachInfoMyListRequest成功")
+                        vc.isEmptyDisplay = true
+                        vc.hideLoadAnimation()
+                        vc.stopRefresh()
+                        vc.tableView.reloadData()
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }else{//在校和绑定走同接口
+                self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: { [unowned self] traineeDataModel in
+                        self.rows.removeAll()
+                        self.traineeDataModel = traineeDataModel
+                        self.rows += traineeDataModel.rows!
+                        print("coachInfoListRequest成功")
+                        vc.isEmptyDisplay = true
+                        vc.hideLoadAnimation()
+                        vc.stopRefresh()
+                        vc.tableView.reloadData()
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }
+            
         }
         
     }
@@ -149,18 +167,34 @@ class MeTraineeSearchViewModel: NSObject {
             }
             
         }else{//绑定的学员+remark=1+ 走原始api
-            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
-                .subscribe(onSuccess: { [unowned self] traineeDataModel in
-                    self.traineeDataModel = traineeDataModel
-                    if(traineeDataModel.rows!.count>0){
-                        self.rows += traineeDataModel.rows!
-                    }
-                    vc.tableView.reloadData()
-                    vc.stopLoad()
-                }, onError: { error in
-                    vc.stopRefresh()
-                })
-                .disposed(by: vc.disposeBag)
+            if schoolId>0 {//在校
+                self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: { [unowned self] traineeDataModel in
+                        self.traineeDataModel = traineeDataModel
+                        if(traineeDataModel.rows!.count>0){
+                            self.rows += traineeDataModel.rows!
+                        }
+                        vc.tableView.reloadData()
+                        vc.stopLoad()
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }else {
+                self.cocahService.coachInfoMyListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: { [unowned self] traineeDataModel in
+                        self.traineeDataModel = traineeDataModel
+                        if(traineeDataModel.rows!.count>0){
+                            self.rows += traineeDataModel.rows!
+                        }
+                        vc.tableView.reloadData()
+                        vc.stopLoad()
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }
+            
         }
     }
     

JiaPeiManage/Sources/Modulars/学员/ViewModel/MeTraineeSubjectViewModel.swift

@@ -94,7 +94,6 @@ class MeTraineeSubjectViewModel: NSObject {
                         })
                         .disposed(by: vc.disposeBag)
                 }else{//我的
-                    schoolId = LocalManager.userInfo.schoolId
                     self.cocahService.coachInfoMyListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: coachId, field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
                         .subscribe(onSuccess: {[unowned self] traineeDataModel in
                             self.rows.removeAll()
@@ -154,7 +153,7 @@ class MeTraineeSubjectViewModel: NSObject {
                 })
                 .disposed(by: vc.disposeBag)
         }else{//我的
-            schoolId = LocalManager.userInfo.schoolId
+            //schoolId = LocalManager.userInfo.schoolId
             self.cocahService.coachInfoMyListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: coachId, field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
                 .subscribe(onSuccess: {[unowned self] traineeDataModel in
                     self.rows.removeAll()
@@ -275,20 +274,39 @@ class MeTraineeSubjectViewModel: NSObject {
                 .disposed(by: vc.disposeBag)
             return
         }
-        //请求网络-加载
-        self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: coachId, field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
-            .subscribe(onSuccess: {[unowned self]  traineeDataModel in
-                self.traineeDataModel = traineeDataModel
-                if(traineeDataModel.rows!.count>0){
-                    self.rows += traineeDataModel.rows!
-                }
-                itemsSubject.onNext(self.rows)//消息rx
-                print("coachInfoListRequest成功")
-//                vc.tableView.reloadData()
-                vc.stopLoad()
-            }, onError: { error in
-                vc.stopLoad()
-            })
-            .disposed(by: vc.disposeBag)
+        if schoolId>0 {//在校
+            //请求网络-加载
+            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: coachId, field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                .subscribe(onSuccess: {[unowned self]  traineeDataModel in
+                    self.traineeDataModel = traineeDataModel
+                    if(traineeDataModel.rows!.count>0){
+                        self.rows += traineeDataModel.rows!
+                    }
+                    itemsSubject.onNext(self.rows)//消息rx
+                    print("coachInfoListRequest成功")
+    //                vc.tableView.reloadData()
+                    vc.stopLoad()
+                }, onError: { error in
+                    vc.stopLoad()
+                })
+                .disposed(by: vc.disposeBag)
+        }else{//我的
+            //请求网络-加载
+            self.cocahService.coachInfoMyListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: coachId, field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                .subscribe(onSuccess: {[unowned self]  traineeDataModel in
+                    self.traineeDataModel = traineeDataModel
+                    if(traineeDataModel.rows!.count>0){
+                        self.rows += traineeDataModel.rows!
+                    }
+                    itemsSubject.onNext(self.rows)//消息rx
+                    print("coachInfoListRequest成功")
+    //                vc.tableView.reloadData()
+                    vc.stopLoad()
+                }, onError: { error in
+                    vc.stopLoad()
+                })
+                .disposed(by: vc.disposeBag)
+        }
+        
     }
 }

JiaPeiManage/Sources/Services/CoachAPI.swift

@@ -107,7 +107,7 @@ extension CoachAPI: TargetType {
             ,.stuScoreByOutId(_,_,_),.stuTmsSignListByStuId(_,_,_,_),.stuTmsLogFaceListByStuId(_,_,_,_),
                 .allStudentInfoList(_, _, _, _, _, _),.yallStudentInfoList(_, _, _, _, _, _),.yallSchoolStudentInfoList(_, _, _, _, _, _),.mycoachTempList(_,_,_,_,_,_,_,_):
             if let parameters = parameters {
-                return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
+                return .requestParameters(parameters: getMyParameters(pars: parameters)!, encoding: URLEncoding.default)
             }
             return .requestPlain
         }
@@ -118,6 +118,18 @@ extension CoachAPI: TargetType {
         return ["Content-Type":"application/json"]
     }
     
+    func getMyParameters(pars:[String : Any])->[String : Any]?{
+        var parameters: [String : Any] = [:]
+        for key in pars.keys {
+            let value = pars[key]
+            if value is String && value as! String == "" {
+            }else{
+                parameters[key] = value
+            }
+        }
+        return parameters
+    }
+    
     var parameters: [String : Any]? {
         switch self {
         case let .coachInfo(id,city):