zouhaitao/stc32g128k
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: 优化 wristband_ui_gallery 布撤防状态栏图标与文字对齐，解决文字重叠问题

Browse Source
This commit is contained in:
zouhaitao
2026-07-09 14:28:29 +08:00
parent 8e6feeaee8
commit d47c98ace4
3 changed files with 165 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Docs/wristband_ui_gallery.html
View File

@@ -204,12 +204,12 @@
<text x="67.5" y="165" fill="#64748B" font-family="system-ui, sans-serif" font-size="10" text-anchor="middle">THU 07-02</text> <text x="67.5" y="165" fill="#64748B" font-family="system-ui, sans-serif" font-size="10" text-anchor="middle">THU 07-02</text>
<!-- Armed Status at the very bottom (Y=205) --> <!-- Armed Status at the very bottom (Y=205) -->
<g transform="translate(43.5, 192)"> <g transform="translate(46, 192)">
<rect x="0" y="0" width="12" height="12" rx="2" fill="none" stroke="#EF4444" stroke-width="1.2"/> <rect x="0" y="0" width="12" height="12" rx="2" fill="none" stroke="#EF4444" stroke-width="1.2"/>
<circle cx="6" cy="4" r="2.5" fill="none" stroke="#EF4444" stroke-width="1.2"/> <circle cx="6" cy="4" r="2.5" fill="none" stroke="#EF4444" stroke-width="1.2"/>
<rect x="5" y="6" width="2" height="3" fill="#EF4444"/> <rect x="5" y="6" width="2" height="3" fill="#EF4444"/>
<text x="18" y="10" fill="#EF4444" font-family="system-ui, sans-serif" font-size="9" font-weight="bold" text-anchor="start">ARME</text>
</g> </g>
<text x="67.5" y="202" fill="#EF4444" font-family="system-ui, sans-serif" font-size="9" font-weight="bold" text-anchor="middle"> ARMED</text>
</svg> </svg>
</div> </div>
</div> </div>
@@ -241,11 +241,11 @@
<text x="67.5" y="165" fill="#64748B" font-family="system-ui, sans-serif" font-size="10" text-anchor="middle">THU 07-02</text> <text x="67.5" y="165" fill="#64748B" font-family="system-ui, sans-serif" font-size="10" text-anchor="middle">THU 07-02</text>
<!-- Disarmed Status at the very bottom (Y=205) --> <!-- Disarmed Status at the very bottom (Y=205) -->
<g transform="translate(39.5, 192)"> <g transform="translate(34, 192)">
<rect x="0" y="3" width="12" height="9" rx="1.5" fill="none" stroke="#10B981" stroke-width="1.2"/> <rect x="0" y="3" width="12" height="9" rx="1.5" fill="none" stroke="#10B981" stroke-width="1.2"/>
<path d="M 3 3 L 3 1.5 C 3 0.7, 6 0.7, 8 1.5 L 8 4" fill="none" stroke="#10B981" stroke-width="1.2"/> <path d="M 3 3 L 3 1.5 C 3 0.7, 6 0.7, 8 1.5 L 8 4" fill="none" stroke="#10B981" stroke-width="1.2"/>
<text x="18" y="10" fill="#10B981" font-family="system-ui, sans-serif" font-size="9" font-weight="bold" text-anchor="start">DESARME</text>
</g> </g>
<text x="67.5" y="202" fill="#10B981" font-family="system-ui, sans-serif" font-size="9" font-weight="bold" text-anchor="middle"> DISARM</text>
</svg> </svg>
</div> </div>
</div> </div>

76
wristband.uvopt
View File

