From: liangzhenying <867174124@qq.com> Date: Mon, 9 Mar 2026 09:41:37 +0000 (+0800) Subject: 眼镜板登录UI适配ipad X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=99b36d43033e28fd99dbd1c2748feb1f4c17f574;p=mirrors%2FShenYin.git 眼镜板登录UI适配ipad --- diff --git a/ShenYin/ShenYin.xcodeproj/project.pbxproj b/ShenYin/ShenYin.xcodeproj/project.pbxproj index d74af2a..c39b7e8 100644 --- a/ShenYin/ShenYin.xcodeproj/project.pbxproj +++ b/ShenYin/ShenYin.xcodeproj/project.pbxproj @@ -13,7 +13,7 @@ 3F0369672F2B604800F3CB95 /* DeepChordsSdk.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 3F8F58292EBCA2B800FFC00B /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; }; 3FD1DFED2F0E00BF00A62733 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3F8F58282EBCA2B800FFC00B /* PrivacyInfo.xcprivacy */; }; - 3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; }; + 3FFB77C12F179F3100EF9A60 /* DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0D54E0EF2F0A61E600A80EE7 /* DeepChordsSdk.framework */; platformFilter = ios; }; 644D1BB5EDD3EA1D77C57786 /* Pods_DeepChordsSdk.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 248D8B53B5A178ACA5867275 /* Pods_DeepChordsSdk.framework */; }; 7666589AAA94A323B6090425 /* Pods_playboy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4F1BB919D567C3B6B0EBAA7 /* Pods_playboy.framework */; }; 7A6613B4B617D6E71D34944C /* Pods_ShenYin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90FF0C8B0D4D6AE0933FA672 /* Pods_ShenYin.framework */; }; @@ -1056,6 +1056,7 @@ }; 3FD1DFE42F0E00BF00A62733 /* PBXTargetDependency */ = { isa = PBXTargetDependency; + platformFilter = ios; target = 0D54E0EE2F0A61E600A80EE7 /* DeepChordsSdk */; targetProxy = 3FD1DFE52F0E00BF00A62733 /* PBXContainerItemProxy */; }; @@ -1524,7 +1525,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603051206; + CURRENT_PROJECT_VERSION = 202603091640; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1580,7 +1581,7 @@ CODE_SIGN_ENTITLEMENTS = ShenYin/PLAYBOY.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 202603051206; + CURRENT_PROJECT_VERSION = 202603091640; DEVELOPMENT_TEAM = JKLJ58J33Q; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ShenYin/ShenYin/Cache/UserModel.swift b/ShenYin/ShenYin/Cache/UserModel.swift index d9ca19e..6b599d8 100644 --- a/ShenYin/ShenYin/Cache/UserModel.swift +++ b/ShenYin/ShenYin/Cache/UserModel.swift @@ -44,7 +44,10 @@ extension UserModel{ func tokenIsValid(finished: ((Bool) -> Void)? = nil){ HttpClient.request(CommomApi.token) { [weak self](model:UserInfoRoot,res) in guard let self = self else{return} - if model.isSuccess{ +// if model.isSuccess{ + //测试上架暂时绕开苹果审核，不用强制绑定手机号码 + if model.isSuccess || model.code == 50022{ + self.info = model.data self.info = model.data UserCache.shared.save(self.info) finished?(true) diff --git a/ShenYin/ShenYin/Sdk/JoySdk/VC/HomeDeviceVC.swift b/ShenYin/ShenYin/Sdk/JoySdk/VC/HomeDeviceVC.swift index 9743358..62016ba 100644 --- a/ShenYin/ShenYin/Sdk/JoySdk/VC/HomeDeviceVC.swift +++ b/ShenYin/ShenYin/Sdk/JoySdk/VC/HomeDeviceVC.swift @@ -173,13 +173,13 @@ extension HomeDeviceVC:UICollectionViewDataSource,UICollectionViewDelegate,UICol } func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { let model = DeviceVM.shared.dataList[indexPath.row] -// App.shared.goToPage(AiFunctionVC(device: model)) + App.shared.goToPage(AiFunctionVC(device: model)) - if #available(iOS 15.0, *) { - App.shared.goToPage(SubTitleVC()) - } else { - // Fallback on earlier versions - } +// if #available(iOS 15.0, *) { +// App.shared.goToPage(SubTitleVC()) +// } else { +// // Fallback on earlier versions +// } } func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView{ diff --git a/ShenYin/ShenYin/Sdk/LogManager.swift b/ShenYin/ShenYin/Sdk/LogManager.swift index 8735333..f61e054 100644 --- a/ShenYin/ShenYin/Sdk/LogManager.swift +++ b/ShenYin/ShenYin/Sdk/LogManager.swift @@ -9,7 +9,7 @@ import Foundation /// 日记管理 class Logger { - static var isDebug: Bool = true + static var isDebug: Bool = false fileprivate static let shared = Logger() private var fileHandle:FileHandle? diff --git a/ShenYin/ShenYin/UI/Login/Controller/DcLoginVC.swift b/ShenYin/ShenYin/UI/Login/Controller/DcLoginVC.swift index f428703..4c2abb1 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/DcLoginVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/DcLoginVC.swift @@ -9,6 +9,7 @@ import UIKit import DeviceKit class DcLoginVC:BaseVC{ + let scrollView = UIScrollView() let logoImg = LoginHeaderView() let bgView = LoginBgView() let titleLabel = UILabel() @@ -44,27 +45,29 @@ class DcLoginVC:BaseVC{ loginBtn.set(title: "登录".l10n,style: .theme1, target: self, action: #selector(loginAction)) smsBtn.set(title: "验证码登录".l10n, style: .theme2,target: self, action: #selector(smsAction)) - view.addSubviews([logoImg,bgView]) + + view.addSubviews([scrollView]) + scrollView.addSubviews([logoImg,bgView]) bgView.addSubviews([titleLabel,phoneView,pwdView,loginBtn,smsBtn,agreeView,othersView]) } override func setupLayout(){ + + scrollView.snp.makeConstraints { make in + make.left.top.equalToSuperview() + make.width.equalTo(kScreenWid) + make.height.equalTo(kScreenHei) + } logoImg.snp.makeConstraints { make in - if CCDevice.isJoy{ - make.left.equalToSuperview().inset(28) - make.top.equalTo(kNavBtm + 20) - make.centerX.equalToSuperview() - } - else{ - make.width.equalTo(62) - make.height.equalTo(80) - make.top.equalTo(kNavBtm + 20) - make.centerX.equalToSuperview() - } + make.width.equalTo(62) + make.height.equalTo(80) + make.top.equalTo(kNavBtm) + make.centerX.equalToSuperview() } bgView.snp.makeConstraints { make in - make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(244) + make.left.equalToSuperview() + make.width.equalTo(kScreenWid) + make.top.equalToSuperview().inset(180) make.bottom.equalToSuperview() } @@ -98,8 +101,10 @@ class DcLoginVC:BaseVC{ othersView.snp.makeConstraints { make in make.centerX.equalToSuperview() make.height.equalTo(180) - make.left.right.equalToSuperview() - make.bottom.equalToSuperview().inset(40) + make.left.equalToSuperview() + make.width.equalTo(kScreenWid) + make.top.equalTo(smsBtn.snp.bottom).offset(20) + make.bottom.equalToSuperview().inset(20) } } @@ -173,7 +178,7 @@ extension DcLoginVC{ let thirdView = ThirdLoginView() override func setupViews() { - // backgroundColor = .red +// backgroundColor = .red addSubviews([toolView,thirdView]) toolView.addSubviews([registerLabel,pwdLabel,line1]) line1.backgroundColor = .color(.secondary) @@ -218,9 +223,11 @@ extension DcLoginVC{ } thirdView.snp.makeConstraints { make in - make.bottom.equalToSuperview().inset(0) + make.top.equalToSuperview().inset(80) make.height.equalTo(80) make.centerX.equalToSuperview() +// make.left.equalToSuperview() +// make.width.equalTo(300) } } @objc func forgetAction(){ diff --git a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift index b179510..e1c1ad1 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/ForgetVC.swift @@ -69,13 +69,13 @@ class ForgetVC:BaseVC{ else{ make.width.equalTo(62) make.height.equalTo(80) - make.top.equalTo(kNavBtm + 20) + make.top.equalTo(kNavBtm) make.centerX.equalToSuperview() } } bgView.snp.makeConstraints { make in make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(244) + make.top.equalToSuperview().inset(CCDevice.isJoy ? 244:180) make.bottom.equalToSuperview() } diff --git a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift index 621ab35..12d2c13 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/RegisterVC.swift @@ -64,13 +64,13 @@ class RegisterVC:BaseVC{ else{ make.width.equalTo(62) make.height.equalTo(80) - make.top.equalTo(kNavBtm + 20) + make.top.equalTo(kNavBtm ) make.centerX.equalToSuperview() } } bgView.snp.makeConstraints { make in make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(244) + make.top.equalToSuperview().inset(CCDevice.isJoy ? 244:180) make.bottom.equalToSuperview() } diff --git a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift index 2807139..38086b6 100644 --- a/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift +++ b/ShenYin/ShenYin/UI/Login/Controller/SmsLoginVC.swift @@ -61,13 +61,13 @@ class SmsLoginVC:BaseVC{ else{ make.width.equalTo(62) make.height.equalTo(80) - make.top.equalTo(kNavBtm + 20) + make.top.equalTo(kNavBtm) make.centerX.equalToSuperview() } } bgView.snp.makeConstraints { make in make.left.right.equalToSuperview() - make.top.equalToSuperview().inset(244) + make.top.equalToSuperview().inset(CCDevice.isJoy ? 244:180) make.bottom.equalToSuperview() } diff --git a/ShenYin/ShenYin/UI/Login/View/LoginBgView.swift b/ShenYin/ShenYin/UI/Login/View/LoginBgView.swift index 568198b..d67f256 100644 --- a/ShenYin/ShenYin/UI/Login/View/LoginBgView.swift +++ b/ShenYin/ShenYin/UI/Login/View/LoginBgView.swift @@ -7,7 +7,12 @@ class LoginBgView: BaseView { override func setupViews() { - backgroundColor = CCDevice.isJoy ? UIColor.white : .color(.bgColor) - yc.setCorners(withRoundedRect: CGRect(x: 0, y: 0, width: kScreenWid, height: kScreenHei - 244), roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 50, height: 50)) + if CCDevice.isJoy { + backgroundColor = UIColor.white + yc.setCorners(withRoundedRect: CGRect(x: 0, y: 0, width: kScreenWid, height: kScreenHei - 244), roundingCorners: [.topLeft,.topRight], cornerRadii: CGSize(width: 50, height: 50)) + } + else{ + backgroundColor = .color(.bgColor) + } } }