Bläddra i källkod

用户登录,账号密码保存,个人中心请求。

openlockPPP 1 år sedan
förälder
incheckning
3e2b1f8c94
26 ändrade filer med 2555 tillägg och 1804 borttagningar
  1. 4 0
      JiaPeiManage.xcodeproj/project.pbxproj
  2. 1 1
      JiaPeiManage.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist
  3. 1 0
      JiaPeiManage/JSJP-Brigding-Header.h
  4. 1 0
      JiaPeiManage/Sources/Main/App/AppDelegate.swift
  5. 89 99
      JiaPeiManage/Sources/Models/UserInfoModel.swift
  6. 13 5
      JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift
  7. 45 1
      JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.swift
  8. 20 1
      JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib
  9. 16 16
      JiaPeiManage/Sources/Networking/Plugins/LoadingPlugin.swift
  10. 1 1
      JiaPeiManage/Sources/Networking/RequestError.swift
  11. 22 1
      JiaPeiManage/Sources/Utils/LocalManager.swift
  12. 36 0
      JiaPeiManage/Sources/Utils/NYTips.swift
  13. 2 1
      Podfile
  14. 24 1
      Podfile.lock
  15. 24 1
      Pods/Manifest.lock
  16. 2000 1635
      Pods/Pods.xcodeproj/project.pbxproj
  17. 54 33
      Pods/Pods.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist
  18. 81 0
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.markdown
  19. 99 0
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.plist
  20. 4 1
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Debug-input-files.xcfilelist
  21. 4 1
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Debug-output-files.xcfilelist
  22. 4 1
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Release-input-files.xcfilelist
  23. 4 1
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Release-output-files.xcfilelist
  24. 6 0
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks.sh
  25. 0 2
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage.debug.xcconfig
  26. 0 2
      Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage.release.xcconfig

+ 4 - 0
JiaPeiManage.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		9076C5DA2A386B2300E5E33F /* MineViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9076C5D92A386B2300E5E33F /* MineViewController.swift */; };
 		9076C5DC2A386B2F00E5E33F /* MineViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9076C5DB2A386B2F00E5E33F /* MineViewController.xib */; };
 		9076C5DF2A387CBC00E5E33F /* MeTraineeListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9076C5DE2A387CBC00E5E33F /* MeTraineeListViewController.swift */; };
+		909DA5C12A3999B30034501F /* NYTips.swift in Sources */ = {isa = PBXBuildFile; fileRef = 909DA5C02A3999B30034501F /* NYTips.swift */; };
 		90CE52192A36C0710033BD06 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE52182A36C0710033BD06 /* AppDelegate.swift */; };
 		90CE521D2A36C0710033BD06 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 90CE521C2A36C0710033BD06 /* ViewController.swift */; };
 		90CE52202A36C0710033BD06 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 90CE521E2A36C0710033BD06 /* Main.storyboard */; };
@@ -113,6 +114,7 @@
 		9076C5D92A386B2300E5E33F /* MineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineViewController.swift; sourceTree = "<group>"; };
 		9076C5DB2A386B2F00E5E33F /* MineViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineViewController.xib; sourceTree = "<group>"; };
 		9076C5DE2A387CBC00E5E33F /* MeTraineeListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeTraineeListViewController.swift; sourceTree = "<group>"; };
+		909DA5C02A3999B30034501F /* NYTips.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NYTips.swift; sourceTree = "<group>"; };
 		90CE52152A36C0700033BD06 /* JiaPeiManage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JiaPeiManage.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		90CE52182A36C0710033BD06 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		90CE521C2A36C0710033BD06 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -618,6 +620,7 @@
 				90CE52D32A36E6000033BD06 /* Snap.swift */,
 				90CE52D42A36E6000033BD06 /* URLNavigationMap.swift */,
 				90CE52D52A36E6000033BD06 /* LocalManager.swift */,
+				909DA5C02A3999B30034501F /* NYTips.swift */,
 			);
 			path = Utils;
 			sourceTree = "<group>";
@@ -872,6 +875,7 @@
 				90CE52732A36E5460033BD06 /* LWPlayerView.swift in Sources */,
 				90CE52442A36E5170033BD06 /* NYMacros.swift in Sources */,
 				90CE52192A36C0710033BD06 /* AppDelegate.swift in Sources */,
+				909DA5C12A3999B30034501F /* NYTips.swift in Sources */,
 				90CE52432A36E5170033BD06 /* NYFont.swift in Sources */,
 				90CE52ED2A36EBE80033BD06 /* UserInfoModel.swift in Sources */,
 				90CE528B2A36E5460033BD06 /* PopOverViewSettings.swift in Sources */,

+ 1 - 1
JiaPeiManage.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist

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

+ 1 - 0
JiaPeiManage/JSJP-Brigding-Header.h

@@ -11,5 +11,6 @@
 //第三方
 #import "VTMagic.h"
 #import <QMUIKit/QMUIKit.h>
+#import <SDWebImage/SDWebImage.h>
 
 #endif /* JSJP_Brigding_Header_h */

