fix:Udisk insetall and emoji

Author: VirtualHotBar

resources/tools/letter.bat

@@ -0,0 +1,5 @@
+@echo off &setlocal enabledelayedexpansion
+if exist "%tmp%\drives.txt" del /s /q /f "%tmp%\drives.txt" >nul 2>nul
+for /f "delims=" %%a in ('fsutil fsinfo drives^| more +1') do (set /p=%%a <nul >>"%tmp%\drives.txt")
+for /f "usebackq tokens=1,* delims= " %%a in ("%tmp%\drives.txt") do (set "code=%%b" && set "code=!code:\=!")
+echo.!code!

src/view/assets/font/seguiemj.woff2

@@ -81,8 +81,13 @@ export async function installToUDisk(diskIndex: string, setStep: Function, setSt
         dataLetter = takeMidStr(back, '盘符:', '文件系统:').replaceAll('	', '').replaceAll('\r\n', '').replaceAll(' ', '');
     });
 
-    console.log(dataLetter);
-
+    //获取数据分区盘符失败后重新获取
+    if (!'F:G:H:I:J:K:L:M:N:O:P:Q:R:S:T:U:V:W:X:Y:Z:A:B:C:D:E:'.includes(dataLetter)) {
+        console.log('获取数据分区盘符失败后重新获取:',dataLetter);
+        await runPacmd(' /hd:' + diskIndex + ' /setletter:0 /letter:*')//卸载盘符
+        dataLetter = await getUsableLetter()//取个没被占用(可用)的盘符
+        isSucceed = isSucceed && await runPacmd(' /hd:' + diskIndex + ' /setletter:0 /letter:' + dataLetter)//重新分配盘符
+    }
 
     await runCmdAsync(pecmdPath + ' DFMT ' + dataLetter + ',exFAT,HotPE工具箱')
 
@@ -160,7 +165,7 @@ export async function UnInstallToUDisk(diskIndex: string, setStep: Function, set
     setStepStr('正在删除U盘所有分区')
     //删除磁盘所有分区
     await runCmdAsync(fbplusPath + ' (hd' + diskIndex + ') format --force --raw --fat32  --align')//还原磁盘为普通模式（删除fbinst引导记录）
-    await runPacmd(' /hd:' + diskIndex + '  /del:all')
+    await runPacmd(' /hd:' + diskIndex + ' /del:all')
 
     setStepStr('正在初始化U盘')
     //初始化

src/view/controller/Install/toUDisk.ts

@@ -6,7 +6,7 @@ import { isHotPEDrive, traverseFiles, readHotPEConfig, delFiles } from "../utils
 import { updateState } from "./init";
 import { checkHPMFiles } from "./hpm/checkHpmFiles";
 import { checkPESetting } from "./setting/setting";
-import { getDisksInfo, getPartitionsInfo, isMoveForDisk } from "../utils/disk/diskInfo";
+import { getAllLetterInfo, getDisksInfo, getPartitionsInfo, isMoveForDisk } from "../utils/disk/diskInfo";
 
 //检查PE资源
 export async function checkPERes() {
@@ -37,6 +37,7 @@ export async function checkPEDrive() {
     //刷新一下DiskList
     await getDisksInfo()
     await getPartitionsInfo()
+    await getAllLetterInfo()
 
     config.state.setupToSys = 'without'
 

src/view/controller/condition.ts

@@ -31,6 +31,7 @@ export async function initClient(setStartStr: Function) {
     //获取需要的环境信息
     //await getDisksInfo()
     //await getPartitionsInfo()
+    //await getAllLetterInfo()
 
     //检查已安装的分区
     await checkPEDrive()//默认选择最后一个，并获取获取本地HPM列表,have getDisksInfo and getPartitionsInfo

src/view/controller/init.ts

@@ -1,9 +1,8 @@
 import { config, roConfig } from "../services/config";
-import { getAllLetter, getUsableLetter } from "../utils/disk/diskInfo";
+import {  getUsableLetter } from "../utils/disk/diskInfo";
 
 export async function AppTest(){
     console.log(config);
     console.log(roConfig);
     console.log(await getUsableLetter());
-    console.log(await getAllLetter());
 }

src/view/controller/test.ts

@@ -24,6 +24,10 @@ div.loading {
   src: url("./assets/font/HarmonyOS_Sans_Bold.ttf") format("truetype");
 }
 
+@font-face {
+  font-family: 'emoji';
+  src: url('./assets/font/seguiemj.woff2') format('woff2');
+}
 
 /*  美化滚动条 */
 ::-webkit-scrollbar {

src/view/index.css

@@ -145,21 +145,21 @@ export default function Home(props: any) {
     //处理状态
     if (config.state.install == "noDown") {
         content = <>
-            <div ><span style={{ fontSize: '80px' }}>😶</span>{/* <EmotionUnhappy theme="outline" size="90" fill="#4a90e2" /> */}</div>
+            <div ><span style={{ fontSize: '80px', fontFamily: 'emoji' }}>😶</span>{/* <EmotionUnhappy theme="outline" size="90" fill="#4a90e2" /> */}</div>
             <h3>未检测到HotPE的相关文件,需要下载,以便安装</h3>
             <Button type='primary' style={{ marginRight: 8 }} onClick={toDlPERes}>开始下载</Button>
         </>
     } else if (config.state.install == 'noSetup') {
         content = <>
-            <div ><span style={{ fontSize: '80px' }}>🤔</span>{/* <Help theme="outline" size="90" fill="#4a90e2" /> */}</div>
+            <div ><span style={{ fontSize: '80px', fontFamily: 'emoji' }}>🤔</span>{/* <Help theme="outline" size="90" fill="#4a90e2" /> */}</div>
             <h3>现在并未检测到有HotPE的安装,请插入已安装的U盘或开始安装</h3>
             <Button onClick={() => { props.setNavKey('SetupToSys') }} type='primary' style={{ marginRight: 8 }}>安装到系统</Button>
             <Button onClick={() => { props.setNavKey('SetupToUDisk') }} type='primary' style={{ marginRight: 8 }}>安装到U盘</Button>
             <Button onClick={() => { props.setNavKey('MakeISO') }} type='primary' style={{ marginRight: 8 }}>生成ISO镜像</Button>
         </>
     } else if (config.state.install == 'ready') {
         content = <>
-            <div ><span style={{ fontSize: '80px' }}>😊</span>{/* <EmotionHappy theme="outline" size="90" fill="#4a90e2" /> */}</div>
+            <div ><span style={{ fontSize: '80px', fontFamily: 'emoji' }}>😊</span>{/* <EmotionHappy theme="outline" size="90" fill="#4a90e2" /> */}</div>
             <h3>你的HotPE已准备就绪,你可以进行更改</h3>
             <Button onClick={() => { props.setNavKey('HPMDl') }} type='primary' style={{ marginRight: 8 }}>模块下载</Button>
             <Button onClick={() => { props.setNavKey('HPMMgr') }} type='primary' style={{ marginRight: 8 }}>模块管理</Button>

src/view/page/Home.tsx

@@ -76,7 +76,8 @@ let config: Config = {
                 firmware: '',
             },
             disks: [],
-            partitions:[]
+            partitions:[],
+            allLetter:[]
         }
 
     },

src/view/services/config.ts

@@ -27,7 +27,8 @@ interface Config {
                 firmware:string,//固件：UEFI
             },
             disks:Array<disksInfo>,
-            partitions:Array<partitionInfo>
+            partitions:Array<partitionInfo>,
+            allLetter:Array<string>//所有盘符，包括虚拟盘符
         }
 
     },