@@ -104,17 +104,17 @@
<bSchkAxf>0</bSchkAxf> <bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf> <bTchkAxf>0</bTchkAxf>
<nTsel>-1</nTsel> <nTsel>-1</nTsel>
<sDll /> <sDll></sDll>
<sDllPa /> <sDllPa></sDllPa>
<sDlgDll /> <sDlgDll></sDlgDll>
<sDlgPa /> <sDlgPa></sDlgPa>
<sIfile /> <sIfile></sIfile>
<tDll /> <tDll></tDll>
<tDllPa /> <tDllPa></tDllPa>
<tDlgDll /> <tDlgDll></tDlgDll>
<tDlgPa /> <tDlgPa></tDlgPa>
<tIfile /> <tIfile></tIfile>
<pMon /> <pMon></pMon>
</DebugOpt> </DebugOpt>
<TargetDriverDllRegistry> <TargetDriverDllRegistry>
<SetRegEntry> <SetRegEntry>
@@ -153,24 +153,24 @@
<newCpu>0</newCpu> <newCpu>0</newCpu>
<uProt>0</uProt> <uProt>0</uProt>
</DebugFlag> </DebugFlag>
<LintExecutable /> <LintExecutable></LintExecutable>
<LintConfigFile /> <LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto> <bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD> <bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags> <LntExFlags>0</LntExFlags>
<pMisraName /> <pMisraName></pMisraName>
<pszMrule /> <pszMrule></pszMrule>
<pSingCmds /> <pSingCmds></pSingCmds>
<pMultCmds /> <pMultCmds></pMultCmds>
<pMisraNamep /> <pMisraNamep></pMisraNamep>
<pszMrulep /> <pszMrulep></pszMrulep>
<pSingCmdsp /> <pSingCmdsp></pSingCmdsp>
<pMultCmdsp /> <pMultCmdsp></pMultCmdsp>
</TargetOption> </TargetOption>
</Target> </Target>
<Group> <Group>
<GroupName>Source</GroupName> <GroupName>App</GroupName>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
@@ -179,23 +179,43 @@
<GroupNumber>1</GroupNumber> <GroupNumber>1</GroupNumber>
<FileNumber>1</FileNumber> <FileNumber>1</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\main.c</PathWithFileName> <PathWithFileName>.\App\main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath> <FilenameWithoutPath>main.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
</Group>
<Group>
<GroupName>Drivers</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>1</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber> <FileNumber>2</FileNumber>
<FileType>5</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\功能说明.txt</PathWithFileName> <PathWithFileName>.\Drivers\lcd.c</PathWithFileName>
<FilenameWithoutPath>功能说明.txt</FilenameWithoutPath> <FilenameWithoutPath>lcd.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Drivers\rf.c</PathWithFileName>
<FilenameWithoutPath>rf.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>

177
wristband.uvproj
View File