+ 1 - 0
JiaPeiManage/Sources/Main/App/AppDelegate.swift

@@ -26,6 +26,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         self.dependency.configureAppearance()
         self.dependency.configureUserAgent()
         self.dependency.congigurePerformance()
+        LocalManager.autoLogin()
         // 设置状态栏颜色
         UIApplication.shared.statusBarStyle = .lightContent
         return true

+ 89 - 99
JiaPeiManage/Sources/Models/UserInfoModel.swift

@@ -122,58 +122,54 @@ struct SchInfo :ImmutableMappable{
 }
 
 
-struct UserInfo :ImmutableMappable{
-    /// 登录渠道
-    var channel:UserLoginChannelType?
 
-    var address:String = ""
-    var appType:String = ""
-    var birthday:String = ""
-    var carType:String  = ""
-    var city:String  = ""
-    var cityName:String  = ""
-    var country:String  = ""
-    var countryName:String  = ""
-    var crDate:String  = ""
-    var eduStatus:String  = ""
-    var email:String  = ""
-    var expireTime:String  = ""
-    var _id:String  = ""
-    var imei:String  = ""
-    var isycbd:String  = ""
-    var loginCode:String  = ""
-    var mnStatus:String  = ""
-    var mnqFaceCount:String  = ""
-    var mnqFacePorcess:String  = ""
-    var mnqThreeOpen:String  = ""
-    var mnqTwoOpen:String  = ""
-    var nickName:String  = ""
-    var outId:String  = ""
-    var params:[ParamsItem]?
-    var payPwd:String  = ""
-    var photo:String  = ""
-    var pxjd:String  = ""
-    var pxkm:String  = ""
-    var qzgx:String  = ""
-    var schInfo:SchInfo?
-    var school:String  = ""
-    var schoolName:String  = ""
+struct UserInfo :ImmutableMappable{
+   
+    
+    var id:Int = 0
+    var coachNum:String = ""
+    var recordDate:String = ""
+    var schoolId:Int = 0
+    var schoolName = ""
+    var name:String  = ""
     var sex:String  = ""
-    var sfzb:String  = ""
-    var status:String  = ""
-    var stuDevNum:String  = ""
-    var stuNum:String  = ""
-    var systemVersion:String  = ""
-    var telphone:String  = ""
-    var userName:String  = ""
-    var verifyLevel:String  = ""
-    var version:String  = ""
-    var ycbdFaceCount:String  = ""
-    var busitype:String  = ""
-    var isOpenScan:String  = ""
-    var qzVideo:String  = ""
-    var sjjlbh:String  = ""
-    var a_c:String  = ""
+    var idcard:String  = ""
+    var mobile:String  = ""
+    var address:String  = ""
+    var photo:Int  = 0
+    var fingerPrint:String  = ""
+    var drilicence:Int  = 0
+    var expireTime:String  = ""
+    var fstdrilicDate:String  = ""
+    var occupationNo:String  = ""
+    var occupationLevel:String  = ""
+    var dripermitted:String  = ""
+    var teachpermitted:String  = ""
+    var employStatus:String  = ""
+    var hireDate:String  = ""
+    var leaveDate:String  = ""
+    var createDate:String  = ""
+    var createUser:Int  = 0
+    var createUserName:String  = ""
+    var photoPath:String  = ""
+    var updateDate:String  = ""
+    var updateUser:Int  = 0
+    var updateUserName:String  = ""
+    var cardType:String  = ""
+    var cardId:String  = ""
+    var logout:String  = ""
+    var sync:String  = ""
+    var syncTime:String  = ""
+    var groupId:String  = ""
+    var lockStatus:String  = ""
+    var protocolPath:String  = ""
+    var auditStatus:String  = ""
+    var type:String  = ""
+    var isIllegal:String  = ""
+    var healthState:String  = ""
+    var origo:String  = ""
+    var educationLevel:String  = ""
+    var isAgree:Int  = 0
     
     
     var isLogin: Bool {
@@ -230,57 +226,51 @@ struct UserInfo :ImmutableMappable{
     
     init(){}
     init(map: Map) throws {
-
         
-        channel = try map.value("channel")
-        address = try map.value("address")
-        appType = try map.value("appType")
-        birthday = try map.value("birthday")
-        carType = try map.value("carType")
-        city = try map.value("city")
-        cityName = try map.value("cityName")
-        country = try map.value("country")
-        countryName = try map.value("countryName")
-        crDate = try map.value("crDate")
-        eduStatus = try map.value("eduStatus")
-        email = try map.value("email")
-        expireTime = try map.value("expireTime")
-        _id = try map.value("_id")
-        imei = try map.value("imei")
-        isycbd = try map.value("isycbd")
-        loginCode = try map.value("loginCode")
-        mnStatus = try map.value("mnStatus")
-        mnqFaceCount = try map.value("mnqFaceCount")
-        mnqFacePorcess = try map.value("mnqFacePorcess")
-        mnqThreeOpen = try map.value("mnqThreeOpen")
-        mnqTwoOpen = try map.value("mnqTwoOpen")
-        nickName = try map.value("nickName")
-        outId = try map.value("outId")
-        params = try map.value("params")
-        payPwd = try map.value("payPwd")
-        photo = try map.value("photo")
-        pxjd = try map.value("pxjd")
-        pxkm = try map.value("pxkm")
-        qzgx = try map.value("qzgx")
-        schInfo = try map.value("schInfo")
-        school = try map.value("school")
+        id = try map.value("id")
+        coachNum = try map.value("coachNum")
+        recordDate = try map.value("recordDate")
+        schoolId = try map.value("schoolId")
         schoolName = try map.value("schoolName")
+        name = try map.value("name")
         sex = try map.value("sex")
-        sfzb = try map.value("sfzb")
-        status = try map.value("status")
-        stuDevNum = try map.value("stuDevNum")
-        stuNum = try map.value("stuNum")
-        systemVersion = try map.value("systemVersion")
-        telphone = try map.value("telphone")
-        userName = try map.value("userName")
-        verifyLevel = try map.value("verifyLevel")
-        version = try map.value("version")
-        ycbdFaceCount = try map.value("ycbdFaceCount")
-        busitype = try map.value("busitype")
-        isOpenScan = try map.value("isOpenScan")
-        qzVideo = try map.value("qzVideo")
-        sjjlbh = try map.value("sjjlbh")
-        a_c = try map.value("a_c")
-
+        idcard = try map.value("idcard")
+        mobile = try map.value("mobile")
+        address = try map.value("address")
+        photo = try map.value("photo")
+        fingerPrint = try map.value("fingerPrint") ?? ""
+        drilicence = try map.value("drilicence")
+        expireTime = try map.value("expireTime") ?? ""
+        fstdrilicDate = try map.value("fstdrilicDate")
+        occupationNo = try map.value("occupationNo") ?? ""
+        occupationLevel = try map.value("occupationLevel") ?? ""
+        dripermitted = try map.value("dripermitted")
+        teachpermitted = try map.value("teachpermitted")
+        employStatus = try map.value("employStatus")
+        hireDate = try map.value("hireDate")
+        leaveDate = try map.value("leaveDate") ?? ""
+        createDate = try map.value("createDate")
+        createUser = try map.value("createUser")
+        createUserName = try map.value("createUserName")
+        photoPath = try map.value("photoPath")
+        updateDate = try map.value("updateDate")
+        updateUser = try map.value("updateUser")
+        updateUserName = try map.value("updateUserName")
+        cardType = try map.value("cardType")
+        cardId = try map.value("cardId")
+        logout = try map.value("logout")
+        sync = try map.value("sync")
+        syncTime = try map.value("syncTime") ?? ""
+        groupId = try map.value("groupId") ?? ""
+        lockStatus = try map.value("lockStatus") ?? ""
+        protocolPath = try map.value("protocolPath") ?? ""
+        auditStatus = try map.value("auditStatus") ?? ""
+        type = try map.value("type")
+        isIllegal = try map.value("isIllegal")
+        healthState = try map.value("healthState")
+        origo = try map.value("origo") ?? ""
+        educationLevel = try map.value("educationLevel")
+        isAgree = try map.value("isAgree")
+        
     }
 }

+ 13 - 5
JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift

@@ -15,8 +15,6 @@ final class LoginViewController: BaseViewController {
     // MARK: 服务属性
     private let loginService: LoginServiceType = LoginService(networking: LoginNetworking())
     
-    private let cocahService: CoachServiceType = CoachService(networking: CoachNetworking())
-    
     // MARK: UI属性
     
     // 账号
@@ -50,8 +48,12 @@ final class LoginViewController: BaseViewController {
     // MARK: 私有方法
     func setupUI(){
         self.view.backgroundColor = .db_theme
-        self.username_textField.text = "350102199001182416"
-        self.userpassword_textField.text = "123456"
+        if ((LocalManager.userInfo.userAccount?.isEmpty) != nil)  {
+            self.username_textField.text = LocalManager.userInfo.userAccount
+        }
+        if ((LocalManager.userInfo.password?.isEmpty) != nil)  {
+            self.userpassword_textField.text = LocalManager.userInfo.password
+        }
         self.username_textField.placeholderColor = .db_place
         self.userpassword_textField.placeholderColor = .db_place
         self.userlocation_textField.placeholderColor = .db_place
@@ -151,11 +153,17 @@ final class LoginViewController: BaseViewController {
                         LocalManager.userInfo.password = password
                         self.login_button.isEnabled = true
                         //登录api RX 订阅 观察 销毁 三部曲
+                        NYTips.show()
                         self.loginService.loginRequest(user_name: account, user_password: password,city: city)
                             .subscribe(onSuccess: { userinfo in
+                                NYTips.hide()
+                                LocalManager.userInfo = userinfo
+                                LocalManager.userInfo.isLogin = true //设置已经登录
                                 print("登录成功:%@", userinfo)
-                                self.navigationController?.popViewController(animated: true)
+                                self.dismiss(animated: true)
                             }, onError: { error in
+                                NYTips.hide()
+                                NYTips.showErr(txt: error.localizedDescription)
                                 print("%@",error)
                             })
                             .disposed(by: disposeBag)

+ 45 - 1
JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.swift

@@ -12,16 +12,60 @@ import RxCocoa
 
 final class MineViewController: BaseViewController {
     
+    // MARK: 服务属性
+    private let cocahService: CoachServiceType = CoachService(networking: CoachNetworking())
     
+    // MARK: UI属性
+    //修改密码
+    @IBOutlet weak var update_password_button: QMUIButton!
+    //用户头像
+    @IBOutlet weak var user_icon_imageview: UIImageView!
+    //用户名
+    @IBOutlet weak var user_name_label: UILabel!
+    //性别
+    @IBOutlet weak var user_sex_imageview: UIImageView!
+    //手机号
+    @IBOutlet weak var phone_label: UILabel!
+    //身份证
+    @IBOutlet weak var idcarid_label: UILabel!
+    //驾校名称
+    @IBOutlet weak var schoolname_label: UILabel!
+    //驾校地址
+    @IBOutlet weak var school_address_label: UILabel!
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
+        
+        self.cocahService.coachInfoRequest(id:String("\(LocalManager.userInfo.id)"), city: "3501")
+            .subscribe(onSuccess: { userinfo in
+                LocalManager.userInfo = userinfo
+                self.biandView()
+            }, onError: { error in
+            })
+            .disposed(by: disposeBag)
+        biandView()
     }
     
     // MARK: 私有方法
     func setupUI(){
         self.view.backgroundColor = .db_theme
     }
-    
+    //绑定-rx
+    func biandView(){
+        //用户头像
+        self.user_icon_imageview.sd_setImage(with: LocalManager.userInfo.photoPath.urlValue)
+        //用户名
+        self.user_name_label.text = LocalManager.userInfo.name
+        //性别
+        self.user_sex_imageview.image = UIImage(named: (LocalManager.userInfo.sex.hashValue==1 ? "男":"女"))
+        //手机号
+        self.phone_label.text = LocalManager.userInfo.mobile
+        //身份证
+        self.idcarid_label.text = LocalManager.userInfo.idcard
+        //驾校名称
+        self.schoolname_label.text = LocalManager.userInfo.schoolName
+        //驾校地址
+        self.school_address_label.text = LocalManager.userInfo.address
+    }
     
 }

+ 20 - 1
JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib

@@ -11,6 +11,14 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MineViewController" customModule="JiaPeiManage" customModuleProvider="target">
             <connections>
+                <outlet property="idcarid_label" destination="3jH-Zi-tbR" id="xIQ-BW-unT"/>
+                <outlet property="phone_label" destination="Rgf-bc-AwE" id="l0s-Ze-PAc"/>
+                <outlet property="school_address_label" destination="fJC-Qf-3Nv" id="C7z-R9-ERM"/>
+                <outlet property="schoolname_label" destination="h6R-dN-eLm" id="Si0-F8-vLI"/>
+                <outlet property="update_password_button" destination="BM3-xf-AcJ" id="Wkh-DD-JDc"/>
+                <outlet property="user_icon_imageview" destination="3wG-uo-AO3" id="XUw-Ei-afC"/>
+                <outlet property="user_name_label" destination="km9-Iu-GaJ" id="PYp-mh-Ugs"/>
+                <outlet property="user_sex_imageview" destination="9Kk-gv-HeL" id="Y1N-KT-8fl"/>
                 <outlet property="view" destination="iN0-l3-epB" id="39j-j8-BwW"/>
             </connections>
         </placeholder>
@@ -98,12 +106,23 @@
                                                 <constraint firstAttribute="width" constant="6" id="QMi-hC-0wA"/>
                                             </constraints>
                                         </imageView>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user-icon" translatesAutoresizingMaskIntoConstraints="NO" id="3wG-uo-AO3">
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user-icon" translatesAutoresizingMaskIntoConstraints="NO" id="3wG-uo-AO3">
                                             <rect key="frame" x="154.66666666666666" y="76" width="66" height="66"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="66" id="HME-Kn-uNq"/>
                                                 <constraint firstAttribute="height" constant="66" id="NaP-bL-6uw"/>
                                             </constraints>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="33"/>
+                                                </userDefinedRuntimeAttribute>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                                    <real key="value" value="1"/>
+                                                </userDefinedRuntimeAttribute>
+                                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                                    <color key="value" red="0.14901960784313725" green="0.29019607843137252" blue="0.43137254901960786" alpha="1" colorSpace="calibratedRGB"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="庄后旺" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="km9-Iu-GaJ">
                                             <rect key="frame" x="158" y="157" width="59" height="23"/>

+ 16 - 16
JiaPeiManage/Sources/Networking/Plugins/LoadingPlugin.swift

@@ -12,25 +12,25 @@ import Moya
 class LoadingPlugin : PluginType {
     
     func willSend(_ request: RequestType, target: TargetType) {
-        if target is LoginAPI {
-            let api = target as! LoginAPI
-            if api.isShowLoading {
-                guard let curController = UIViewController.topMost else { return }
-//                curController.showLoadingAnimation(superView: curController.view)
-                QMUITips.showLoading(in: curController.view)
-            }
-        }
+//        if target is LoginAPI {
+//            let api = target as! LoginAPI
+//            if api.isShowLoading {
+//                guard let curController = UIViewController.topMost else { return }
+////                curController.showLoadingAnimation(superView: curController.view)
+//                QMUITips.showLoading(in: curController.view)
+//            }
+//        }
     }
     
     func didReceive(_ result: Result<Response, MoyaError>, target: TargetType) {
-        if target is LoginAPI {
-            let api = target as! LoginAPI
-            if api.isShowLoading {
-                guard let curController = UIViewController.topMost else { return }
-//                curController.hideLoadingAnimation(superView: curController.view)
-                QMUITips.hideAllTips()
-            }
-        }
+//        if target is LoginAPI {
+//            let api = target as! LoginAPI
+//            if api.isShowLoading {
+//                guard let curController = UIViewController.topMost else { return }
+////                curController.hideLoadingAnimation(superView: curController.view)
+//                QMUITips.hideAllTips()
+//            }
+//        }
     }
 
 }

+ 1 - 1
JiaPeiManage/Sources/Networking/RequestError.swift

@@ -40,7 +40,7 @@ extension RequestError {
 
 
 enum StatusCode: Int {
-    case success = 0
+    case success = 200
     case unknow
 }
 

+ 22 - 1
JiaPeiManage/Sources/Utils/LocalManager.swift

@@ -8,16 +8,37 @@
 
 import UIKit
 import SwiftyUserDefaults
+import RxSwift
 
 class LocalManager {
     
+    static var disposeBag = DisposeBag()
+    static let loginService: LoginServiceType = LoginService(networking: LoginNetworking())
     
     static var userInfo: UserInfo = UserInfo()
     
-    
     class func clearUserInfo() {
         
         
     }
     
+    //自动登录
+    static func autoLogin(){
+        if LocalManager.userInfo.isLogin {
+            var account = LocalManager.userInfo.userAccount!
+            var password = LocalManager.userInfo.password!
+            var city = "3501"
+            LocalManager.loginService.loginRequest(user_name: account, user_password: password,city: city)
+                 .subscribe(onSuccess: { userinfo in
+                     NYTips.hide()
+                     LocalManager.userInfo = userinfo
+                 }, onError: { error in
+
+                 })
+                 .disposed(by: LocalManager.disposeBag)
+        }
+
+        
+    }
+    
 }

+ 36 - 0
JiaPeiManage/Sources/Utils/NYTips.swift

@@ -0,0 +1,36 @@
+//
+//  NYTips.swift
+//  JiaPeiManage
+//
+//  Created by Ning.ge on 2023/6/14.
+//
+
+class NYTips {
+    
+    static func show(){
+        guard let curController = UIViewController.topMost else { return }
+        show(view:curController.view)
+    }
+    
+    static func show(txt:String){
+        guard let curController = UIViewController.topMost else { return }
+        QMUITips.showLoading(txt, in: curController.view)
+    }
+    
+    static func showErr(txt:String){
+        guard let curController = UIViewController.topMost else { return }
+        QMUITips.showLoading(txt, in: curController.view, hideAfterDelay: 2)
+    }
+    
+    static func show(view:UIView){
+        QMUITips.showLoading(in: view)
+    }
+    
+    static func hide(){
+        QMUITips.hideAllTips()
+    }
+    
+    static func hide(view:UIView){
+        QMUITips.hideAllTips(in: view)
+    }
+}

+ 2 - 1
Podfile

@@ -40,7 +40,8 @@ target 'JiaPeiManage' do
   pod 'Toaster'
   pod 'ManualLayout'
   pod 'QMUIKit'                                     # 腾讯UI控件
-
+  pod 'SDWebImage'
+  pod 'SDWebImageWebPCoder', '0.8.3'
   # Logging
   pod 'CocoaLumberjack/Swift'
   

+ 24 - 1
Podfile.lock

@@ -11,6 +11,15 @@ PODS:
   - FSPagerView (0.8.3)
   - GDPerformanceView-Swift (2.1.1)
   - Kingfisher (7.7.0)
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
+    - libwebp/webp
+  - libwebp/mux (1.2.4):
+    - libwebp/demux
+  - libwebp/webp (1.2.4)
   - ManualLayout (1.3.0)
   - Moya/Core (14.0.0):
     - Alamofire (~> 5.0)
@@ -351,6 +360,12 @@ PODS:
   - RxViewController (1.0.0):
     - RxCocoa (~> 5.0)
     - RxSwift (~> 5.0)
+  - SDWebImage (5.15.8):
+    - SDWebImage/Core (= 5.15.8)
+  - SDWebImage/Core (5.15.8)
+  - SDWebImageWebPCoder (0.8.3):
+    - libwebp (~> 1.0)
+    - SDWebImage/Core (~> 5.10)
   - SectionReactor (1.0.0):
     - ReactorKit (>= 2.0.0)
     - RxDataSources (>= 4.0.0)
@@ -396,6 +411,8 @@ DEPENDENCIES:
   - RxOptional
   - RxSwift
   - RxViewController
+  - SDWebImage
+  - SDWebImageWebPCoder (= 0.8.3)
   - SectionReactor
   - SnapKit
   - SwiftDate
@@ -422,6 +439,7 @@ SPEC REPOS:
     - FSPagerView
     - GDPerformanceView-Swift
     - Kingfisher
+    - libwebp
     - ManualLayout
     - Moya
     - "NSObject+Rx"
@@ -439,6 +457,8 @@ SPEC REPOS:
     - RxRelay
     - RxSwift
     - RxViewController
+    - SDWebImage
+    - SDWebImageWebPCoder
     - SectionReactor
     - SnapKit
     - SwiftDate
@@ -473,6 +493,7 @@ SPEC CHECKSUMS:
   FSPagerView: 670405b2f18e2a87fa37f20b00de783e562c25a8
   GDPerformanceView-Swift: 22d964fe40b19e3d914dba2586237d064de8fd77
   Kingfisher: f043ac666dfc96c1f37604f93effb45a7ee3a3e1
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
   Moya: 5b45dacb75adb009f97fde91c204c1e565d31916
   "NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946
@@ -490,6 +511,8 @@ SPEC CHECKSUMS:
   RxRelay: 5a18c2eb2d68326ebaf0112f80d837ae41b92b97
   RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27
   RxViewController: 7330a46e5c31cd680db169da4c9fc8676e975a81
+  SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
+  SDWebImageWebPCoder: bbf46e29fb8d1980a78ad3d5e9b4123c77f10ebc
   SectionReactor: 88cf2b79bdf33632c98583a574a17181a277fc33
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   SwiftDate: 72d28954e8e1c6c1c0f917ccc8005e4f83c7d4b2
@@ -505,6 +528,6 @@ SPEC CHECKSUMS:
   WeakMapTable: 05c694ce8439a7a9ebabb56187287a63c57673d6
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-PODFILE CHECKSUM: 7768ce7bf9fffa380f9690528cf4dad8f017e979
+PODFILE CHECKSUM: 68fbf7b515ff76d29f65e5e1e9964bd01028ea4d
 
 COCOAPODS: 1.12.1

+ 24 - 1
Pods/Manifest.lock

@@ -11,6 +11,15 @@ PODS:
   - FSPagerView (0.8.3)
   - GDPerformanceView-Swift (2.1.1)
   - Kingfisher (7.7.0)
+  - libwebp (1.2.4):
+    - libwebp/demux (= 1.2.4)
+    - libwebp/mux (= 1.2.4)
+    - libwebp/webp (= 1.2.4)
+  - libwebp/demux (1.2.4):
+    - libwebp/webp
+  - libwebp/mux (1.2.4):
+    - libwebp/demux
+  - libwebp/webp (1.2.4)
   - ManualLayout (1.3.0)
   - Moya/Core (14.0.0):
     - Alamofire (~> 5.0)
@@ -351,6 +360,12 @@ PODS:
   - RxViewController (1.0.0):
     - RxCocoa (~> 5.0)
     - RxSwift (~> 5.0)
+  - SDWebImage (5.15.8):
+    - SDWebImage/Core (= 5.15.8)
+  - SDWebImage/Core (5.15.8)
+  - SDWebImageWebPCoder (0.8.3):
+    - libwebp (~> 1.0)
+    - SDWebImage/Core (~> 5.10)
   - SectionReactor (1.0.0):
     - ReactorKit (>= 2.0.0)
     - RxDataSources (>= 4.0.0)
@@ -396,6 +411,8 @@ DEPENDENCIES:
   - RxOptional
   - RxSwift
   - RxViewController
+  - SDWebImage
+  - SDWebImageWebPCoder (= 0.8.3)
   - SectionReactor
   - SnapKit
   - SwiftDate
@@ -422,6 +439,7 @@ SPEC REPOS:
     - FSPagerView
     - GDPerformanceView-Swift
     - Kingfisher
+    - libwebp
     - ManualLayout
     - Moya
     - "NSObject+Rx"
@@ -439,6 +457,8 @@ SPEC REPOS:
     - RxRelay
     - RxSwift
     - RxViewController
+    - SDWebImage
+    - SDWebImageWebPCoder
     - SectionReactor
     - SnapKit
     - SwiftDate
@@ -473,6 +493,7 @@ SPEC CHECKSUMS:
   FSPagerView: 670405b2f18e2a87fa37f20b00de783e562c25a8
   GDPerformanceView-Swift: 22d964fe40b19e3d914dba2586237d064de8fd77
   Kingfisher: f043ac666dfc96c1f37604f93effb45a7ee3a3e1
+  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
   ManualLayout: 68ac8cfa6b5f656f7a9fadec3730208b95986880
   Moya: 5b45dacb75adb009f97fde91c204c1e565d31916
   "NSObject+Rx": fa6bbcc1ab1faa06b01466bc09b1e0692bbc5946
@@ -490,6 +511,8 @@ SPEC CHECKSUMS:
   RxRelay: 5a18c2eb2d68326ebaf0112f80d837ae41b92b97
   RxSwift: 915abbdfb62214aa89ccd0b194d44fb478019b27
   RxViewController: 7330a46e5c31cd680db169da4c9fc8676e975a81
+  SDWebImage: cb032eba469c54e0000e78bcb0a13cdde0a52798
+  SDWebImageWebPCoder: bbf46e29fb8d1980a78ad3d5e9b4123c77f10ebc
   SectionReactor: 88cf2b79bdf33632c98583a574a17181a277fc33
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   SwiftDate: 72d28954e8e1c6c1c0f917ccc8005e4f83c7d4b2
@@ -505,6 +528,6 @@ SPEC CHECKSUMS:
   WeakMapTable: 05c694ce8439a7a9ebabb56187287a63c57673d6
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
 
-PODFILE CHECKSUM: 7768ce7bf9fffa380f9690528cf4dad8f017e979
+PODFILE CHECKSUM: 68fbf7b515ff76d29f65e5e1e9964bd01028ea4d
 
 COCOAPODS: 1.12.1

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2000 - 1635
Pods/Pods.xcodeproj/project.pbxproj


+ 54 - 33
Pods/Pods.xcodeproj/xcuserdata/mimasigeling.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -86,231 +86,252 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>12</integer>
 		</dict>
 		<key>Moya.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>13</integer>
 		</dict>
 		<key>NSObject+Rx.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>14</integer>
 		</dict>
 		<key>ObjectMapper.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>15</integer>
 		</dict>
 		<key>Pods-JiaPeiManage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>16</integer>
 		</dict>
 		<key>QMUIKit-QMUIResources.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>18</integer>
 		</dict>
 		<key>QMUIKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>17</integer>
 		</dict>
 		<key>ReachabilitySwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>19</integer>
 		</dict>
 		<key>ReactorKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>20</integer>
 		</dict>
 		<key>Realm.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>21</integer>
 		</dict>
 		<key>RealmSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>22</integer>
 		</dict>
 		<key>ReusableKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>23</integer>
 		</dict>
 		<key>RxCocoa.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>24</integer>
 		</dict>
 		<key>RxDataSources.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>25</integer>
 		</dict>
 		<key>RxGesture.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>26</integer>
 		</dict>
 		<key>RxOptional.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>27</integer>
 		</dict>
 		<key>RxRelay.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>28</integer>
 		</dict>
 		<key>RxSwift.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>28</integer>
+			<integer>29</integer>
 		</dict>
 		<key>RxViewController.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>29</integer>
+			<integer>30</integer>
+		</dict>
+		<key>SDWebImage.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>31</integer>
+		</dict>
+		<key>SDWebImageWebPCoder.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>32</integer>
 		</dict>
 		<key>SectionReactor.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>30</integer>
+			<integer>33</integer>
 		</dict>
 		<key>SnapKit.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>31</integer>
+			<integer>34</integer>
 		</dict>
 		<key>SwiftDate.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>32</integer>
+			<integer>35</integer>
 		</dict>
 		<key>SwiftTimer.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>33</integer>
+			<integer>36</integer>
 		</dict>
 		<key>SwiftyColor.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>34</integer>
+			<integer>37</integer>
 		</dict>
 		<key>SwiftyImage.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>35</integer>
+			<integer>38</integer>
 		</dict>
 		<key>SwiftyJSON.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>36</integer>
+			<integer>39</integer>
 		</dict>
 		<key>SwiftyUserDefaults.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>37</integer>
+			<integer>40</integer>
 		</dict>
 		<key>Then.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>38</integer>
+			<integer>41</integer>
 		</dict>
 		<key>Toaster.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>39</integer>
+			<integer>42</integer>
 		</dict>
 		<key>URLNavigator.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>40</integer>
+			<integer>43</integer>
 		</dict>
 		<key>VTMagic.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>41</integer>
+			<integer>44</integer>
 		</dict>
 		<key>WeakMapTable.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>42</integer>
+			<integer>45</integer>
 		</dict>
 		<key>YYText.xcscheme</key>
 		<dict>
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>43</integer>
+			<integer>46</integer>
+		</dict>
+		<key>libwebp.xcscheme</key>
+		<dict>
+			<key>isShown</key>
+			<false/>
+			<key>orderHint</key>
+			<integer>11</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

+ 81 - 0
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.markdown

@@ -913,6 +913,53 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+## SDWebImage
+
+Copyright (c) 2009-2020 Olivier Poitrey rs@dailymotion.com
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+
+## SDWebImageWebPCoder
+
+Copyright (c) 2018 Bogdan Poplauschi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
 ## SectionReactor
 
 The MIT License (MIT)
@@ -1254,4 +1301,38 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
+
+## libwebp
+
+Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 Generated by CocoaPods - https://cocoapods.org

+ 99 - 0
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-acknowledgements.plist

@@ -1086,6 +1086,65 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2009-2020 Olivier Poitrey rs@dailymotion.com
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>SDWebImage</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2018 Bogdan Poplauschi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+</string>
+			<key>License</key>
+			<string>MIT</string>
+			<key>Title</key>
+			<string>SDWebImageWebPCoder</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>The MIT License (MIT)
@@ -1512,6 +1571,46 @@ SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>Copyright (c) 2010, Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of Google nor the names of its contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+</string>
+			<key>License</key>
+			<string>BSD</string>
+			<key>Title</key>
+			<string>libwebp</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Generated by CocoaPods - https://cocoapods.org</string>

+ 4 - 1
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Debug-input-files.xcfilelist

@@ -26,6 +26,8 @@ ${BUILT_PRODUCTS_DIR}/RxOptional/RxOptional.framework
 ${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework
 ${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework
 ${BUILT_PRODUCTS_DIR}/RxViewController/RxViewController.framework
+${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
+${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework
 ${BUILT_PRODUCTS_DIR}/SectionReactor/SectionReactor.framework
 ${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
 ${BUILT_PRODUCTS_DIR}/SwiftDate/SwiftDate.framework
@@ -39,4 +41,5 @@ ${BUILT_PRODUCTS_DIR}/Toaster/Toaster.framework
 ${BUILT_PRODUCTS_DIR}/URLNavigator/URLNavigator.framework
 ${BUILT_PRODUCTS_DIR}/VTMagic/VTMagic.framework
 ${BUILT_PRODUCTS_DIR}/WeakMapTable/WeakMapTable.framework
-${BUILT_PRODUCTS_DIR}/YYText/YYText.framework
+${BUILT_PRODUCTS_DIR}/YYText/YYText.framework
+${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework

+ 4 - 1
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Debug-output-files.xcfilelist

@@ -25,6 +25,8 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxOptional.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxViewController.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SectionReactor.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftDate.framework
@@ -38,4 +40,5 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toaster.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/URLNavigator.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VTMagic.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WeakMapTable.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework

+ 4 - 1
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Release-input-files.xcfilelist

@@ -26,6 +26,8 @@ ${BUILT_PRODUCTS_DIR}/RxOptional/RxOptional.framework
 ${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework
 ${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework
 ${BUILT_PRODUCTS_DIR}/RxViewController/RxViewController.framework
+${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework
+${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework
 ${BUILT_PRODUCTS_DIR}/SectionReactor/SectionReactor.framework
 ${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework
 ${BUILT_PRODUCTS_DIR}/SwiftDate/SwiftDate.framework
@@ -39,4 +41,5 @@ ${BUILT_PRODUCTS_DIR}/Toaster/Toaster.framework
 ${BUILT_PRODUCTS_DIR}/URLNavigator/URLNavigator.framework
 ${BUILT_PRODUCTS_DIR}/VTMagic/VTMagic.framework
 ${BUILT_PRODUCTS_DIR}/WeakMapTable/WeakMapTable.framework
-${BUILT_PRODUCTS_DIR}/YYText/YYText.framework
+${BUILT_PRODUCTS_DIR}/YYText/YYText.framework
+${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework

+ 4 - 1
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks-Release-output-files.xcfilelist

@@ -25,6 +25,8 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxOptional.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxRelay.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxSwift.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RxViewController.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SectionReactor.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftDate.framework
@@ -38,4 +40,5 @@ ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toaster.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/URLNavigator.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/VTMagic.framework
 ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WeakMapTable.framework
-${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYText.framework
+${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework

+ 6 - 0
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage-frameworks.sh

@@ -203,6 +203,8 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/RxViewController/RxViewController.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SectionReactor/SectionReactor.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftDate/SwiftDate.framework"
@@ -217,6 +219,7 @@ if [[ "$CONFIGURATION" == "Debug" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/VTMagic/VTMagic.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/WeakMapTable/WeakMapTable.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework"
 fi
 if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework"
@@ -246,6 +249,8 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/RxRelay/RxRelay.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/RxSwift/RxSwift.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/RxViewController/RxViewController.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SectionReactor/SectionReactor.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/SwiftDate/SwiftDate.framework"
@@ -260,6 +265,7 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
   install_framework "${BUILT_PRODUCTS_DIR}/VTMagic/VTMagic.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/WeakMapTable/WeakMapTable.framework"
   install_framework "${BUILT_PRODUCTS_DIR}/YYText/YYText.framework"
+  install_framework "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework"
 fi
 if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
   wait

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 2
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage.debug.xcconfig


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 2
Pods/Target Support Files/Pods-JiaPeiManage/Pods-JiaPeiManage.release.xcconfig


Vissa filer visades inte eftersom för många filer har ändrats