up v1.2.2

JiaPeiManage.xcodeproj/project.pbxproj

@@ -1475,7 +1475,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071905;
+				CURRENT_PROJECT_VERSION = 1222023072002;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1495,7 +1495,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1515,7 +1515,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071905;
+				CURRENT_PROJECT_VERSION = 1222023072002;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1535,7 +1535,7 @@
 					"$(inherited)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

JiaPeiManage/Sources/Models/StuLogFacDataModel.swift

@@ -8,7 +8,7 @@
 import ObjectMapper
 
 
-struct StuLogFacInfoModel : ImmutableMappable{
+struct StuLogFaceInfoModel : ImmutableMappable{
     
     var crdate : String!
     var img : String!
@@ -29,11 +29,11 @@ struct StuLogFacInfoModel : ImmutableMappable{
 }
 
 
-struct StuLogFacDataModel : ImmutableMappable{
+struct StuLogFaceDataModel : ImmutableMappable{
     
     var code : Int!
     var msg : String!
-    var rows : [StuLogFacInfoModel]!
+    var rows : [StuLogFaceInfoModel]!
     var total : Int!
     
     init(map: Map) throws {

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeDetails/MeTraineeDetails03Controller.swift

@@ -21,8 +21,8 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
     let header03_view = MeTraineeDetails03HeaderView.loadFromNib()
     
     // MARK: 数据
-    var stuLogFacDataModel:StuLogFacDataModel?
-    var rows : [StuLogFacInfoModel] = []
+    var stuLogFaceDataModel:StuLogFaceDataModel?
+    var rows : [StuLogFaceInfoModel] = []
     var page:Int = 1
     var pageSize:Int = 10
     var stuOutId:Int = 0
@@ -49,11 +49,11 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
     // MARK: 私有方法
     func getStuResultList(){
         page = 1
-        self.cocahService.stuLogFacListByStuIdRequest(pageNum: page, pageSize: pageSize, stuOutId: stuOutId, city: LocalManager.userInfo.city!)
-            .subscribe(onSuccess: {[unowned self] stuLogFacDataModel in
+        self.cocahService.stuLogFaceListByStuIdRequest(pageNum: page, pageSize: pageSize, stuOutId: stuOutId, city: LocalManager.userInfo.city!)
+            .subscribe(onSuccess: {[unowned self] stuLogFaceDataModel in
                 self.rows.removeAll()
-                self.stuLogFacDataModel = stuLogFacDataModel
-                self.rows+=stuLogFacDataModel.rows
+                self.stuLogFaceDataModel = stuLogFaceDataModel
+                self.rows+=stuLogFaceDataModel.rows
                 print("resultInfoModel成功")
                 self.hideLoadAnimation()
                 self.tableView.reloadData()
@@ -66,9 +66,9 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
     //更多
     func getLoadMore(){
         //计算-页数
-        if (stuLogFacDataModel != nil){
+        if (stuLogFaceDataModel != nil){
             let total = pageSize*self.page
-            if(total<(stuLogFacDataModel?.total)!){
+            if(total<(stuLogFaceDataModel?.total)!){
                 self.page+=1
             }else{
                 self.stopLoad()
@@ -76,10 +76,10 @@ final class MeTraineeDetails03Controller: BaseGroupTableViewController {
             }
         }
         //请求网络-加载
-        self.cocahService.stuLogFacListByStuIdRequest(pageNum: page, pageSize: pageSize, stuOutId: stuOutId, city: LocalManager.userInfo.city!)
-            .subscribe(onSuccess: {[unowned self] stuLogFacDataModel in
-                self.stuLogFacDataModel = stuLogFacDataModel
-                self.rows+=stuLogFacDataModel.rows
+        self.cocahService.stuLogFaceListByStuIdRequest(pageNum: page, pageSize: pageSize, stuOutId: stuOutId, city: LocalManager.userInfo.city!)
+            .subscribe(onSuccess: {[unowned self] stuLogFaceDataModel in
+                self.stuLogFaceDataModel = stuLogFaceDataModel
+                self.rows+=stuLogFaceDataModel.rows
                 print("resultInfoModel成功")
                 self.tableView.reloadData()
                 self.stopLoad()
@@ -138,7 +138,7 @@ extension MeTraineeDetails03Controller:UITableViewDataSource {
         let cell = tableView.dequeueReusableCell(withIdentifier: cellIdentifier, for: indexPath) as! MeTraineeDetails03Cell
         cell.contentView.backgroundColor = ((indexPath.row%2) != 0) ? UIColor("#113357") : UIColor("#0B2B4D")
         cell.backgroundColor = ((indexPath.row%2) != 0) ? UIColor("#113357") : UIColor("#0B2B4D")
-        let info = rows[indexPath.row] as StuLogFacInfoModel
+        let info = rows[indexPath.row] as StuLogFaceInfoModel
         cell.stutime_label.text = info.crdate
         cell.user_imageview.sd_setImage(with: info.img?.urlValue)
         cell.similar_label.text = info.similar

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeListViewController.swift

@@ -206,16 +206,16 @@ extension MeTraineeListViewController : VTMagicViewDelegate {
             menuItem?.qmui_badgeLabel?.isHidden = true
         }
     }
-    
+    //1
     func magicView(_ magicView: VTMagicView, didSelectItemAt itemIndex: UInt) {
-        var menuItem = magicView.menuItem(at: itemIndex)
-        if (menuItemCurrentBtn != nil) {
-            menuItemCurrentBtn?.titleLabel?.font = NYFont.SysFont.sys_15
-            menuItemCurrentBtn?.qmui_badgeLabel?.isHidden = true
-        }
-        menuItemCurrentBtn = menuItem
-        menuItem?.titleLabel?.font = UIFont.boldSystemFont(ofSize: 17)
-        menuItem?.qmui_badgeLabel?.isHidden = false
+//        var menuItem = magicView.menuItem(at: itemIndex)
+//        if (menuItemCurrentBtn != nil) {
+//            menuItemCurrentBtn?.titleLabel?.font = NYFont.SysFont.sys_15
+//            menuItemCurrentBtn?.qmui_badgeLabel?.isHidden = true
+//        }
+//        menuItemCurrentBtn = menuItem
+//        menuItem?.titleLabel?.font = UIFont.boldSystemFont(ofSize: 17)
+//        menuItem?.qmui_badgeLabel?.isHidden = false
 //        let pageVC = magicView.viewController(atPage: itemIndex) as! MeTraineeSubjectPageViewController
 //        if pageVC != nil{
 //            menuItem?.qmui_badgeInteger = UInt(pageVC.traineeDataModel?.total ?? 0)
@@ -230,9 +230,14 @@ extension MeTraineeListViewController : VTMagicViewDelegate {
             }
         }
     }
-    
+    //3
     func magicView(_ magicView: VTMagicView, viewDidAppear viewController: UIViewController, atPage pageIndex: UInt) {
-        
+        var menuItem = magicView.menuItem(at: pageIndex)
+        if (menuItem != nil) {
+            menuItemCurrentBtn = menuItem
+            menuItem?.titleLabel?.font = UIFont.boldSystemFont(ofSize: 17)
+            menuItem?.qmui_badgeLabel?.isHidden = false
+        }
         if pageIndex == 0 || pageIndex == 1 {
             var canRefresh: Bool = false
             
@@ -249,9 +254,13 @@ extension MeTraineeListViewController : VTMagicViewDelegate {
             }
         }
     }
-    
+    //2
     func magicView(_ magicView: VTMagicView, viewDidDisappear viewController: UIViewController, atPage pageIndex: UInt) {
-        
+        var menuItem = magicView.menuItem(at: pageIndex)
+        if (menuItem != nil) {
+            menuItem?.titleLabel?.font = NYFont.SysFont.sys_15
+            menuItem?.qmui_badgeLabel?.isHidden = true
+        }
         if pageIndex == 0 || pageIndex == 1 {
             if !idxs.contains(pageIndex) {
                 idxs.append(pageIndex)
@@ -313,36 +322,5 @@ extension MeTraineeListViewController : VTMagicViewDataSource{
             }
             return meTraineeSubjectPageViewController ?? UIViewController()
         }
-//        if pageIndex == 0 {
-//            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController01")
-//            if meTraineeSubjectPageViewController == nil {
-//                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "1",schoolId: schoolId)
-//            }
-//            return meTraineeSubjectPageViewController ?? UIViewController()
-//        } else if pageIndex == 1 {
-//            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController02")
-//            if meTraineeSubjectPageViewController == nil {
-//                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "2",schoolId: schoolId)
-//            }
-//            return meTraineeSubjectPageViewController ?? UIViewController()
-//        } else if pageIndex == 2 {
-//            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController03")
-//            if meTraineeSubjectPageViewController == nil {
-//                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "3",schoolId: schoolId)
-//            }
-//            return meTraineeSubjectPageViewController ?? UIViewController()
-//        } else if pageIndex == 3{
-//            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController04")
-//            if meTraineeSubjectPageViewController == nil {
-//                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "4",schoolId: schoolId)
-//            }
-//            return meTraineeSubjectPageViewController ?? UIViewController()
-//        } else {
-//            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController05")
-//            if meTraineeSubjectPageViewController == nil {
-//                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "5",schoolId: schoolId)
-//            }
-//            return meTraineeSubjectPageViewController ?? UIViewController()
-//        }
     }
 }

JiaPeiManage/Sources/Services/CoachAPI.swift

@@ -27,7 +27,7 @@ enum CoachAPI {
     //查询签到记录
     case stuTmsSignListByStuId(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String)
     //查询人脸比对记录
-    case stuTmsLogFacListByStuId(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String)
+    case stuTmsLogFaceListByStuId(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String)
 }
 
 extension CoachAPI: TargetType {
@@ -35,7 +35,7 @@ extension CoachAPI: TargetType {
     var baseURL: URL {
         switch self {
         case .coachInfo,.coachQrInfo,.coachInfoList,.coachTempList,.studentInfoById,
-                .stuScoreByOutId,.stuTmsSignListByStuId,.stuTmsLogFacListByStuId,
+                .stuScoreByOutId,.stuTmsSignListByStuId,.stuTmsLogFaceListByStuId,
                 .allStudentInfoList:
             return URL(string: HttpRequest.api.path)!
         }
@@ -60,8 +60,8 @@ extension CoachAPI: TargetType {
             return "/jsjp-admin/open-api/gzpt/userInfo/getUserScoreByOutId"
         case .stuTmsSignListByStuId(_,_,_,_):
             return "/jsjp-admin/open-api/tms/coachInfo/getTmsSignListByStuId"
-        case .stuTmsLogFacListByStuId(_,_,_,_):
-            return "/jsjp-admin/open-api/tms/coachInfo/getTmsLogFacListByStuId"
+        case .stuTmsLogFaceListByStuId(_,_,_,_):
+            return "/jsjp-admin/open-api/tms/coachInfo/getTmsLogFaceListByStuId"
             
         }
         
@@ -70,7 +70,7 @@ extension CoachAPI: TargetType {
     var method: Moya.Method {
         switch self {
         case .coachInfo,.coachQrInfo,.coachInfoList,.coachTempList,
-                .studentInfoById,.stuScoreByOutId,.stuTmsLogFacListByStuId:
+                .studentInfoById,.stuScoreByOutId,.stuTmsLogFaceListByStuId:
             return .get
         default:
             return .get
@@ -84,7 +84,7 @@ extension CoachAPI: TargetType {
     var task: Moya.Task {
         switch self {
         case .coachInfo(_,_),.coachQrInfo(_,_),.coachInfoList(_,_,_,_,_,_,_,_),.coachTempList(_,_,_,_,_,_,_,_),.studentInfoById(_,_)
-            ,.stuScoreByOutId(_,_,_),.stuTmsSignListByStuId(_,_,_,_),.stuTmsLogFacListByStuId(_,_,_,_),
+            ,.stuScoreByOutId(_,_,_),.stuTmsSignListByStuId(_,_,_,_),.stuTmsLogFaceListByStuId(_,_,_,_),
                 .allStudentInfoList(_, _, _, _, _, _):
             if let parameters = parameters {
                 return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
@@ -143,7 +143,7 @@ extension CoachAPI: TargetType {
                     "pageSize": pageSize,
                     "id": stuOutId,
                     "city":city,]
-        case let .stuTmsLogFacListByStuId(pageNum, pageSize, stuOutId, city):
+        case let .stuTmsLogFaceListByStuId(pageNum, pageSize, stuOutId, city):
             return ["pageNum": pageNum,
                     "pageSize": pageSize,
                     "id": stuOutId,

JiaPeiManage/Sources/Services/CoachService.swift

@@ -27,7 +27,7 @@ protocol CoachServiceType {
     //查询签到记录
     func stuTmsSignListByStuIdRequest(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String) -> Single<StuTmsSignDataModel>
     //查询人脸比对记录
-    func stuLogFacListByStuIdRequest(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String) -> Single<StuLogFacDataModel>
+    func stuLogFaceListByStuIdRequest(pageNum:Int ,pageSize:Int ,stuOutId:Int,city:String) -> Single<StuLogFaceDataModel>
 
 }
 
@@ -79,9 +79,9 @@ final class CoachService: CoachServiceType {
         return networking.request(api).map(StuTmsSignDataModel.self, isModel: true)
     }
     
-    func stuLogFacListByStuIdRequest(pageNum: Int, pageSize: Int, stuOutId: Int, city: String) -> RxSwift.Single<StuLogFacDataModel> {
-        let api = CoachAPI.stuTmsLogFacListByStuId(pageNum: pageNum, pageSize: pageSize, stuOutId: stuOutId, city: city)
-        return networking.request(api).map(StuLogFacDataModel.self, isModel: true)
+    func stuLogFaceListByStuIdRequest(pageNum: Int, pageSize: Int, stuOutId: Int, city: String) -> RxSwift.Single<StuLogFaceDataModel> {
+        let api = CoachAPI.stuTmsLogFaceListByStuId(pageNum: pageNum, pageSize: pageSize, stuOutId: stuOutId, city: city)
+        return networking.request(api).map(StuLogFaceDataModel.self, isModel: true)
     }
     
 }