@@ -16,26 +16,26 @@
<Device>STC32G12K128 Series</Device> <Device>STC32G12K128 Series</Device>
<Vendor>STC</Vendor> <Vendor>STC</Vendor>
<Cpu>IRAM(0-0xFFF) XRAM(0x10000-0x11FFF) IROM(0xFE0000-0xFFFFFF) CLOCK(35000000)</Cpu> <Cpu>IRAM(0-0xFFF) XRAM(0x10000-0x11FFF) IROM(0xFE0000-0xFFFFFF) CLOCK(35000000)</Cpu>
<FlashUtilSpec /> <FlashUtilSpec></FlashUtilSpec>
<StartupFile>"LIB\STARTUP251.ASM" ("80251 Startup Code")</StartupFile> <StartupFile>"LIB\STARTUP251.ASM" ("80251 Startup Code")</StartupFile>
<FlashDriverDll /> <FlashDriverDll></FlashDriverDll>
<DeviceId>63457</DeviceId> <DeviceId>63457</DeviceId>
<RegisterFile>STC16F.H</RegisterFile> <RegisterFile>STC16F.H</RegisterFile>
<MemoryEnv /> <MemoryEnv></MemoryEnv>
<Cmp /> <Cmp></Cmp>
<Asm /> <Asm></Asm>
<Linker /> <Linker></Linker>
<OHString /> <OHString></OHString>
<InfinionOptionDll /> <InfinionOptionDll></InfinionOptionDll>
<SLE66CMisc /> <SLE66CMisc></SLE66CMisc>
<SLE66AMisc /> <SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc /> <SLE66LinkerMisc></SLE66LinkerMisc>
<SFDFile /> <SFDFile></SFDFile>
<bCustSvd>0</bCustSvd> <bCustSvd>0</bCustSvd>
<UseEnv>0</UseEnv> <UseEnv>0</UseEnv>
<BinPath /> <BinPath></BinPath>
<IncludePath /> <IncludePath></IncludePath>
<LibPath /> <LibPath></LibPath>
<RegisterFilePath>STC\</RegisterFilePath> <RegisterFilePath>STC\</RegisterFilePath>
<DBRegisterFilePath>STC\</DBRegisterFilePath> <DBRegisterFilePath>STC\</DBRegisterFilePath>
<TargetStatus> <TargetStatus>
@@ -59,8 +59,8 @@
<BeforeCompile> <BeforeCompile>
<RunUserProg1>0</RunUserProg1> <RunUserProg1>0</RunUserProg1>
<RunUserProg2>0</RunUserProg2> <RunUserProg2>0</RunUserProg2>
<UserProg1Name /> <UserProg1Name></UserProg1Name>
<UserProg2Name /> <UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopU1X>0</nStopU1X> <nStopU1X>0</nStopU1X>
@@ -69,8 +69,8 @@
<BeforeMake> <BeforeMake>
<RunUserProg1>0</RunUserProg1> <RunUserProg1>0</RunUserProg1>
<RunUserProg2>0</RunUserProg2> <RunUserProg2>0</RunUserProg2>
<UserProg1Name /> <UserProg1Name></UserProg1Name>
<UserProg2Name /> <UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopB1X>0</nStopB1X> <nStopB1X>0</nStopB1X>
@@ -79,15 +79,15 @@
<AfterMake> <AfterMake>
<RunUserProg1>0</RunUserProg1> <RunUserProg1>0</RunUserProg1>
<RunUserProg2>0</RunUserProg2> <RunUserProg2>0</RunUserProg2>
<UserProg1Name /> <UserProg1Name></UserProg1Name>
<UserProg2Name /> <UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
<nStopA1X>0</nStopA1X> <nStopA1X>0</nStopA1X>
<nStopA2X>0</nStopA2X> <nStopA2X>0</nStopA2X>
</AfterMake> </AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild> <SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString /> <SVCSIdString></SVCSIdString>
</TargetCommonOption> </TargetCommonOption>
<CommonProperty> <CommonProperty>
<UseCPPCompiler>0</UseCPPCompiler> <UseCPPCompiler>0</UseCPPCompiler>
@@ -101,18 +101,18 @@
<AssembleAssemblyFile>0</AssembleAssemblyFile> <AssembleAssemblyFile>0</AssembleAssemblyFile>
<PublicsOnly>0</PublicsOnly> <PublicsOnly>0</PublicsOnly>
<StopOnExitCode>3</StopOnExitCode> <StopOnExitCode>3</StopOnExitCode>
<CustomArgument /> <CustomArgument></CustomArgument>
<IncludeLibraryModules /> <IncludeLibraryModules></IncludeLibraryModules>
<ComprImg>1</ComprImg> <ComprImg>1</ComprImg>
<BankNo>65535</BankNo> <BankNo>65535</BankNo>
</CommonProperty> </CommonProperty>
<DllOption> <DllOption>
<SimDllName>S251.DLL</SimDllName> <SimDllName>S251.DLL</SimDllName>
<SimDllArguments /> <SimDllArguments></SimDllArguments>
<SimDlgDll>DCORE51.DLL</SimDlgDll> <SimDlgDll>DCORE51.DLL</SimDlgDll>
<SimDlgDllArguments>-p251</SimDlgDllArguments> <SimDlgDllArguments>-p251</SimDlgDllArguments>
<TargetDllName>S251.DLL</TargetDllName> <TargetDllName>S251.DLL</TargetDllName>
<TargetDllArguments /> <TargetDllArguments></TargetDllArguments>
<TargetDlgDll>TCORE51.DLL</TargetDlgDll> <TargetDlgDll>TCORE51.DLL</TargetDlgDll>
<TargetDlgDllArguments>-p251</TargetDlgDllArguments> <TargetDlgDllArguments>-p251</TargetDlgDllArguments>
</DllOption> </DllOption>
@@ -151,19 +151,19 @@
<RunDebugAfterBuild>0</RunDebugAfterBuild> <RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>-1</TargetSelection> <TargetSelection>-1</TargetSelection>
<SimDlls> <SimDlls>
<CpuDll /> <CpuDll></CpuDll>
<CpuDllArguments /> <CpuDllArguments></CpuDllArguments>
<PeripheralDll /> <PeripheralDll></PeripheralDll>
<PeripheralDllArguments /> <PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile /> <InitializationFile></InitializationFile>
</SimDlls> </SimDlls>
<TargetDlls> <TargetDlls>
<CpuDll /> <CpuDll></CpuDll>
<CpuDllArguments /> <CpuDllArguments></CpuDllArguments>
<PeripheralDll /> <PeripheralDll></PeripheralDll>
<PeripheralDllArguments /> <PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile /> <InitializationFile></InitializationFile>
<Driver /> <Driver></Driver>
</TargetDlls> </TargetDlls>
</DebugOption> </DebugOption>
<Utilities> <Utilities>
@@ -176,12 +176,12 @@
<DriverSelection>-1</DriverSelection> <DriverSelection>-1</DriverSelection>
</Flash1> </Flash1>
<bUseTDR>0</bUseTDR> <bUseTDR>0</bUseTDR>
<Flash2 /> <Flash2></Flash2>
<Flash3 /> <Flash3></Flash3>
<Flash4 /> <Flash4></Flash4>
<pFcarmOut /> <pFcarmOut></pFcarmOut>
<pFcarmGrp /> <pFcarmGrp></pFcarmGrp>
<pFcArmRoot /> <pFcArmRoot></pFcArmRoot>
<FcArmLst>0</FcArmLst> <FcArmLst>0</FcArmLst>
</Utilities> </Utilities>
<Target251> <Target251>
@@ -269,10 +269,10 @@
<SizSpd>1</SizSpd> <SizSpd>1</SizSpd>
<AcaOpt>0</AcaOpt> <AcaOpt>0</AcaOpt>
<VariousControls> <VariousControls>
<MiscControls /> <MiscControls></MiscControls>
<Define /> <Define></Define>
<Undefine /> <Undefine></Undefine>
<IncludePath /> <IncludePath></IncludePath>
</VariousControls> </VariousControls>
</C251> </C251>
<Ax51> <Ax51>
@@ -281,10 +281,10 @@
<UseCase>0</UseCase> <UseCase>0</UseCase>
<UseMod51>0</UseMod51> <UseMod51>0</UseMod51>
<VariousControls> <VariousControls>
<MiscControls /> <MiscControls></MiscControls>
<Define /> <Define></Define>
<Undefine /> <Undefine></Undefine>
<IncludePath /> <IncludePath></IncludePath>
</VariousControls> </VariousControls>
</Ax51> </Ax51>
<Lx51> <Lx51>
@@ -294,33 +294,60 @@
<CaseSensitiveSymbols>1</CaseSensitiveSymbols> <CaseSensitiveSymbols>1</CaseSensitiveSymbols>
<WarningLevel>2</WarningLevel> <WarningLevel>2</WarningLevel>
<DataOverlaying>1</DataOverlaying> <DataOverlaying>1</DataOverlaying>
<OverlayString /> <OverlayString></OverlayString>
<MiscControls /> <MiscControls></MiscControls>
<DisableWarningNumbers /> <DisableWarningNumbers></DisableWarningNumbers>
<LinkerCmdFile /> <LinkerCmdFile></LinkerCmdFile>
<Assign /> <Assign></Assign>
<ReserveString /> <ReserveString></ReserveString>
<CClasses /> <CClasses></CClasses>
<UserClasses /> <UserClasses></UserClasses>
<CSection /> <CSection></CSection>
<UserSection /> <UserSection></UserSection>
<CodeBaseAddress /> <CodeBaseAddress></CodeBaseAddress>
<XDataBaseAddress /> <XDataBaseAddress></XDataBaseAddress>
<PDataBaseAddress /> <PDataBaseAddress></PDataBaseAddress>
<BitBaseAddress /> <BitBaseAddress></BitBaseAddress>
<DataBaseAddress /> <DataBaseAddress></DataBaseAddress>
<IDataBaseAddress /> <IDataBaseAddress></IDataBaseAddress>
<Precede /> <Precede></Precede>
<Stack /> <Stack></Stack>
<CodeSegmentName /> <CodeSegmentName></CodeSegmentName>
<XDataSegmentName /> <XDataSegmentName></XDataSegmentName>
<BitSegmentName /> <BitSegmentName></BitSegmentName>
<DataSegmentName /> <DataSegmentName></DataSegmentName>
<IDataSegmentName /> <IDataSegmentName></IDataSegmentName>
</Lx51> </Lx51>
</Target251> </Target251>
</TargetOption> </TargetOption>
<Groups><Group><GroupName>App</GroupName><Files><File><FileName>main.c</FileName><FileType>1</FileType><FilePath>.\App\main.c</FilePath></File></Files></Group><Group><GroupName>Drivers</GroupName><Files><File><FileName>lcd.c</FileName><FileType>1</FileType><FilePath>.\Drivers\lcd.c</FilePath></File><File><FileName>rf.c</FileName><FileType>1</FileType><FilePath>.\Drivers\rf.c</FilePath></File></Files></Group></Groups></Target> <Groups>
<Group>
<GroupName>App</GroupName>
<Files>
<File>
<FileName>main.c</FileName>
<FileType>1</FileType>
<FilePath>.\App\main.c</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Drivers</GroupName>
<Files>
<File>
<FileName>lcd.c</FileName>
<FileType>1</FileType>
<FilePath>.\Drivers\lcd.c</FilePath>
</File>
<File>
<FileName>rf.c</FileName>
<FileType>1</FileType>
<FilePath>.\Drivers\rf.c</FilePath>
</File>
</Files>
</Group>
</Groups>
</Target>
</Targets> </Targets>
</Project> </Project>