启动页修改 以及其他资源修改

iOSFirst.xcodeproj/xcuserdata/sunyufeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>iOSFirst.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>18</integer>
 		</dict>
 	</dict>
 </dict>

iOSFirst/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,6 +1,7 @@
 {
   "images" : [
     {
+      "filename" : "LOGO.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

iOSFirst/Assets.xcassets/app_logo.imageset/Contents.json

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

iOSFirst/Preview Content/Preview Assets.xcassets/simulator_screenshot_1E921C5D-2C8A-4A9D-B20A-A5C48CD914E2.imageset/Contents.json → iOSFirst/Assets.xcassets/splash.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
+      "filename" : "首页.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "simulator_screenshot_1E921C5D-2C8A-4A9D-B20A-A5C48CD914E2.png",
+      "filename" : "首页@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "首页@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

iOSFirst/Launch Screen.storyboard

@@ -15,34 +15,21 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd" userLabel="就是玩">
-                                <rect key="frame" x="0.0" y="832" width="393" height="0.0"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="哈哈哈这是启动页" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
-                                <rect key="frame" x="0.0" y="263.66666666666669" width="393" height="43"/>
-                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" fixedFrame="YES" image="splash" translatesAutoresizingMaskIntoConstraints="NO" id="hRc-gQ-Ggl">
+                                <rect key="frame" x="0.0" y="59" width="393" height="759"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        <constraints>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
-                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
-                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
-                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
-                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
-                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="375"/>
+            <point key="canvasLocation" x="52.671755725190835" y="374.64788732394368"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="splash" width="399" height="639"/>
+    </resources>
 </document>

iOSFirst/Preview Content/Preview Assets.xcassets/截屏2022-12-20 23.22.36.imageset/Contents.json → iOSFirst/Preview Content/Preview Assets.xcassets/Image.imageset/Contents.json

@@ -1,15 +1,17 @@
 {
   "images" : [
     {
+      "filename" : "首页.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "截屏2022-12-20 23.22.36.png",
+      "filename" : "首页@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "首页@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

iOSFirst/iOSFirstApp.swift

@@ -7,13 +7,24 @@
 
 import SwiftUI
 
+class AppDelegate: NSObject, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+        Thread.sleep(forTimeInterval: 2)
+        return true
+    }
+    func applicationDidReceiveMemoryWarning(_ application: UIApplication) {
+        print("log-DidReceiveMemoryWarning")
+    }
+}
+
 @main
 struct iOSFirstApp: App {
-    
+    @UIApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
     var body: some Scene {
         WindowGroup {
-            ContentView()
+            LoginView()
             SUIToastViewContainer(stackOverlap: .overlap)
         }
     }
+    
 }

iOSFirst/login/LoginUserInfo.swift

@@ -0,0 +1,111 @@
+//
+//  LoginUserInfo.swift
+//  iOSFirst
+//
+//  Created by 孙宇峰 on 2023/2/3.
+//
+
+import Foundation
+import HandyJSON
+
+class LoginUserInfo: HandyJSON{
+    
+        //用户表
+        var userid:Int?
+        
+        //姓名
+        var username:String?
+        
+        //登录帐号
+        var  loginname:String?
+        
+        //登录密码
+        var  loginpwd:String?
+        
+        //学生学号
+        var  studentno:String?
+        
+        //用户手机号
+        var  userphone:String?
+        
+        //出生日期
+        var  userbirthday:Int?
+        
+        //身份证号
+        var  cardid:String?
+        
+        //头像地址
+        var  headpic:String?
+        
+        //用户类型999超级管理员0学校管理员1老师2学生
+        var  usertype:Int?
+        
+        //用户状态1正常2删除
+        var  userstate:Int?
+        
+        //是否绑定硬件地址0不绑定1绑定
+        var  bindmac:Int?
+        
+        //硬件地址
+        var  mac:String?
+        
+        //硬件地址绑定的帐号
+        var  macname:String?
+        
+        //学校是否绑定硬件地址0不绑定1绑定
+        var  sbindmac:Int?
+        
+        //操作密码（教师操作密码）
+        var  opepassword:String?
+        
+        //创建人id
+        var  createid:Int?
+        
+        //创建人姓名
+        var  createname:String?
+        
+        //创建时间
+        var  createtime:Int?
+        
+        //删除人id
+        var  deleteid:Int?
+        
+        //删除时间
+        var  deletetime:Int?
+        
+        //学校id
+        var  schoolid:Int?
+        
+        var  schoolname:String?
+        
+        //学校阶段1小学2初中3高中4大学
+        var  schoollevel:Int?
+        
+        //学校状态1正常10删除
+        var  schoolstate:Int?
+        
+        //错误率%
+        var  errorrate:Int?
+        
+        //当前年份
+        var  year:Int?
+        
+        //性别1男2女
+        var  usersex:Int?
+        
+        //区域码
+        var  cloudcode:String?
+        
+        //班级id
+        var  classid:Int?
+        
+        //
+        var  xznum:Int?
+
+        // token
+        var  token_value:String?
+    
+        required init(){}
+
+}
+

iOSFirst/ContentView.swift → iOSFirst/login/LoginView.swift

@@ -7,8 +7,11 @@
 
 import SwiftUI
 
-struct ContentView: View {
+struct LoginView: View {
+   
+    
     var body: some View {
+        
         VStack(alignment:.leading,spacing: 0) {
             HStack{
                 Spacer()
@@ -27,16 +30,17 @@ struct ContentView: View {
             
             
             HStack{
-                Text("logo")
-                    .foregroundColor(.gray)
-                    .font(.system(size: 30))
-                    .multilineTextAlignment(.center)
-                    .bold()
+                Image("app_logo")
+                    .imageScale(.large)
+                    .foregroundColor(.accentColor)
+                    .scaledToFit()
+                    .frame(width: 40)
+                
                 Image("txtlogo")
                     .imageScale(.large)
                     .foregroundColor(.accentColor)
                     .frame(width: 240,height: 35)
-            }
+            }.frame(height: 40)
             .padding(.top,20)
             .padding(.bottom,100)
             
@@ -80,10 +84,10 @@ struct ContentView: View {
                         let msg="点击了登录按钮"
                         print(msg)
                         SUIToast.show(messageItem: .init(
-                                            message: msg,
-                                            bgColor: .gray,
-                                            messageColor: .white
-                                        ))
+                            message: msg,
+                            bgColor: .gray,
+                            messageColor: .white
+                        ))
                     }) {
                         Text("登录")
                             .font(.system(size: 17))
@@ -96,7 +100,7 @@ struct ContentView: View {
                     }
                     
                 }
-                	
+                
             }
             
             HStack{
@@ -104,20 +108,20 @@ struct ContentView: View {
                     let msg="点击了验证码登录"
                     print(msg)
                     SUIToast.show(messageItem: .init(
-                                        message: msg,
-                                        bgColor: .gray,
-                                        messageColor: .white
-                                    ))
+                        message: msg,
+                        bgColor: .gray,
+                        messageColor: .white
+                    ))
                 }
                 Spacer ()
                 Text("忘记密码？").font(.system(size:15)).onTapGesture {
                     let msg="点击了密码"
                     print(msg)
                     SUIToast.show(messageItem: .init(
-                                        message: msg,
-                                        bgColor: .gray,
-                                        messageColor: .white
-                                    ))
+                        message: msg,
+                        bgColor: .gray,
+                        messageColor: .white
+                    ))
                     
                     
                 }.padding(.vertical,20).font(.system(size: 15))
@@ -125,17 +129,17 @@ struct ContentView: View {
                 
             }
             Spacer()
-        
+            
         }.padding()
-        .frame(width: .infinity,height: .infinity)
+            .frame(width: .infinity,height: .infinity)
     }
     
 }
