去掉扫码
authorliangzhenying <867174124@qq.com>
Mon, 8 Dec 2025 10:14:42 +0000 (18:14 +0800)
committerliangzhenying <867174124@qq.com>
Mon, 8 Dec 2025 10:14:42 +0000 (18:14 +0800)
ShenYin/Podfile.lock
ShenYin/ShenYin.xcodeproj/project.pbxproj
ShenYin/ShenYin/Tools/Extensions/UIImage+Develop.swift
ShenYin/ShenYin/UI/Home/Root/HomeVC.swift
ShenYin/ShenYin/UI/Home/Scan/AddDeviceVC.swift
ShenYin/ShenYin/UI/Home/Scan/QrVC.swift
ShenYin/podfile

index d2f4446..41468f3 100644 (file)
@@ -58,7 +58,6 @@ PODS:
   - SVProgressHUD/Core (2.3.1)
   - SwiftDate (7.0.0)
   - SwiftHTTP (3.0.1)
-  - swiftScan (1.2.1)
   - TabPageViewController (0.2.8)
   - TZImagePickerController (3.8.9):
     - TZImagePickerController/Basic (= 3.8.9)
@@ -89,7 +88,6 @@ DEPENDENCIES:
   - SVProgressHUD
   - SwiftDate
   - SwiftHTTP
-  - swiftScan
   - TabPageViewController
   - TZImagePickerController
   - WechatOpenSDK-XCFramework
@@ -124,7 +122,6 @@ SPEC REPOS:
     - SVProgressHUD
     - SwiftDate
     - SwiftHTTP
-    - swiftScan
     - TabPageViewController
     - TZImagePickerController
     - WechatOpenSDK-XCFramework
@@ -158,7 +155,6 @@ SPEC CHECKSUMS:
   SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22
   SwiftDate: bbc26e26fc8c0c33fbee8c140c5e8a68293a148a
   SwiftHTTP: e94f1aa8cde58637dcc0100f6349de31a3337fde
-  swiftScan: 0849e7d7c1c641384767a573ee8cb90b88d1ddd9
   TabPageViewController: 8bd4104909754416b35a98f3b72a5b674ab20dd5
   TZImagePickerController: 456f470b5dea97b37226ec7a694994a8663340b2
   WechatOpenSDK-XCFramework: b072030c9eeee91dfff1856a7846f70f7b9a88ed
@@ -166,6 +162,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: b3fd57079026407ac19712de88dd51dbc32e6d37
+PODFILE CHECKSUM: 87954e486402a1632c7a36a7dd707cf603014401
 
 COCOAPODS: 1.16.2
index 7ba1508..0885d42 100644 (file)
                        inputFileListPaths = (
                                "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-input-files.xcfilelist",
                        );
-                       inputPaths = (
-                       );
                        name = "[CP] Embed Pods Frameworks";
                        outputFileListPaths = (
                                "${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks-${CONFIGURATION}-output-files.xcfilelist",
                        );
-                       outputPaths = (
-                       );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
                        shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ShenYin/Pods-ShenYin-frameworks.sh\"\n";
                                CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 103;
+                               CURRENT_PROJECT_VERSION = 104;
                                DEVELOPMENT_TEAM = G23X75CJ67;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
                                SUPPORTS_MACCATALYST = NO;
+                               SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+                               SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
                                SWIFT_EMIT_LOC_STRINGS = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "ShenYin/ShenYin-Bridging-Header.h";
                                SWIFT_VERSION = 5.0;
                                CODE_SIGN_ENTITLEMENTS = ShenYin/ShenYin.entitlements;
                                CODE_SIGN_IDENTITY = "Apple Development";
                                CODE_SIGN_STYLE = Automatic;
-                               CURRENT_PROJECT_VERSION = 103;
+                               CURRENT_PROJECT_VERSION = 104;
                                DEVELOPMENT_TEAM = G23X75CJ67;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "$(inherited)",
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
                                SUPPORTS_MACCATALYST = NO;
