修改设置页面

@@ -20,7 +20,7 @@ export class SpConstants{
    static MESSAGE_BOARD_PRIVATE_PROTOCOL = "message_board_private_protocol" //"留言板-隐私政策"
    static MESSAGE_BOARD_PRIVATE_PROTOCOL = "message_board_private_protocol" //"留言板-隐私政策"
    //设置页面
    //设置页面
    static SETTING_WIFI_IMAGE_SWITCH = "setting_wifi_switch" //wifi 图片开关
    static SETTING_WIFI_IMAGE_SWITCH = "setting_wifi_switch" //wifi 图片开关
-   static SETTING_WIFI_VIDEO_SWITCH = "setting_wifi_switch" //wifi 视频开关
+   static SETTING_WIFI_VIDEO_SWITCH = "setting_video_switch" //wifi 视频开关
    static SETTING_SUSPENSION_SWITCH = "setting_suspension_switch" //悬浮窗 开关
    static SETTING_SUSPENSION_SWITCH = "setting_suspension_switch" //悬浮窗 开关
    static SETTING_PUSH_SWITCH = "setting_push_switch" //推送 开关
    static SETTING_PUSH_SWITCH = "setting_push_switch" //推送 开关
 
 

@@ -200,20 +200,23 @@ export struct MineSettingComponent {
 
 
         // 右侧文案和右箭头
         // 右侧文案和右箭头
         Row() {
         Row() {
-          Toggle({ type: ToggleType.Switch, isOn: false })
+          Toggle({ type: ToggleType.Switch, isOn: item.switchState })
             .height('50lpx')
             .height('50lpx')
             .margin({ left: '81lpx', right: '29lpx' })
             .margin({ left: '81lpx', right: '29lpx' })
             .selectedColor(Color.Pink)
             .selectedColor(Color.Pink)
             .onChange((isOn: boolean) => {
             .onChange((isOn: boolean) => {
-              if(item.title=='接收推送'){
+              if(item.itemType=='push_switch'){
                 //推送
                 //推送
                 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_PUSH_SWITCH,isOn)
-              }else if(item.title=='仅WiFi网络加载图片'){
+              }else if(item.itemType=='wifi_switch'){
                 //wifi 图片
                 //wifi 图片
                 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_WIFI_IMAGE_SWITCH,isOn)
-              }else if(item.title=='WiFi网络情况下自动播放视频'){
+              }else if(item.itemType=='video_switch'){
                 //wifi 视频
                 //wifi 视频
                 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn)
                 SPHelper.default.save(SpConstants.SETTING_WIFI_VIDEO_SWITCH,isOn)
+              }else if(item.itemType=='suspensionState_switch'){
+                //悬浮窗
+                SPHelper.default.save(SpConstants.SETTING_SUSPENSION_SWITCH,isOn)
               }
               }
             })
             })
         }.width('40%')
         }.width('40%')

 
 
 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
 import { ResponseDTO, WDHttp } from 'wdNetwork';
 import { ResponseDTO, WDHttp } from 'wdNetwork';
-import { Logger } from 'wdKit';
+import { Logger, SPHelper } from 'wdKit';
 import { MineMainSettingFunctionItem } from '../viewmodel/MineMainSettingFunctionItem';
 import { MineMainSettingFunctionItem } from '../viewmodel/MineMainSettingFunctionItem';
+import { SpConstants } from 'wdConstant/Index';
 
 
 
 
 const TAG = "MineSettingDatasModel"
 const TAG = "MineSettingDatasModel"
@@ -40,15 +41,19 @@ class MineSettingDatasModel{
       return this.mainSettingData
       return this.mainSettingData
     }
     }
     this.mainSettingData = []
     this.mainSettingData = []
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '账户与安全', '18888888888', 0, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '接收推送', null, 1, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '仅WiFi网络加载图片', null, 1, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'WiFi网络情况下自动播放视频', null, 1, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false))
-    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '账户与安全', '18888888888', 0, false,"account"))
+    let pushState=SPHelper.default.getSync(SpConstants.SETTING_PUSH_SWITCH,false) as boolean
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '接收推送', null, 1, pushState,"push_switch"))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting"))
+    let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '仅WiFi网络加载图片', null, 1, wifiState,"wifi_switch"))
+     let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,false) as boolean
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'WiFi网络情况下自动播放视频', null, 1, videoState,"video_switch"))
+     let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch"))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false,""))
+    this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,""))
 
 
     return this.mainSettingData
     return this.mainSettingData
   }
   }
@@ -62,16 +67,16 @@ class MineSettingDatasModel{
       return this.accountAndSecurityData
       return this.accountAndSecurityData
     }
     }
     this.accountAndSecurityData = []
     this.accountAndSecurityData = []
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '更换手机号', '18888888888', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '设置密码', null, 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_qqicon'), '绑定QQ', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_wechaticon'), '绑定微信', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_weiboicon'), '绑定新浪微博', '立即绑定', 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_appleicon'), 'Apple ID', null, 0, false))
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null))
-
-    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '注销账号', null, 0, false))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '更换手机号', '18888888888', 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '设置密码', null, 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_qqicon'), '绑定QQ', '立即绑定', 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_wechaticon'), '绑定微信', '立即绑定', 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_weiboicon'), '绑定新浪微博', '立即绑定', 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem($r('app.media.account_appleicon'), 'Apple ID', null, 0, false,""))
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,""))
+
+    this.accountAndSecurityData.push(new MineMainSettingFunctionItem(null, '注销账号', null, 0, false,""))
 
 
     return this.accountAndSecurityData
     return this.accountAndSecurityData
   }
   }

@@ -6,9 +6,10 @@ export class MineMainSettingFunctionItem {
   subTitle?:string   // 副标题
   subTitle?:string   // 副标题
   type?:number     // 数据类型 0默认箭头类型，1右侧switch按钮类型
   type?:number     // 数据类型 0默认箭头类型，1右侧switch按钮类型
   switchState?:boolean // 右侧switch按钮状态
   switchState?:boolean // 右侧switch按钮状态
+  itemType?:string //条目类型
 
 
 
 
-  constructor(imgSrc:Resource|null,title:string|null,subTitle:string|null,type:number|null,switchState:boolean|null){
+  constructor(imgSrc:Resource|null,title:string|null,subTitle:string|null,type:number|null,switchState:boolean|null,itemType:string){
     if (imgSrc) {
     if (imgSrc) {
       this.imgSrc = imgSrc
       this.imgSrc = imgSrc
     }
     }
@@ -24,6 +25,9 @@ export class MineMainSettingFunctionItem {
     if (switchState != null) {
     if (switchState != null) {
       this.switchState = switchState
       this.switchState = switchState
     }
     }
+    if (itemType != null) {
+      this.itemType = itemType
+    }
 
 
   }
   }
 }
 }