From abcaf8d019e02502c779f62e37ffe690f0c194c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E5=8B=A4=E6=B0=91?= <xuqinmin@bjca.org.cn>
Date: Sat, 12 Oct 2024 18:45:02 +0800
Subject: [PATCH] =?UTF-8?q?release=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ets/bean/DeviceInfo.ets         |  7 +++++
 src/main/ets/utils/PreferencesHelper.ets |  2 +-
 src/main/ets/utils/ToolsHelper.ets       | 33 +++++++++++++++++++++---
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 src/main/ets/bean/DeviceInfo.ets

diff --git a/src/main/ets/bean/DeviceInfo.ets b/src/main/ets/bean/DeviceInfo.ets
new file mode 100644
index 0000000..6144df5
--- /dev/null
+++ b/src/main/ets/bean/DeviceInfo.ets
@@ -0,0 +1,7 @@
+export class DeviceInfo{
+  ODID?:string
+  manufacture?:string
+  brand?:string
+  osFullName?:string
+
+}
\ No newline at end of file
diff --git a/src/main/ets/utils/PreferencesHelper.ets b/src/main/ets/utils/PreferencesHelper.ets
index de1a6b5..70f1279 100644
--- a/src/main/ets/utils/PreferencesHelper.ets
+++ b/src/main/ets/utils/PreferencesHelper.ets
@@ -1,7 +1,7 @@
 import preferences from '@ohos.data.preferences';
 
 export class PreferencesHelper {
-  public static async put(key: string, value: preferences.ValueType | undefined) {
+  public static async put(key: string, value: preferences.ValueType | undefined | null) {
 
     const pref = await preferences.getPreferences(getContext(), 'PreferencesHelper')
     // 写入数据
diff --git a/src/main/ets/utils/ToolsHelper.ets b/src/main/ets/utils/ToolsHelper.ets
index 38f59af..80d371b 100644
--- a/src/main/ets/utils/ToolsHelper.ets
+++ b/src/main/ets/utils/ToolsHelper.ets
@@ -1,6 +1,7 @@
 import promptAction from '@ohos.promptAction';
-import { BusinessError } from '@kit.BasicServicesKit';
-import { HashMap } from '@kit.ArkTS';
+import { BusinessError, deviceInfo } from '@kit.BasicServicesKit';
+import { HashMap, util } from '@kit.ArkTS';
+import { DeviceInfo } from '../bean/DeviceInfo';
 
 export interface Btn {
   text?: string | Resource;
@@ -67,12 +68,23 @@ function customDialogBuilder<T>(option: ListOptions<T>, dialogId: number) {
     .listDirection(Axis.Vertical) // 排列方向
     .scrollBar(BarState.Off)
     .friction(0.6)
-    .divider({ strokeWidth: 1, color: 0xEEEEEE, startMargin: 20, endMargin: 20 }) // 每行之间的分界线
+    .divider({
+      strokeWidth: 1,
+      color: 0xEEEEEE,
+      startMargin: 20,
+      endMargin: 20
+    }) // 每行之间的分界线
     .edgeEffect(EdgeEffect.Spring) // 边缘效果设置为Spring
     .width('100%')
     .height(option.values.length < 8 ? `${option.values.length / 16 * 100}%` : '50%')
     .margin({ top: 20 })
-  }.padding({ top: 20, bottom: 20, left: 20, right: 20 })
+  }
+  .padding({
+    top: 20,
+    bottom: 20,
+    left: 20,
+    right: 20
+  })
 }
 
 /**
@@ -209,4 +221,17 @@ export class ToolsHelper {
     }
     return undefined
   }
+
+  private static deviceInfo: DeviceInfo
+
+  static getDeviceInfo() {
+    if (!ToolsHelper.deviceInfo) {
+      ToolsHelper.deviceInfo = new DeviceInfo()
+      ToolsHelper.deviceInfo.ODID = deviceInfo.ODID
+      ToolsHelper.deviceInfo.manufacture = deviceInfo.manufacture
+      ToolsHelper.deviceInfo.brand = deviceInfo.brand
+      ToolsHelper.deviceInfo.osFullName = deviceInfo.osFullName
+    }
+    return ToolsHelper.deviceInfo
+  }
 }
\ No newline at end of file