-    
-    struct ContentView_Previews: PreviewProvider {
-        static var previews: some View {
-            ContentView()
-        }
+
+struct ContentView_Previews: PreviewProvider {
+    static var previews: some View {
+        LoginView()
     }
-    
+}
+
 

iOSFirst/login/LoginViewModel.swift

@@ -0,0 +1,101 @@
+////
+////  LoginViewModel.swift
+////  iOSFirst
+////
+////  Created by 孙宇峰 on 2023/2/3.
+////
+//
+//import Foundation
+//import Moya
+//import RxSwift
+//import RxCocoa
+//import RxRelay
+//
+//struct LoginViewModel  {
+//
+//    struct Input {
+//        private let service:MoyaProvider<AccountService>
+//        let loginTrigger: PublishSubject<Void>
+//    }
+//
+//    struct Output {
+//    }
+//
+//    // 用户名称
+//    let username = BehaviorRelay(value: "admin")
+//    // 用户密码
+//    let password = BehaviorRelay(value: "123456")
+//
+//   
+//
+//    // 当前用户信息保存
+//    var userInfoSaved = PublishSubject<Void>()
+//
+//    func transform(input: Input) -> Output {
+//        let result = input.self.service.rx.request(AccountService.login(username, password, true))
+//                    .map(BaseModel<LoginUserInfo>.self)
+//                    .map{ $0.data }
+//                    .compactMap { $0 }
+//                    .asObservable()
+//                    .asSingle()
+//        let loginRequest = input.loginTrigger.flatMapLatest { [weak self] in
+//            guard let self = self else { return Observable.just(RxSwift.Event.next(TokenEnhancer())) }
+//            return self.httpRequest.requestAccessToken(username: self.username.value, password: self.password.value)
+//                .trackActivity(self.loading)
+//                .materialize()
+//        }.share()
+//
+//        // 登录成功
+//        loginRequest.elements().subscribe(onNext: { [weak self] tokenEnhancer in
+//            AuthManager.setTokenEnhancer(tokenEnhancer: tokenEnhancer)
+//            self?.userInfoSaved.onNext(())
+//        }).disposed(by: rx.disposeBag)
+//
+//        // 获取当前用户信息
+//        let getUserInfo = userInfoSaved.flatMapLatest { [weak self] in
+//            guard let self = self else { return Observable.just(RxSwift.Event.next(BaseResultResponseObject<User>())) }
+//            return self.httpRequest.getUserInfo()
+//                .trackActivity(self.loading)
+//                .materialize()
+//        }.share()
+//
+//        // 获取用户成功
+//        getUserInfo.elements().subscribe(onNext: { [weak self] result in
+//            guard let self = self else { return }
+//            if result.code == result.SUCCESS, let user = result.data {
+//                user.saveUserInfo()
+//                let application: Application = DIContainer.shared.resolve()
+//                let homeTabBarVC: HomeTabBarViewController = HomeTabBarViewController(viewModel: HomeTabBarViewModel())
+//                let initialSplitVC: InitialSplitViewController = InitialSplitViewController(viewModel: nil)
+//                let navigationC = NavigationController(rootViewController: initialSplitVC)
+//                let splitVC = SplitViewController()
+//                splitVC.viewControllers = [homeTabBarVC, navigationC]
+//
+//                // xxx:临时解决方案 RAMAnimatedTabBarController 首次加载需适配当前设备,会导致短暂闪白,延长动画时间
+//                UIView.transition(with: application.window!,
+//                                  duration: UserDefaults.standard.integer(forKey: Configs.CacheKey.firstLoadKey) == 0 ? 2.3 : 0.5,
+//                                  options: .transitionCrossDissolve, animations: {
+//                    application.window!.rootViewController = splitVC
+//                }, completion: nil)
+//
+//                // 更新首次加载状态
+//                if UserDefaults.standard.integer(forKey: Configs.CacheKey.firstLoadKey) == 0 {
+//                    UserDefaults.standard.set(1, forKey: Configs.CacheKey.firstLoadKey)
+//                }
+//            } else {
+//                self.requestError.onNext(ApiError(result.code, result.msg))
+//            }
+//        }).disposed(by: rx.disposeBag)
+//
+//        // 登录失败
+//        loginRequest.errors().bind(to: bindConverRequestError).disposed(by: rx.disposeBag)
+//        // 获取用户失败
+//        getUserInfo.errors().bind(to: bindConverRequestError).disposed(by: rx.disposeBag)
+//        requestError.subscribe(onNext: { (error) in
+//            User.removeUserInfo()
+//            AuthManager.removeTokenEnhancer()
+//        }).disposed(by: rx.disposeBag)
+//
+//        return Output()
+//    }
+//}

iOSFirst/login/Model.xcdatamodeld/Model.xcdatamodel/contents

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="22D49" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier=""/>

iOSFirst/network/API.swift

@@ -0,0 +1,139 @@
+//
+//  API.swift
+//  iOSFirst
+//
+//  Created by 孙宇峰 on 2023/2/3.
+//
+
+import Foundation
+enum Api {
+    /// baseUrl
+    static let shoolurl = "https://schooltestapi.xhkjedu.com/"
+    
+    static let fileurl = "https://schoolteststatic.xhkjedu.com/static/"
+    
+    static let rzurl = "http://scapitest.xhkjedu.com/"
+    
+    static let wsExamUrl = "wss://wsexamtest.xhkjedu.com/ws"
+}
+
+extension Api {
+    /// 用户登录注册登出 登录注册为post 登出为get
+    enum Account {
+        ///教师帐号登录
+        static let loginTeacher = "suser/user/login_teacher"
+        ///获取手机验证码
+        static let loginCode = "suser/user/login_code"
+        ///绑定手机获取手机验证码
+        static let bindCode = "suser/user/bind_code"
+        ///手机号码登录
+        static let loginByCode = "suser/user/login_byCode"
+        ///获取手机验证码 用于重置密码
+        static let updateCode = "suser/user/update_code"
+        /// 重置密码
+        static let updatePwdCode = "suser/user/update_pwd_byCode"
+        /// 绑定手机   2.2.3帐号安全--绑定手机
+        static let bindUserPhone = "suser/user/bind_userphone"
+        ///2.2.4帐号安全--验证身份
+        static let checkUser = "suser/user/check_user"
+    }
+}
+
+extension Api {
+    /// 首页 queryKeyword是post请求 其他的是get请求
+    enum Home {
+        
+        static let banner = "banner/json"
+
+        static let topArticle = "article/top/json"
+
+        static let normalArticle = "article/list/"
+
+        static let hotKey = "hotkey/json"
+
+        static let queryKeyword = "article/query/"
+    }
+}
+
+extension Api {
+    /// 项目 均是get请求
+    enum Project {
+        static let tags = "project/tree/json"
+        
+        static let tagList = "project/list/"
+    }
+}
+
+extension Api {
+    /// 公众号 均是get请求
+    enum PublicNumber {
+        static let tags = "wxarticle/chapters/json"
+
+        static let tagList = "wxarticle/list/"
+    }
+}
+
+
+
+
+extension Api {
+    /// 体系 均是get请求
+    enum Tree {
+        
+        static let tags = "tree/json"
+
+        static let tagList = "article/list/"
+    }
+}
+
+extension Api {
+    /// 我的 取消收藏和点击收藏操作为post,其他为get
+    enum My {
+        static let coinRank = "coin/rank/"
+        
+        static let userCoinInfo = "lg/coin/userinfo/json"
+        
+        static let myCoinList = "lg/coin/list/"
+        
+        static let collectArticleList = "lg/collect/list/"
+        
+        static let collectArticle = "lg/collect/"
+
+        static let unCollectArticle = "lg/uncollect_originId/"
+        
+        static let unreadCount = "message/lg/count_unread/json"
+        
+        static let unreadList = "message/lg/unread_list/"
+        
+        static let readList = "message/lg/readed_list/"
+    }
+}
+
+extension Api {
+    enum Other {
+        static let tools = "tools/list/json"
+        
+        /// 问答和工具在数据结构与页面样式一模一样,所以就不再不停的重复写了
+        static let questionAndAnswer = "wenda/list/"
+        
+        /// 常用网站
+        static let friend = "friend/json"
+        
+        /// 导航
+        static let navi = "navi/json"
+    }
+}
+
+extension Api {
+    enum Course {
+        static let tags = "chapter/547/sublist/json"
+        
+        static let tagList = "article/list/"
+    }
+}
+
+extension Api {
+    enum Mock {
+        static let mourn = "mourn/json"
+    }
+}

iOSFirst/network/service/AccountService.swift

@@ -0,0 +1,64 @@
+//
+//  AccountService.swift
+//  iOSFirst
+//
+//  Created by 孙宇峰 on 2023/2/3.
+//
+
+import Foundation
+import Moya
+
+enum AccountService {
+    case login(_ username: String, _ password: String, _ showLoading: Bool)
+   
+}
+
+extension AccountService: TargetType {
+    
+    var baseURL: URL {
+        return URL(string: Api.shoolurl)!
+    }
+    
+    var path: String {
+        switch self {
+        case .login:
+            return Api.Account.loginTeacher
+        }
+    }
+    
+    var method: Moya.Method {
+        switch self {
+        case .login:
+            return .post
+        default:
+            return .post
+        }
+    }
+    
+    var sampleData: Data {
+        return Data()
+    }
+    
+    var task: Task {
+        switch self {
+        case .login(let username, let password, _):
+            return .requestParameters(parameters: ["loginname": username,
+                                                   "loginpwd": password,
+                                                   "ultype":"p_phone_t",
+                                                   "versionnum":"1.0.0"],
+                                      encoding: URLEncoding.default)
+        }
+        
+    }
+    
+    var headers: [String : String]? {
+        
+        switch self {
+        case .login(_, _, let showLoading):
+            return ["showLoading": "\(showLoading)"]
+        default:
+            return nil
+        }
+        
+    }
+}