添加 search 全局api，修改与报名view

JiaPeiManage.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>JiaPeiManage.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>52</integer>
+			<integer>53</integer>
 		</dict>
 	</dict>
 </dict>

JiaPeiManage/JSJP-Brigding-Header.h

@@ -14,6 +14,7 @@
 #import <QMUIKit/QMUIKit.h>
 #import <SDWebImage/SDWebImage.h>
 #import <UMCommon/UMCommon.h>
+#import <Bugly/Bugly.h>
 //加密
 #import "DES3Util.h"
 #endif /* JSJP_Brigding_Header_h */

JiaPeiManage/Sources/Constants/NYMacros.swift

@@ -14,7 +14,9 @@ struct NYMacros {
     static let appBuild = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion")
     //友盟key
     static let appMenKey = "648bf1ac87568a379b57b0cd"
-
+    //bugly key
+    static let appbuglyKey = "4c23a341-cdbb-4139-9da3-2377aad1abee"
+    static let appbuglyId = "9318ff6ab4"
     ///------
     /// iOS Version
     ///------

JiaPeiManage/Sources/Main/App/CompositionRoot.swift

@@ -77,6 +77,8 @@ final class CompositionRoot {
         //友盟 UM_APPKEY
         UMConfigure.setLogEnabled(true)
         UMConfigure.initWithAppkey(NYMacros.appMenKey, channel: "App Store")
+        //bugly key
+        Bugly.start(withAppId:NYMacros.appbuglyId)
     }
     
     static func configureAppearance() {

JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift

@@ -68,10 +68,10 @@ final class HomeViewController: BaseViewController {
         //我的学员-action-btn
         self.meStuAction_button.rx.tap.subscribe ({ [unowned self] (_)  in
             if !LocalManager.isOpenLogin() { return}
-            if LocalManager.userInfo.cityPower == "1" && LocalManager.userInfo.userAccount != "350211196508204525" {
-                NYSwRouter.open(NYSwOpenType.traineetab.rawValue)
-                return
-            }
+//            if LocalManager.userInfo.cityPower == "1" && LocalManager.userInfo.userAccount != "350211196508204525" {
+//                NYSwRouter.open(NYSwOpenType.traineetab.rawValue)
+//                return
+//            }
             NYSwRouter.push(NYSwPushType.trainee_list.path)
         }).disposed(by: disposeBag)
         //在校学员-action

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

@@ -77,7 +77,7 @@ final class MeTraineeDetailsPageViewController: BaseViewController {
         setupUI()
         configureMagicController()
         cocahService.studentInfoByIdRequest(city: LocalManager.userInfo.city!, id: stuId)
-            .subscribe { traineeInfoModel in
+            .subscribe { [unowned self] traineeInfoModel in
                 self.traineeInfoModel = traineeInfoModel
                 self.biandView()
                 if(self.pageController.currentPage==0){

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

@@ -10,10 +10,10 @@ import RxSwift
 import RxCocoa
 
 enum TraineeType {
-    case advancet
-    case official
-    case biandstu
-    case none
+    case advancet //预报名
+    case official //正式
+    case biandstu //绑定
+    case none //普通-模式
 }
 
 final class MeTraineeListViewController: BaseViewController {
@@ -69,17 +69,22 @@ final class MeTraineeListViewController: BaseViewController {
             make.height.equalTo(Metric.navBarHeight)
             make.top.equalTo(statusBar.snp.bottom)
         }
-        if self.type != .advancet {
-            pageController.view.snp.makeConstraints { (make) in
-                make.left.right.bottom.equalToSuperview()
-                make.top.equalTo(navBar.snp.bottom)
-            }
-        }else {
-            advancetTraineeSubjectPageViewController?.view.snp.makeConstraints { (make) in
-                make.left.right.bottom.equalToSuperview()
-                make.top.equalTo(navBar.snp.bottom)
-            }
+        
+        pageController.view.snp.makeConstraints { (make) in
+            make.left.right.bottom.equalToSuperview()
+            make.top.equalTo(navBar.snp.bottom)
         }
+//        if self.type != .advancet {
+//            pageController.view.snp.makeConstraints { (make) in
+//                make.left.right.bottom.equalToSuperview()
+//                make.top.equalTo(navBar.snp.bottom)
+//            }
+//        }else {
+//            advancetTraineeSubjectPageViewController?.view.snp.makeConstraints { (make) in
+//                make.left.right.bottom.equalToSuperview()
+//                make.top.equalTo(navBar.snp.bottom)
+//            }
+//        }
     }
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
     }
@@ -96,19 +101,20 @@ final class MeTraineeListViewController: BaseViewController {
         
         switch type {
         case .advancet:
-            self.navBar.title_label.text = "我的学员-预报名"
+            self.navBar.title_label.text = "我的学员" //"我的学员-预报名"
             self.title = "预报名学员"
             self.tabBarItem.image = NYImage.TabBar.advancet
             self.tabBarItem.selectedImage = NYImage.TabBar.advancet_s?.withRenderingMode(.alwaysOriginal)
+            menuTitles = ["预报名","科一", "科二", "科三", "科四", "毕业"]
           return
         case .official:
-            self.navBar.title_label.text = "我的学员-正式"
+            self.navBar.title_label.text = "我的学员" //"我的学员-正式"
             self.title = "正式学员"
             self.tabBarItem.image = NYImage.TabBar.official
             self.tabBarItem.selectedImage = NYImage.TabBar.official_s?.withRenderingMode(.alwaysOriginal)
             return
         case .biandstu:
-            self.navBar.title_label.text = "我的绑定学员"
+            self.navBar.title_label.text = "绑定学员"
             return
         case .none:
             return
@@ -146,24 +152,38 @@ final class MeTraineeListViewController: BaseViewController {
      
         self.view.addSubview(navBar)
         self.view.addSubview(statusBar)
-        if self.type != .advancet {
-            self.addChild(pageController)
-            self.view.addSubview(pageController.view)
-            //设置VTMagicController代理,初始页码
-            pageController.magicView.delegate = self
-            pageController.magicView.dataSource = self
-            pageController.magicView.reloadData(toPage: 0)
-        }else{
-            //预报名
-            advancetTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "0",schoolId: schoolId)
-            self.addChild(advancetTraineeSubjectPageViewController!)
-            self.view.addSubview(advancetTraineeSubjectPageViewController!.view)
-        }
+        self.addChild(pageController)
+        self.view.addSubview(pageController.view)
+        //设置VTMagicController代理,初始页码
+        pageController.magicView.delegate = self
+        pageController.magicView.dataSource = self
+        pageController.magicView.reloadData(toPage: 0)
+//        if self.type != .advancet {
+//            self.addChild(pageController)
+//            self.view.addSubview(pageController.view)
+//            //设置VTMagicController代理,初始页码
+//            pageController.magicView.delegate = self
+//            pageController.magicView.dataSource = self
+//            pageController.magicView.reloadData(toPage: 0)
+//        }else{
+//            //预报名
+//            advancetTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "0",schoolId: schoolId)
+//            self.addChild(advancetTraineeSubjectPageViewController!)
+//            self.view.addSubview(advancetTraineeSubjectPageViewController!.view)
+//        }
         
     }
     
     @objc func jumpSearchdo(_ sender: Any){
-        NYSwRouter.push(NYSwPushType.trainee_search.path)
+        var context = 0 //我的
+        if type == .biandstu {
+            context = 2 //绑定
+        }else {
+            if schoolId > 0 {
+                context = 1 //在校
+            }
+        }
+        NYSwRouter.push(NYSwPushType.trainee_search,context: context)
     }
     
 }
@@ -262,7 +282,11 @@ extension MeTraineeListViewController : VTMagicViewDataSource{
 //            menuItem?.qmui_badgeInteger = 50
             menuItem?.qmui_badgeLabel?.isHidden = true
             menuItem?.qmui_badgeFont = NYFont.SysFont.sys_10
-            menuItem?.qmui_badgeOffset = CGPoint(x: -35, y: 26)
+            if self.type != .advancet {
+                menuItem?.qmui_badgeOffset = CGPoint(x: -35, y: 26)
+            }else {
+                menuItem?.qmui_badgeOffset = CGPoint(x: -25, y: 26)
+            }
             menuItem?.qmui_badgeContentEdgeInsets = UIEdgeInsets(top: 2, left: 2, bottom: 2, right: 2)
         }
         
@@ -271,36 +295,49 @@ extension MeTraineeListViewController : VTMagicViewDataSource{
     
     func magicView(_ magicView: VTMagicView, viewControllerAtPage pageIndex: UInt) -> 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 self.type != .advancet {
+            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController0\(pageIndex)")
             if meTraineeSubjectPageViewController == nil {
-                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "4",schoolId: schoolId)
+                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "\(pageIndex+1)",schoolId: schoolId)
             }
             return meTraineeSubjectPageViewController ?? UIViewController()
-        } else {
-            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController05")
+        }else{
+            var meTraineeSubjectPageViewController = magicView.dequeueReusablePage(withIdentifier: "MeTraineeSubjectPageViewController0\(pageIndex)")
             if meTraineeSubjectPageViewController == nil {
-                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "5",schoolId: schoolId)
+                meTraineeSubjectPageViewController = MeTraineeSubjectPageViewController(type: self.type!,state: "\(pageIndex)",schoolId: schoolId)
             }
             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/Modulars/学员/Controllers/MeTraineeSearchPageViewController.swift

@@ -21,7 +21,9 @@ final class MeTraineeSearchPageViewController: BaseTableViewController {
     let meTraineeSearchViewModel = MeTraineeSearchViewModel()
 
     let headerView = MeTraineeSubjectHeaderView.loadFromNib()
-    
+    var schoolId:Int = 0
+    var appCoachId = ""
+    var coachId = ""
     //重置约束
     override func setupConstraints() {
         self.tableView.snp.remakeConstraints { make in
@@ -33,6 +35,9 @@ final class MeTraineeSearchPageViewController: BaseTableViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        meTraineeSearchViewModel.appCoachId = appCoachId
+        meTraineeSearchViewModel.schoolId = schoolId
+        meTraineeSearchViewModel.coachId = coachId
         setupUI()
         biandView()
     }

JiaPeiManage/Sources/Modulars/学员/Controllers/MeTraineeSearchPageViewController.xib

@@ -26,7 +26,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XNY-06-WRn" userLabel="View-nav">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的学员" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MsS-vL-AJw">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="搜索学员" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MsS-vL-AJw">
                             <rect key="frame" x="137.66666666666666" y="20" width="100" height="44"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="100" id="u7d-oa-hVg"/>

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

@@ -15,9 +15,11 @@ class MeTraineeSearchViewModel: NSObject {
     // MARK: 数据
     var traineeDataModel:TraineeDataModel?
     var page:Int = 1
-    var pageSize:Int = 100
+    var pageSize:Int = 250
     var state = ""
-    
+    var schoolId:Int = 0
+    var appCoachId = ""
+    var coachId = ""
     private let itemsSubject = BehaviorSubject<[RowInfo]>(value: [])
         
     var items: Observable<[RowInfo]> {
@@ -33,8 +35,33 @@ class MeTraineeSearchViewModel: NSObject {
     func searchCoachInfoList(searchPageVC:MeTraineeSearchPageViewController)
     {
         print("网络请求")
-        self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: searchPageVC.search_textfield.text!, pageNum: page, pageSize: pageSize, schoolId: 0, state: state)
-            .subscribe(onSuccess: { [unowned self] traineeDataModel in
+        var keyword:String = searchPageVC.search_textfield.text!.trimmingCharacters(in: .whitespacesAndNewlines)
+        if keyword == "" {
+            self.traineeDataModel?.total = 0
+            self.traineeDataModel?.rows?.removeAll()
+            searchPageVC.isEmptyDisplay = true
+            searchPageVC.hideLoadAnimation()
+            searchPageVC.stopRefresh()
+            searchPageVC.tableView.reloadData()
+            return
+        }
+        //绑定的学员+remark=1+ 走原始api
+        if appCoachId != "" && LocalManager.userInfo.cityPower == "1"{
+            self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: appCoachId, coachId: "", field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                .subscribe(onSuccess: { [unowned self] traineeDataModel in
+                    self.traineeDataModel = traineeDataModel
+    //                itemsSubject.onNext(traineeDataModel.rows!)
+                    print("coachInfoListRequest成功")
+                    searchPageVC.isEmptyDisplay = true
+                    searchPageVC.hideLoadAnimation()
+                    searchPageVC.stopRefresh()
+                    searchPageVC.tableView.reloadData()
+                }, onError: { error in
+                    searchPageVC.stopRefresh()
+                })
+                .disposed(by: searchPageVC.disposeBag)
+        }else{
+            self.cocahService.allStudentInfoListRequest(city: LocalManager.userInfo.city!, coachId:coachId, field: keyword, pageNum: page, pageSize: pageSize, schoolId: schoolId).subscribe(onSuccess: { [unowned self] traineeDataModel in
                 self.traineeDataModel = traineeDataModel
 //                itemsSubject.onNext(traineeDataModel.rows!)
                 print("coachInfoListRequest成功")
@@ -46,5 +73,7 @@ class MeTraineeSearchViewModel: NSObject {
                 searchPageVC.stopRefresh()
             })
             .disposed(by: searchPageVC.disposeBag)
+        }
+        
     }
 }

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

@@ -37,21 +37,42 @@ class MeTraineeSubjectViewModel: NSObject {
     {
         page = 1
         if (self.type == .advancet){ //预报名
-            self.cocahService.coachTempListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
-                .subscribe(onSuccess: {[unowned self] traineeDataModel in
-                    self.rows.removeAll()
-                    self.traineeDataModel = traineeDataModel
-                    self.rows += traineeDataModel.rows!
-                    itemsSubject.onNext(self.rows)//消息rx
-                    print("coachInfoListRequest成功")
-                    vc.isEmptyDisplay = true
-                    vc.hideLoadAnimation()
-                    vc.tableView.reloadData()
-                    vc.stopRefresh()
-                }, onError: { error in
-                    vc.stopRefresh()
-                })
-                .disposed(by: vc.disposeBag)
+            if state == "0" {
+                self.cocahService.coachTempListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: {[unowned self] traineeDataModel in
+                        self.rows.removeAll()
+                        self.traineeDataModel = traineeDataModel
+                        self.rows += traineeDataModel.rows!
+                        itemsSubject.onNext(self.rows)//消息rx
+                        print("coachInfoListRequest成功")
+                        vc.isEmptyDisplay = true
+                        vc.hideLoadAnimation()
+                        vc.tableView.reloadData()
+                        vc.stopRefresh()
+                        NotificationCenter.default.post(name: Notification.updateItemTopTotalNameNotification, object: [traineeDataModel.total,Int(self.state)!])
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }else {
+                self.cocahService.coachInfoListRequest(city: LocalManager.userInfo.city!, appCoachId: "", coachId: "\(LocalManager.userInfo.id)", field: "", pageNum: page, pageSize: pageSize, schoolId: schoolId, state: state)
+                    .subscribe(onSuccess: {[unowned self] traineeDataModel in
+                        self.rows.removeAll()
+                        self.traineeDataModel = traineeDataModel
+                        self.rows += traineeDataModel.rows!
+                        itemsSubject.onNext(self.rows)//消息rx
+                        print("coachInfoListRequest成功")
+                        vc.isEmptyDisplay = true
+                        vc.hideLoadAnimation()
+                        vc.tableView.reloadData()
+                        vc.stopRefresh()
+                        NotificationCenter.default.post(name: Notification.updateItemTopTotalNameNotification, object: [traineeDataModel.total,Int(self.state)!])
+                    }, onError: { error in
+                        vc.stopRefresh()
+                    })
+                    .disposed(by: vc.disposeBag)
+            }
+            
             
             return
         }else if(self.type == .biandstu){ //绑定学员

JiaPeiManage/Sources/Modulars/学员/Views/MeTraineeSubjectCell.swift

@@ -82,14 +82,14 @@ final class MeTraineeSubjectCell: UITableViewCell,NibLoadable {
         var k3Img = "K3_no", k3Txt = "未通过"
         if rowInfo.trainThreeExamStatus=="1" {
             k3Img = "K3_yes"
-            k3Txt = "\(rowInfo.trainThreeExamStatus?.prefix(10) ?? "")"
+            k3Txt = "\(rowInfo.trainThreeExamTime?.prefix(10) ?? "")"
         }
         self.k3_imageview.image = UIImage(named: k3Img)
         self.k3_label.text = k3Txt
         var k4Img = "K4_no", k4Txt = "未通过"
         if rowInfo.trainThreeExamStatus=="1" {
             k4Img = "K4_yes"
-            k4Txt = "\(rowInfo.trainThreeExamStatus?.prefix(10) ?? "")"
+            k4Txt = "\(rowInfo.trainFourExamTime?.prefix(10) ?? "")"
         }
         self.k4_imageview.image = UIImage(named: k4Img)
         self.k4_label.text = k4Txt

JiaPeiManage/Sources/Modulars/学员/Views/MeTraineeSubjectCell.xib

@@ -118,7 +118,7 @@
                                     <color key="textColor" red="0.71372549019607845" green="0.75686274509803919" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="k2_no" translatesAutoresizingMaskIntoConstraints="NO" id="1U8-M0-twU">
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="K2_no" translatesAutoresizingMaskIntoConstraints="NO" id="1U8-M0-twU">
                                     <rect key="frame" x="181" y="7" width="24" height="24"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="24" id="WO6-yC-Vt5"/>
@@ -297,11 +297,11 @@
     </objects>
     <resources>
         <image name="K1_no" width="24" height="24"/>
+        <image name="K2_no" width="24" height="24"/>
         <image name="K3_no" width="24" height="24"/>
         <image name="K4_no" width="24" height="24"/>
         <image name="call_phone" width="36" height="36"/>
         <image name="default-user-male" width="74" height="102"/>
-        <image name="k2_no" width="24" height="24"/>
         <image name="send_msg" width="36" height="36"/>
         <image name="user-male" width="18" height="18"/>
     </resources>

JiaPeiManage/Sources/Services/CoachAPI.swift

@@ -16,6 +16,8 @@ enum CoachAPI {
     case coachQrInfo(id:String ,city:String)
     //获取教练的学员
     case coachInfoList(city:String,appCoachId:String ,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int ,state:String )
+    //获取教练的学员-针对搜索专用-全局
+    case allStudentInfoList(city:String,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int)
     //获取教练预报名的学员
     case coachTempList(city:String,appCoachId:String ,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int ,state:String )
     //通过id获取学员详细
@@ -33,12 +35,14 @@ extension CoachAPI: TargetType {
     var baseURL: URL {
         switch self {
         case .coachInfo,.coachQrInfo,.coachInfoList,.coachTempList,.studentInfoById,
-                .stuScoreByOutId,.stuTmsSignListByStuId,.stuTmsLogFacListByStuId:
+                .stuScoreByOutId,.stuTmsSignListByStuId,.stuTmsLogFacListByStuId,
+                .allStudentInfoList:
             return URL(string: HttpRequest.api.path)!
         }
     }
     
     var path: String {
+//    city:String ,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int
         switch self {
         case .coachInfo(_,_):
             return "/jsjp-admin/open-api/tms/coachInfo/getCoachInfo"
@@ -46,6 +50,8 @@ extension CoachAPI: TargetType {
             return "/jsjp-admin/open-api/tms/coachInfo/getCoachQrInfo"
         case .coachInfoList(_,_,_,_,_,_,_,_):
             return "/jsjp-admin/open-api/tms/coachInfo/list"
+        case .allStudentInfoList(_, _, _, _, _, _):
+            return "/jsjp-admin/open-api/tms/coachInfo/allStudentInfoList"
         case .coachTempList(_,_,_,_,_,_,_,_):
             return "/jsjp-admin/open-api/tms/coachInfo/studenTempList"
         case .studentInfoById(_,_):
@@ -78,7 +84,8 @@ extension CoachAPI: TargetType {
     var task: Moya.Task {
         switch self {
         case .coachInfo(_,_),.coachQrInfo(_,_),.coachInfoList(_,_,_,_,_,_,_,_),.coachTempList(_,_,_,_,_,_,_,_),.studentInfoById(_,_)
-            ,.stuScoreByOutId(_,_,_),.stuTmsSignListByStuId(_,_,_,_),.stuTmsLogFacListByStuId(_,_,_,_):
+            ,.stuScoreByOutId(_,_,_),.stuTmsSignListByStuId(_,_,_,_),.stuTmsLogFacListByStuId(_,_,_,_),
+                .allStudentInfoList(_, _, _, _, _, _):
             if let parameters = parameters {
                 return .requestParameters(parameters: parameters, encoding: URLEncoding.default)
             }
@@ -117,6 +124,13 @@ extension CoachAPI: TargetType {
                     "pageSize": pageSize,
                     "schoolId": schoolId==0 ?"":"\(schoolId)",
                     "state": state,]
+        case let .allStudentInfoList(city, coachId, field, pageNum, pageSize, schoolId):
+            return ["city": city,
+                    "coachId": coachId,
+                    "field": field,
+                    "pageNum": pageNum,
+                    "pageSize": pageSize,
+                    "schoolId": schoolId==0 ?"":"\(schoolId)"]
         case let .studentInfoById(city,id):
             return ["city": city,
                     "id": id,]

JiaPeiManage/Sources/Services/CoachService.swift

@@ -16,6 +16,8 @@ protocol CoachServiceType {
     func coachQrInfoRequest(id:String ,city:String) -> Single<CoachJsonInfo>
     //获取我的学员信息list
     func coachInfoListRequest(city:String,appCoachId:String ,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int ,state:String) -> Single<TraineeDataModel>
+    //获取全局学员信息list
+    func allStudentInfoListRequest(city:String,coachId:String,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int ) -> Single<TraineeDataModel>
     //获取我的预报名学员信息list
     func coachTempListRequest(city:String,appCoachId:String ,coachId:String ,field:String ,pageNum:Int ,pageSize:Int ,schoolId:Int ,state:String) -> Single<TraineeDataModel>
     //通过id获取学员详细
@@ -52,6 +54,11 @@ final class CoachService: CoachServiceType {
         return networking.request(api).map(TraineeDataModel.self,isModel: true)
     }
     
+    func allStudentInfoListRequest(city: String,coachId:String, field: String, pageNum: Int, pageSize: Int, schoolId: Int) -> RxSwift.Single<TraineeDataModel> {
+        let api = CoachAPI.allStudentInfoList(city: city, coachId: coachId , field: field, pageNum: pageNum, pageSize: pageSize, schoolId: schoolId)
+        return networking.request(api).map(TraineeDataModel.self,isModel: true)
+    }
+    
     func coachTempListRequest(city: String, appCoachId: String, coachId: String, field: String, pageNum: Int, pageSize: Int, schoolId: Int, state: String) -> RxSwift.Single<TraineeDataModel> {
         let api = CoachAPI.coachTempList(city: city, appCoachId: appCoachId, coachId: coachId, field: field, pageNum: pageNum, pageSize: pageSize, schoolId: schoolId, state: state)
         return networking.request(api).map(TraineeDataModel.self,isModel: true)

JiaPeiManage/Sources/Utils/URLNavigationMap.swift

@@ -22,7 +22,23 @@ final class URLNavigationMap {
         }
         
         navigator.register(NYSwPushType.trainee_search.path) { (url, values, context) -> UIViewController? in
+            guard let context = context as? Int
+            else { return nil }
+            
             let meTraineeSearchPageViewController = MeTraineeSearchPageViewController(nibName: "MeTraineeSearchPageViewController")
+            switch context {
+                case 0://我的学员
+                meTraineeSearchPageViewController.coachId = "\(LocalManager.userInfo.id)"
+                break
+                case 1://在校学员
+                meTraineeSearchPageViewController.schoolId = LocalManager.userInfo.schoolId
+                break
+                case 2://绑定学员
+                meTraineeSearchPageViewController.appCoachId = "\(LocalManager.userInfo.id)"
+                break
+            default:
+                meTraineeSearchPageViewController.coachId = "\(LocalManager.userInfo.id)"
+            }
             return meTraineeSearchPageViewController
         }
         
@@ -37,6 +53,11 @@ final class URLNavigationMap {
         }
         
         navigator.register(NYSwPushType.trainee_list.path) { (url, values, context) -> UIViewController? in
+            
+            if LocalManager.userInfo.cityPower == "1" && LocalManager.userInfo.userAccount != "350211196508204525" {
+                let meTraineeListViewController = MeTraineeListViewController(type: .advancet)
+                return meTraineeListViewController
+            }
             let meTraineeListViewController = MeTraineeListViewController(type: .none)
             return meTraineeListViewController
         }
@@ -47,7 +68,11 @@ final class URLNavigationMap {
         }
         
         navigator.register(NYSwPushType.trainee_list_school.path) { (url, values, context) -> UIViewController? in
-            
+            if LocalManager.userInfo.cityPower == "1" && LocalManager.userInfo.userAccount != "350211196508204525" {
+                let meTraineeListViewController = MeTraineeListViewController(type: .advancet)
+                meTraineeListViewController.schoolId = context as! Int
+                return meTraineeListViewController
+            }
             let meTraineeListViewController = MeTraineeListViewController(type: .none)
             meTraineeListViewController.schoolId = context as! Int
             return meTraineeListViewController

Podfile

@@ -69,7 +69,8 @@ target 'JiaPeiManage' do
   pod 'UMDevice'    #必须集成
   #依赖库
   pod 'UMCCommonLog'  #可选，日志插件
-
+  
+  pod 'Bugly'         #bugly线上bug
 end
 
 post_install do |installer|

Podfile.lock

@@ -1,5 +1,6 @@
 PODS:
   - Alamofire (5.7.1)
+  - Bugly (2.5.93)
   - CGFloatLiteral (0.5.0)
   - CocoaLumberjack/Core (3.8.0)
   - CocoaLumberjack/Swift (3.8.0):
@@ -394,6 +395,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire
+  - Bugly
   - CGFloatLiteral
   - CocoaLumberjack/Swift
   - Dollar
@@ -441,6 +443,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - Alamofire
+    - Bugly
     - CGFloatLiteral
     - CocoaLumberjack
     - Differentiator
@@ -500,6 +503,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
+  Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
   CGFloatLiteral: 0328648f666e3cb2263d5ee3972df9d320786d25
   CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
   Differentiator: 886080237d9f87f322641dedbc5be257061b0602
@@ -549,6 +553,6 @@ SPEC CHECKSUMS:
   WeakMapTable: 05c694ce8439a7a9ebabb56187287a63c57673d6
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-PODFILE CHECKSUM: c47d0ec12ca57fa81c2fe39e91bc57cbe2767313
+PODFILE CHECKSUM: 73a6ff66173dabc497fc5344096bc4339789187c
 
 COCOAPODS: 1.12.1

Pods/Manifest.lock

@@ -1,5 +1,6 @@
 PODS:
   - Alamofire (5.7.1)
+  - Bugly (2.5.93)
   - CGFloatLiteral (0.5.0)
   - CocoaLumberjack/Core (3.8.0)
   - CocoaLumberjack/Swift (3.8.0):
@@ -394,6 +395,7 @@ PODS:
 
 DEPENDENCIES:
   - Alamofire
+  - Bugly
   - CGFloatLiteral
   - CocoaLumberjack/Swift
   - Dollar
@@ -441,6 +443,7 @@ DEPENDENCIES:
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
     - Alamofire
+    - Bugly
     - CGFloatLiteral
     - CocoaLumberjack
     - Differentiator
@@ -500,6 +503,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88
+  Bugly: b8715e6ec4004b7f7fbffab0643ba80545aee3da
   CGFloatLiteral: 0328648f666e3cb2263d5ee3972df9d320786d25
   CocoaLumberjack: 78abfb691154e2a9df8ded4350d504ee19d90732
   Differentiator: 886080237d9f87f322641dedbc5be257061b0602
@@ -549,6 +553,6 @@ SPEC CHECKSUMS:
   WeakMapTable: 05c694ce8439a7a9ebabb56187287a63c57673d6
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-PODFILE CHECKSUM: c47d0ec12ca57fa81c2fe39e91bc57cbe2767313
+PODFILE CHECKSUM: 73a6ff66173dabc497fc5344096bc4339789187c
 
 COCOAPODS: 1.12.1

Pods/Pods.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -11,362 +11,369 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
-		<key>CGFloatLiteral.xcscheme</key>
+		<key>Bugly.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
-		<key>CocoaLumberjack.xcscheme</key>
+		<key>CGFloatLiteral.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
 			<integer>2</integer>
 		</dict>
-		<key>Differentiator.xcscheme</key>
+		<key>CocoaLumberjack.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
 			<integer>3</integer>
 		</dict>
-		<key>Dollar.xcscheme</key>
+		<key>Differentiator.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
 			<integer>4</integer>
 		</dict>
+		<key>Dollar.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>5</integer>
+		</dict>
 		<key>ESPullToRefresh-ESPullToRefresh.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>8</integer>
 		</dict>
 		<key>ESPullToRefresh.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>7</integer>
 		</dict>
 		<key>EmptyKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>FSPagerView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>9</integer>
 		</dict>
 		<key>GDPerformanceView-Swift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>Kingfisher.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>11</integer>
 		</dict>
 		<key>ManualLayout.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>13</integer>
 		</dict>
 		<key>Moya.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>14</integer>
 		</dict>
 		<key>NSObject+Rx.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>15</integer>
 		</dict>
 		<key>ObjectMapper.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>16</integer>
 		</dict>
 		<key>PGDatePicker.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>17</integer>
 		</dict>
 		<key>PGPickerView.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>18</integer>
 		</dict>
 		<key>Pods-JiaPeiManage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>19</integer>
 		</dict>
 		<key>QMUIKit-QMUIResources.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>21</integer>
 		</dict>
 		<key>QMUIKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>20</integer>
 		</dict>
 		<key>ReachabilitySwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>22</integer>
 		</dict>
 		<key>ReactorKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>23</integer>
 		</dict>
 		<key>Realm.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>24</integer>
 		</dict>
 		<key>RealmSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>25</integer>
 		</dict>
 		<key>ReusableKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>26</integer>
 		</dict>
 		<key>RxCocoa.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>27</integer>
 		</dict>
 		<key>RxDataSources.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>28</integer>
 		</dict>
 		<key>RxGesture.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>28</integer>
+			<integer>29</integer>
 		</dict>
 		<key>RxOptional.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>29</integer>
+			<integer>30</integer>
 		</dict>
 		<key>RxRelay.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>30</integer>
+			<integer>31</integer>
 		</dict>
 		<key>RxSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>31</integer>
+			<integer>32</integer>
 		</dict>
 		<key>RxViewController.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>32</integer>
+			<integer>33</integer>
 		</dict>
 		<key>SDWebImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>34</integer>
 		</dict>
 		<key>SDWebImageWebPCoder.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>34</integer>
+			<integer>35</integer>
 		</dict>
 		<key>SectionReactor.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>35</integer>
+			<integer>36</integer>
 		</dict>
 		<key>SnapKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>36</integer>
+			<integer>37</integer>
 		</dict>
 		<key>SwiftDate.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>37</integer>
+			<integer>38</integer>
 		</dict>
 		<key>SwiftTimer.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>38</integer>
+			<integer>39</integer>
 		</dict>
 		<key>SwiftyColor.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>39</integer>
+			<integer>40</integer>
 		</dict>
 		<key>SwiftyImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>40</integer>
+			<integer>41</integer>
 		</dict>
 		<key>SwiftyJSON.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>41</integer>
+			<integer>42</integer>
 		</dict>
 		<key>SwiftyUserDefaults.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>42</integer>
+			<integer>43</integer>
 		</dict>
 		<key>Then.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>43</integer>
+			<integer>44</integer>
 		</dict>
 		<key>Toaster.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>44</integer>
+			<integer>45</integer>
 		</dict>
 		<key>UMCCommonLog.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>45</integer>
+			<integer>46</integer>
 		</dict>
 		<key>UMCommon.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>46</integer>
+			<integer>47</integer>
 		</dict>
 		<key>UMDevice.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>47</integer>
+			<integer>48</integer>
 		</dict>
 		<key>URLNavigator.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>48</integer>
+			<integer>49</integer>
 		</dict>
 		<key>VTMagic.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>49</integer>
+			<integer>50</integer>
 		</dict>
 		<key>WeakMapTable.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>50</integer>
+			<integer>51</integer>
 		</dict>
 		<key>YYText.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>51</integer>
+			<integer>52</integer>
 		</dict>
 		<key>libwebp.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>12</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.markdown

@@ -24,6 +24,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 
+## Bugly
+
+Copyright (C) 2017 Tencent Bugly, Inc. All rights reserved.
+
+
 ## CGFloatLiteral
 
 The MIT License (MIT)

Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.plist

@@ -41,6 +41,17 @@ THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (C) 2017 Tencent Bugly, Inc. All rights reserved.
+</string>
+			<key>License</key>
+			<string>Copyright</string>
+			<key>Title</key>
+			<string>Bugly</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>The MIT License (MIT)