From e575e9deb5693a93e80b5a7f81868f7cadf83b3f Mon Sep 17 00:00:00 2001
From: xuqm <xuqinmin@bjca.org.cn>
Date: Mon, 1 Sep 2025 14:38:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(app):=20=E6=9B=B4=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将版本号从"1.0"修改为"1.0.0"
- 在主界面添加退出登录功能
- 使用 react-native-device-info 获取设备信息
- 更新 API 请求头中的设备信息获取方式
- 移除 User 类中冗余的 deviceInfo 字段
---
 README.md                               |  9 +++++----
 android/app/build.gradle                |  2 +-
 src/app/screens/main/MainViewScreen.tsx | 15 +++++++++++++++
 src/common/api/useApi.ts                | 24 +++++++++++-------------
 src/common/constants/types.ts           |  2 --
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index ac87ca3..61aba27 100644
--- a/README.md
+++ b/README.md
@@ -9,10 +9,11 @@
 >
 
 # 2. 说明
->   1. 下证等逻辑放在`common`里面
->   2. 方法类工具类放在`common`里面
->   3. 小程序共有的功能点，复用点放在`common`里面
->   4. 避免`common`引用子级(app、miniapp)，造成循环依赖
+>   1. 使用`jdk17`
+>   2. 下证等逻辑放在`common`里面
+>   3. 方法类工具类放在`common`里面
+>   4. 小程序共有的功能点，复用点放在`common`里面
+>   5. 避免`common`引用子级(app、miniapp)，造成循环依赖
 > 
 
 # 3. 分包说明
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f9ff9f1..9941902 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -83,7 +83,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.0"
     }
     signingConfigs {
         debug {
diff --git a/src/app/screens/main/MainViewScreen.tsx b/src/app/screens/main/MainViewScreen.tsx
index df64c72..a4f62b1 100644
--- a/src/app/screens/main/MainViewScreen.tsx
+++ b/src/app/screens/main/MainViewScreen.tsx
@@ -16,12 +16,20 @@ import { downloadToFile } from '@common/UpdateHelper.ts';
 import UpdateManager from '../../../../specs/NativeUpdateManager.ts';
 import Spinner from '@common/components/Spinner.tsx';
 import RNFS from 'react-native-fs';
+import { useAuth } from '@common/contexts/useAuth.ts';
+import DeviceInfo from 'react-native-device-info';
 
 export default function MainViewScreen() {
   const [progress, setProgress] = useState('');
   const [progressH, setProgressH] = useState('');
   const [isLoading, setLoading] = useState(false);
 
+  const {
+    actions: { logout },
+  } = useAuth();
+
+  console.log('>>>>', DeviceInfo.getVersion());
+
   return (
     <View style={styles.container}>
       <ScrollView>
@@ -157,6 +165,13 @@ export default function MainViewScreen() {
           />
           <View style={{ height: 45 }} />
           <Text>{`${RNFS.ExternalDirectoryPath}/bundles/`}</Text>
+          <View style={{ height: 55 }} />
+          <Button
+            title={'退出登录'}
+            onPress={() => {
+              logout();
+            }}
+          />
         </>
       </ScrollView>
       {isLoading && <Spinner />}
diff --git a/src/common/api/useApi.ts b/src/common/api/useApi.ts
index 4a77ccb..9eac511 100644
--- a/src/common/api/useApi.ts
+++ b/src/common/api/useApi.ts
@@ -20,6 +20,7 @@ import { getEnvUrl } from '@common/env/envUtils.ts';
 import { md5_hex } from '@common/utils/md5';
 import { CLIENT_ID, MD5_KEY } from '@common/constants';
 import { showErrorMessage } from '@common/ToastHelper.ts';
+import DeviceInfo from 'react-native-device-info';
 
 const SUCCESS_STATUS = /^0$/; // 请求成功的状态码
 
@@ -69,20 +70,14 @@ const useApi = <
   // 【这里添加额外的 headers】
   const commonHeaders = useMemo(() => {
     try {
-      const deviceInfo = JSON.parse(info.deviceInfo ?? '{}') as Record<
-        string,
-        string
-      >;
-
       return {
         clientId: CLIENT_ID, // 厂商唯一标识，这个值是为医网信app分配的
         deviceType: Platform.select({ android: '0', ios: '1' }),
-        version: deviceInfo.versionName,
-        deviceId: deviceInfo.deviceId,
-        phoneModel: deviceInfo.phoneModel,
-        phoneBrand: deviceInfo.phoneBrand,
-        phoneVersion: deviceInfo.phoneVersion,
-
+        version: DeviceInfo.getVersion(),
+        deviceId: DeviceInfo.getDeviceId(),
+        phoneModel: DeviceInfo.getModel(),
+        phoneBrand: DeviceInfo.getBrand(),
+        phoneVersion: DeviceInfo.getSystemVersion(),
         userId: userInfo?.userId ?? '',
         sessionId: token ?? '',
         currentClientId: '',
@@ -91,7 +86,7 @@ const useApi = <
     } catch {
       return {};
     }
-  }, [info.deviceInfo, token, userInfo?.userId]);
+  }, [token, userInfo?.userId]);
 
   // 【这里定义 Response 的 schema】
   const responseSchema = useMemo(() => {
@@ -180,7 +175,10 @@ const useApi = <
             ),
           );
           // 退出登录逻辑
-          if (e.response.data?.status === '017x025'||e.response.data?.status === '017x013') {
+          if (
+            e.response.data?.status === '017x025' ||
+            e.response.data?.status === '017x013'
+          ) {
             showErrorMessage(
               e.response.data?.message ??
                 '该账号已在其他设备登录，请重新登录！',
diff --git a/src/common/constants/types.ts b/src/common/constants/types.ts
index c96facd..4c06386 100644
--- a/src/common/constants/types.ts
+++ b/src/common/constants/types.ts
@@ -5,8 +5,6 @@ export type CommonInfo = {
   policyAccepted: boolean; // 是否已经接受用户协议与隐私政策
   appTourVersion: string; // 版本引导版本号
   lastLoginPhoneNumber: string; // 最近一次登录使用的手机号
-  deviceInfo: string; // 根据 innerModule 中的 initNativeInfo() 获取到的一些设备信息，使用时需要JSON.parse()进行解析
-  // ...
 };
 
 // 登录用户信息