改了首页背景显示逻辑

diff --git a/ShenYin/DeepChordsSdk/DCBleManager.swift b/ShenYin/DeepChordsSdk/DCBleManager.swift
index bc69cea..47fdc46 100644 (file)
--- a/ShenYin/DeepChordsSdk/DCBleManager.swift
+++ b/ShenYin/DeepChordsSdk/DCBleManager.swift
@@ -27,17 +27,7 @@ public class DCBleManager{
     func send(_ sender:BleSender){
         if let connectPeripheral = connectPeripheral, let writeCha = writeCha {
             DCLogger.debug("发",writeCha.uuid.uuidString,sender.data.joined())
-            
-            
-//            if sender.data[1] == 0x10,sender.data[2] == 0x01 {
-//                let text1 = "ba100101025b7b226964223a302c226e616d65223a22e69da8e5ae97e7baac2de4b880e6aca1e5b0b1e5a5bd20284c697665292e6d7033222c2273697a65223a343233323632342c22647572223a307d2c7b226964223a312c226e616d65223a22e5bca0e7b4abe8b1aa2de58fafe4b88de58fafe4bba52e6d7033222c2273697a65223a393635383835322c22647572223a307d2c7b226964223a322c226e616d65223a224245594f4e442de79c9fe79a84e788b1e4bda02e6d7033222c2273697a65223a31313031363533372c22647572223a307d2c7b226964223a332c226e616d65223a22472e452e4d2e20e98293e7b4abe6a38b2de69c89e5bf83e4baba2e6d7033222c2273697a65223a393630333832392c22647572223a307d2c7b226964223a342c226e616d65223a2248414e41e88f8ae6a293e4b9942de68891e4b88de698afe5a5b92e6d7033222c2273697a65223a373932343138312c22647572223a307d2c7b226964223a352c226e616d65223a2248414e412de5bf98e8aeb0e68891e887aae5b7b12e6d7033222c2273697a65223a393330343938342c22647572223a307d5da701d9"
-//                sender.completion?(.response.code(.success).value(Data.dataWithHexString(text1)))
-//                let text2 = "ba100102025b7b226964223a362c226e616d65223a224d722e3136e7bd97e99abde6b0b82de5a484e5a484e590bb2e6d7033222c2273697a65223a383533333836302c22647572223a307d2c7b226964223a372c226e616d65223a22536f6c65722de9a2a8e79a84e5ada3e7af802e6d7033222c2273697a65223a31303031333432352c22647572223a307d2c7b226964223a382c226e616d65223a225477696e732de6818be788b1e5a4a7e8bf87e5a4a92e6d7033222c2273697a65223a393039383039362c22647572223a307d2c7b226964223a392c226e616d65223a225477696e732de6a3aee5b7b4e79a87e5908e2e6d7033222c2273697a65223a373436323832322c22647572223a307d5d0e012c"
-//                sender.completion?(.response.code(.success).value(Data.dataWithHexString(text2)))
-//            }
-//            else{
-                connectPeripheral.writeValue(sender.data, for: writeCha, type:.withoutResponse)
-//            }
+            connectPeripheral.writeValue(sender.data, for: writeCha, type:.withoutResponse)
         }
     }
     func sendToStarburst(_ data:Data){
@@ -72,7 +62,6 @@ extension DCBleManager{
         if let list = service.characteristics{
             DCLogger.debug("发现特征",list)
             for char in  list{
-                DCLogger.debug(char)
                 if char.uuid.uuidString == DCBleManager.notifyUUID {
                     peripheral.setNotifyValue(true, for: char)
                 }

diff --git a/ShenYin/ShenYin/Sdk/DcSdk/VC/HomeDeviceVC.swift b/ShenYin/ShenYin/Sdk/DcSdk/VC/HomeDeviceVC.swift
index 3d1d90a..3148ff5 100644 (file)
--- a/ShenYin/ShenYin/Sdk/DcSdk/VC/HomeDeviceVC.swift
+++ b/ShenYin/ShenYin/Sdk/DcSdk/VC/HomeDeviceVC.swift
@@ -55,15 +55,7 @@ class HomeDeviceVC:BaseVC{
 //            v.backgroundColor = .red
         }
 
-        currentBg = BackgroundCache.get()
-        if (currentBg != nil) {
-            imgView.kf.setImage(with: currentBg?.bgPath.yc.asUrl)
-            navBar.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
 
-        }
-        else{
-            imgView.image = UIImage(named: "home_bg")
-        }
     }
     override func setupLayout() {
         collectionView.snp.makeConstraints { (m) in
@@ -73,6 +65,28 @@ class HomeDeviceVC:BaseVC{
         imgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
+    }
+    override func setupData() {
+        currentBg = BackgroundCache.get()
+        if (currentBg != nil) {
+            imgView.kf.setImage(with: currentBg?.bgPath.yc.asUrl)
+            navBar.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
+            
+        }
+        else{
+            imgView.image = UIImage(named: "home_bg")
+            
+            HttpClient.request(.backgroundList) {[weak self] (model:BackgroundModelRoot,res) in
+                guard let self = self else {return}
+                if model.isSuccess,let model = model.data.first{
+                    BackgroundCache.save(model: model)
+                    currentBg = model
+                    self.imgView.kf.setImage(with: model.bgPath.yc.asUrl)
+                    self.collectionView.reloadData()
+                    navBar.setupRightViews([NavigationRightItem(image: UIImage(named: "add_icon"), target: self,action: #selector(addAction)),NavigationRightItem(image: UIImage(named: "home_bg_icon"),target: self, action: #selector(editAction))])
+                }
+            }
+        }
     }
      func reloadData() {
         DeviceVM.shared.refresh {[weak self] result in

diff --git a/ShenYin/ShenYin/Sdk/LogManager.swift b/ShenYin/ShenYin/Sdk/LogManager.swift
index 8735333..f61e054 100644 (file)
--- 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/Home/Device/BackgroundVC.swift b/ShenYin/ShenYin/UI/Home/Device/BackgroundVC.swift
index 7a518c4..0cd8c33 100644 (file)
--- a/ShenYin/ShenYin/UI/Home/Device/BackgroundVC.swift
+++ b/ShenYin/ShenYin/UI/Home/Device/BackgroundVC.swift
@@ -42,7 +42,6 @@ class BackgroundVC: BaseVC{
         }
     }
     override func setupData() {
-        
         if let model = BackgroundCache.get() {
             currentUrl = model.bgPath
         }

diff --git a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift
index 6763925..6322fb1 100644 (file)
--- a/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift
+++ b/ShenYin/ShenYin/UI/Mine/Root/MineHeaderView.swift
@@ -14,14 +14,6 @@ class MineHeaderView: BaseView {
     
     override func setupViews() {
         addSubviews([userInfo,cloud,banner])
-
-//        let model1 = BannerModel()
-//        model1.imgPath = "mine_banner1"
-//        let model2 = BannerModel()
-//        model2.imgPath = "mine_banner2"
-//        let model3 = BannerModel()
-//        model3.imgPath = "mine_banner3"
-//        banner.config(list: [model1,model2,model3])
     }
     
     override func setupLayout() {
@@ -53,7 +45,7 @@ class MineUserInfoView: BaseView {
         
         icon.do { v in
             v.image = UIImage(named: "head")
-            v.yc.setCornerRadius(40)
+            v.yc.setCornerRadius(35)
             v.backgroundColor = .white
             
         }
@@ -76,23 +68,41 @@ class MineUserInfoView: BaseView {
     }
     
     override func setupLayout() {
-
+//        if CCDevice.isJoy{
+//            titleLabel.snp.makeConstraints { (m) in
+//                m.top.equalToSuperview().inset(10)
+//                m.left.equalToSuperview().inset(38)
+//                m.right.equalTo(icon.snp.left).offset(-20)
+//            }
+//            deviceLabel.snp.makeConstraints { (m) in
+//                m.top.equalToSuperview().inset(60)
+//                m.left.equalToSuperview().inset(38)
+//                m.height.equalTo(30)
+//                m.width.equalTo(130)
+//            }
+//            icon.snp.makeConstraints { (m) in
+//                m.size.equalTo(80)
+//                m.right.equalToSuperview().inset(38)
+//                m.top.equalToSuperview().inset(10)
+//            }
+//        }
+//        else{
+            icon.snp.makeConstraints { (m) in
+                m.size.equalTo(70)
+                m.left.equalToSuperview().inset(18)
+                m.top.equalToSuperview().inset(10)
+            }
         titleLabel.snp.makeConstraints { (m) in
-            m.top.equalToSuperview().inset(10)
-            m.left.equalToSuperview().inset(38)
-            m.right.equalTo(icon.snp.left).offset(-20)
+            m.top.equalTo(icon)
+            m.left.equalToSuperview().inset(100)
         }
         deviceLabel.snp.makeConstraints { (m) in
-            m.top.equalToSuperview().inset(60)
-            m.left.equalToSuperview().inset(38)
+            m.bottom.equalTo(icon)
+            m.left.equalTo(titleLabel)
             m.height.equalTo(30)
             m.width.equalTo(130)
         }
-        icon.snp.makeConstraints { (m) in
-            m.size.equalTo(80)
-            m.right.equalToSuperview().inset(38)
-            m.top.equalToSuperview().inset(10)
-        }
+//        }
     }
     func updateUI(){
         CacheManager.shared.user.getUserInfo{[weak self] sucess in

diff --git a/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260117-094528.png b/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260117-094528.png
deleted file mode 100644 (file)
index e2cb37f..0000000
Binary files a/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260117-094528.png and /dev/null differ

diff --git a/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260302-173144.png b/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260302-173144.png
new file mode 100644 (file)
index 0000000..be561f1
Binary files /dev/null and b/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/20260302-173144.png differ

diff --git a/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/Contents.json b/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/Contents.json
index c38f7bd..3741d6b 100644 (file)
--- a/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/Contents.json
+++ b/ShenYin/ShenYin/playboy.xcassets/customer/server_qr.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "20260117-094528.png",
+      "filename" : "20260302-173144.png",
       "idiom" : "universal",
       "scale" : "1x"
     },