+                               SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+                               SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
                                SWIFT_EMIT_LOC_STRINGS = YES;
                                SWIFT_OBJC_BRIDGING_HEADER = "ShenYin/ShenYin-Bridging-Header.h";
                                SWIFT_OPTIMIZATION_LEVEL = "-O";
index d63766d..5957fd3 100644 (file)
@@ -8,7 +8,7 @@
 
 import UIKit
 import Photos
-import AssetsLibrary
+//import AssetsLibrary
 
 public extension YCDevelop where Base: UIImage {
     
index 8023d20..71634c3 100644 (file)
@@ -58,10 +58,10 @@ class HomeVC:BaseVC{
     }
 
     
-    @objc func addDeviceAction(){
-        let vc = AddDeviceVC()
-        self.navigationController?.pushViewController(vc, animated: true)
-    }
+//    @objc func addDeviceAction(){
+//        let vc = AddDeviceVC()
+//        self.navigationController?.pushViewController(vc, animated: true)
+//    }
     @objc func saveAction(){
 //        LogManager.instance.add("保存")
 //        LogManager.instance.saveToFile()
index 9f9f2dc..2917ce9 100644 (file)
@@ -1,92 +1,92 @@
+////
+////  AddDeviceVC.swift
+////  ShenYin
+////
+////  Created by liangshi on 2025/8/11.
+////
 //
-//  AddDeviceVC.swift
-//  ShenYin
+//import UIKit
 //
-//  Created by liangshi on 2025/8/11.
+//class AddDeviceVC:BaseVC{
+//    
+//    let titleLabel = UILabel()
+//    let addView = AddDeviceSectionView()
+//    let scanView = AddDeviceSectionView()
+//    
+//
+//    
+//    override func setupViews() {
+//        self.navBar.title = ""
+//        
+////        navBar.rightView.setImage(UIImage(named: "tips_cion"), for: .normal)
+//        view.addSubviews([titleLabel,addView,scanView])
+//        titleLabel.do { v in
+//            v.text = "从这里选择一项用来添加设备".l10n
+//            v.textColor = .rgb(0x121212)
+//            v.font = .medium(14)
+//            v.textAlignment = .center
+//        }
+//        addView.do { v in
+//            v.icon.image = UIImage(named: "device_ble")
+//            v.yc.setCornerRadius(20)
+//            v.btn.set(title: "添加设备".l10n,font: .regular(14),style: .theme1, target: self, action: #selector(addAction))
+//        }
+//        scanView.do { v in
+//            v.icon.image = UIImage(named: "device_qr")
+//            v.yc.setCornerRadius(20)
+//            v.btn.set(title: "扫码连接".l10n,font: .regular(14),style: .theme1, target: self, action: #selector(scanAction))
+//        }
+//    }
+//    override func setupLayout() {
+//        titleLabel.snp.makeConstraints { make in
+//            make.top.equalTo(kNavBtm + 10)
+//            make.left.equalToSuperview()
+//            make.width.equalTo(kScreenWid)
+//        }
+//        addView.snp.makeConstraints { make in
+//            make.top.equalTo(titleLabel.snp.bottom).offset(30)
+//            make.left.right.equalToSuperview().inset(18)
+//            make.height.equalTo(228)
+//        }
+//        scanView.snp.makeConstraints { make in
+//            make.top.equalTo(addView.snp.bottom).offset(20)
+//            make.left.right.height.equalTo(addView)
+//        }
+//    }
+//
+//    override func navRightViewTapped() {
+//
+//    }
+//    @objc func addAction(){
+//        App.shared.goToPage(BleScanVC())
+//    }
+//    @objc func scanAction(){
+//        App.shared.goToPage(QrVC())
+//    }
+//}
+//class AddDeviceSectionView: BaseView {
+//    let icon = UIImageView()
+//    let btn = CustomButton()
+//    
+//    override func setupViews() {
+//        backgroundColor = .white
+//        addSubviews([icon,btn])
+//        icon.do { v in
+//        }
+//    }
+//    
+//    override func setupLayout() {
+//        icon.snp.makeConstraints { make in
+//            make.width.equalTo(106)
+//            make.height.equalTo(90)
+//            make.centerX.equalToSuperview()
+//            make.top.equalToSuperview().inset(38)
+//        }
+//        btn.snp.makeConstraints { make in
+//            make.top.equalToSuperview().inset(166)
+//            make.left.right.equalToSuperview().inset(49)
+//            make.height.equalTo(49)
+//        }
+//    }
+//}
 //
-
-import UIKit
-
-class AddDeviceVC:BaseVC{
-    
-    let titleLabel = UILabel()
-    let addView = AddDeviceSectionView()
-    let scanView = AddDeviceSectionView()
-    
-
-    
-    override func setupViews() {
-        self.navBar.title = ""
-        
-//        navBar.rightView.setImage(UIImage(named: "tips_cion"), for: .normal)
-        view.addSubviews([titleLabel,addView,scanView])
-        titleLabel.do { v in
-            v.text = "从这里选择一项用来添加设备".l10n
-            v.textColor = .rgb(0x121212)
-            v.font = .medium(14)
-            v.textAlignment = .center
-        }
-        addView.do { v in
-            v.icon.image = UIImage(named: "device_ble")
-            v.yc.setCornerRadius(20)
-            v.btn.set(title: "添加设备".l10n,font: .regular(14),style: .theme1, target: self, action: #selector(addAction))
-        }
-        scanView.do { v in
-            v.icon.image = UIImage(named: "device_qr")
-            v.yc.setCornerRadius(20)
-            v.btn.set(title: "扫码连接".l10n,font: .regular(14),style: .theme1, target: self, action: #selector(scanAction))
-        }
-    }
-    override func setupLayout() {
-        titleLabel.snp.makeConstraints { make in
-            make.top.equalTo(kNavBtm + 10)
-            make.left.equalToSuperview()
-            make.width.equalTo(kScreenWid)
-        }
-        addView.snp.makeConstraints { make in
-            make.top.equalTo(titleLabel.snp.bottom).offset(30)
-            make.left.right.equalToSuperview().inset(18)
-            make.height.equalTo(228)
-        }
-        scanView.snp.makeConstraints { make in
-            make.top.equalTo(addView.snp.bottom).offset(20)
-            make.left.right.height.equalTo(addView)
-        }
-    }
-
-    override func navRightViewTapped() {
-
-    }
-    @objc func addAction(){
-        App.shared.goToPage(BleScanVC())
-    }
-    @objc func scanAction(){
-        App.shared.goToPage(QrVC())
-    }
-}
-class AddDeviceSectionView: BaseView {
-    let icon = UIImageView()
-    let btn = CustomButton()
-    
-    override func setupViews() {
-        backgroundColor = .white
-        addSubviews([icon,btn])
-        icon.do { v in
-        }
-    }
-    
-    override func setupLayout() {
-        icon.snp.makeConstraints { make in
-            make.width.equalTo(106)
-            make.height.equalTo(90)
-            make.centerX.equalToSuperview()
-            make.top.equalToSuperview().inset(38)
-        }
-        btn.snp.makeConstraints { make in
-            make.top.equalToSuperview().inset(166)
-            make.left.right.equalToSuperview().inset(49)
-            make.height.equalTo(49)
-        }
-    }
-}
-
index 88dadfa..753670e 100644 (file)
+////
+////  QrVC.swift
+////  ShenYin
+////
+////  Created by liangshi on 2025/8/29.
+////
 //
-//  QrVC.swift
-//  ShenYin
+//import swiftScan
+//import UIKit
 //
-//  Created by liangshi on 2025/8/29.
-//
-
-import swiftScan
-import UIKit
-
-class QrVC: LBXScanViewController {
-    let navBar = BaseNavigationBar()
-    var desLabel = UILabel()
-    var closeLabel = UILabel()
-    var btnFlash = UIButton()
-    var scanResult: ((String)->Void)?
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        var style = LBXScanViewStyle()
-        style.animationImage = UIImage(named: "qrcode_scan_light_green")
-        self.scanStyle = style
-        //需要识别后的图像
-        setNeedCodeImage(needCodeImg: false)
-        
-        //框向上移动10个像素
-        scanStyle?.centerUpOffset += 10
-    }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        drawBottomItems()
-    }
-    
-    override func handleCodeResult(arrayResult: [LBXScanResult]) {
-        
-        for result: LBXScanResult in arrayResult {
-            if let str = result.strScanned {
-                Logger.debug(str)
-            }
-        }
-        
-        let result: LBXScanResult = arrayResult[0]
-        k_log(result)
-        if let contnet = result.strScanned {
-            scanResult?(contnet)
-        }
-        navigationController?.popViewController(animated: true)
-    }
-    
-    
-    func drawBottomItems() {
-        navBar.delegate = self
-        view.addSubview(navBar)
-        
-        desLabel.textAlignment = .center
-        desLabel.textColor = .white
-        desLabel.font = .regular(14)
-        view.addSubview(desLabel)
-        desLabel.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            let scanMaxHeight = (kScreenHei - kNavBtm)/2.0 + (kScreenWid - 120.0)/2.0
-            //            make.bottom.equalToSuperview().inset(180.fitR)
-            make.top.equalToSuperview().offset(scanMaxHeight + 15.fitR)
-        }
-        
-        btnFlash.yc.setCornerRadius(25.fitR)
-        btnFlash.setBackgroundImage(UIImage.yc.image(color: UIColor.white.withAlphaComponent(0.1), size: CGSize(width: 50.fitR,height: 50.fitR), cornerRadius: 25.fitR), for: .normal)
-        btnFlash.setBackgroundImage(UIImage.yc.image(color: UIColor.white.withAlphaComponent(0.4), size: CGSize(width: 50.fitR,height: 50.fitR), cornerRadius: 25.fitR), for: .selected)
-        btnFlash.setImage(UIImage(named: "qrcode_scan_btn_flash_down"), for:UIControl.State.selected)
-        btnFlash.setImage(UIImage(named: "qrcode_scan_btn_flash_nor"), for:UIControl.State.normal)
-        btnFlash.addTarget(self, action: #selector(QrVC.openOrCloseFlash), for: UIControl.Event.touchUpInside)
-        view.addSubview(btnFlash)
-        btnFlash.snp.makeConstraints { make in
-            make.size.equalTo(50.fitR)
-            make.centerX.equalToSuperview()
-            make.top.equalTo(desLabel.snp.bottom).offset(35.fitR)
-        }
-        
-        closeLabel.textAlignment = .center
-        closeLabel.textColor = .white
-        closeLabel.font = .regular(12)
-        closeLabel.text = "开灯"
-        view.addSubview(closeLabel)
-        
-        
-        closeLabel.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.top.equalTo(btnFlash.snp.bottom).offset(6.fitR)
-        }
-    }
-    
-    @objc func openOrCloseFlash() {
-        scanObj?.changeTorch()
-        btnFlash.isSelected = !btnFlash.isSelected
-        if btnFlash.isSelected {
-            closeLabel.text = "关灯".l10n
-        }
-        else{
-            closeLabel.text = "开灯".l10n
-        }
-    }
-}
-extension QrVC: BaseNavigationBarDelegate{
-    func navleftViewTapped() {
-        if let _ = self.presentingViewController {
-            self.dismiss(animated: true, completion: nil)
-        } else if let nav = self.navigationController {
-            nav.popViewController(animated: true)
-        }
-    }
-    
-    func navRightViewTapped() {
-        
-    }
-    
-}
+//class QrVC: LBXScanViewController {
+//    let navBar = BaseNavigationBar()
+//    var desLabel = UILabel()
+//    var closeLabel = UILabel()
+//    var btnFlash = UIButton()
+//    var scanResult: ((String)->Void)?
+//    
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//        
+//        var style = LBXScanViewStyle()
+//        style.animationImage = UIImage(named: "qrcode_scan_light_green")
+//        self.scanStyle = style
+//        //需要识别后的图像
+//        setNeedCodeImage(needCodeImg: false)
+//        
+//        //框向上移动10个像素
+//        scanStyle?.centerUpOffset += 10
+//    }
+//    
+//    override func viewDidAppear(_ animated: Bool) {
+//        super.viewDidAppear(animated)
+//        drawBottomItems()
+//    }
+//    
+//    override func handleCodeResult(arrayResult: [LBXScanResult]) {
+//        
+//        for result: LBXScanResult in arrayResult {
+//            if let str = result.strScanned {
+//                Logger.debug(str)
+//            }
+//        }
+//        
+//        let result: LBXScanResult = arrayResult[0]
+//        k_log(result)
+//        if let contnet = result.strScanned {
+//            scanResult?(contnet)
+//        }
+//        navigationController?.popViewController(animated: true)
+//    }
+//    
+//    
+//    func drawBottomItems() {
+//        navBar.delegate = self
+//        view.addSubview(navBar)
+//        
+//        desLabel.textAlignment = .center
+//        desLabel.textColor = .white
+//        desLabel.font = .regular(14)
+//        view.addSubview(desLabel)
+//        desLabel.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            let scanMaxHeight = (kScreenHei - kNavBtm)/2.0 + (kScreenWid - 120.0)/2.0
+//            //            make.bottom.equalToSuperview().inset(180.fitR)
+//            make.top.equalToSuperview().offset(scanMaxHeight + 15.fitR)
+//        }
+//        
+//        btnFlash.yc.setCornerRadius(25.fitR)
+//        btnFlash.setBackgroundImage(UIImage.yc.image(color: UIColor.white.withAlphaComponent(0.1), size: CGSize(width: 50.fitR,height: 50.fitR), cornerRadius: 25.fitR), for: .normal)
+//        btnFlash.setBackgroundImage(UIImage.yc.image(color: UIColor.white.withAlphaComponent(0.4), size: CGSize(width: 50.fitR,height: 50.fitR), cornerRadius: 25.fitR), for: .selected)
+//        btnFlash.setImage(UIImage(named: "qrcode_scan_btn_flash_down"), for:UIControl.State.selected)
+//        btnFlash.setImage(UIImage(named: "qrcode_scan_btn_flash_nor"), for:UIControl.State.normal)
+//        btnFlash.addTarget(self, action: #selector(QrVC.openOrCloseFlash), for: UIControl.Event.touchUpInside)
+//        view.addSubview(btnFlash)
+//        btnFlash.snp.makeConstraints { make in
+//            make.size.equalTo(50.fitR)
+//            make.centerX.equalToSuperview()
+//            make.top.equalTo(desLabel.snp.bottom).offset(35.fitR)
+//        }
+//        
+//        closeLabel.textAlignment = .center
+//        closeLabel.textColor = .white
+//        closeLabel.font = .regular(12)
+//        closeLabel.text = "开灯"
+//        view.addSubview(closeLabel)
+//        
+//        
+//        closeLabel.snp.makeConstraints { make in
+//            make.centerX.equalToSuperview()
+//            make.top.equalTo(btnFlash.snp.bottom).offset(6.fitR)
+//        }
+//    }
+//    
+//    @objc func openOrCloseFlash() {
+//        scanObj?.changeTorch()
+//        btnFlash.isSelected = !btnFlash.isSelected
+//        if btnFlash.isSelected {
+//            closeLabel.text = "关灯".l10n
+//        }
+//        else{
+//            closeLabel.text = "开灯".l10n
+//        }
+//    }
+//}
+//extension QrVC: BaseNavigationBarDelegate{
+//    func navleftViewTapped() {
+//        if let _ = self.presentingViewController {
+//            self.dismiss(animated: true, completion: nil)
+//        } else if let nav = self.navigationController {
+//            nav.popViewController(animated: true)
+//        }
+//    }
+//    
+//    func navRightViewTapped() {
+//        
+//    }
+//    
+//}
index b1fe6c9..c8a160c 100644 (file)
@@ -27,7 +27,7 @@ target 'ShenYin' do
   ##   pod 'Alamofire'
 #  pod 'Moya'#网络
   pod 'SwiftHTTP'
-  pod 'swiftScan'#二维码
+#  pod 'swiftScan'#二维码
   pod 'TZImagePickerController'#图片选择
 #  pod 'netfox'#调试
 #  pod 'DoraemonKit'#调试