entry/src/main/ets/entryability/EntryAbility.ets

@@ -31,7 +31,6 @@ export default class EntryAbility extends UIAbility {
     //Set Main Window Size
     const mainWindowWidth: number = screenWidth-100;
     const mainWindowHeight: number = screenHeight-200;
-    console.error(`main window Width: mainWindowWidth, Height: mainWindowHeight`);
     //Init&&Save AppStorageV2
     const mainDisplayInfo = AppStorageV2.connect<MainScreenDisplayInfo>(MainScreenDisplayInfo, () => new MainScreenDisplayInfo(
       screenDisplayId,screenWidth,screenHeight

entry/src/main/ets/pages/CustomStyle/Button.ets

@@ -21,7 +21,7 @@ export struct EventBtn {
           .height(this.mwInfo.mainWindowWidth*0.02)
           .backgroundImage($r('app.media.' + this.eventBtn.eIcon))
           .backgroundImagePosition({ x: '5%', y: '5%' })
-          .backgroundColor(Color.Transparent)
+          .backgroundColor('#F8F9FA')
           .backgroundImageSize({
             width: '90%', // 图片宽度占满按钮
             height: '90%' // 图片高度占满按钮

entry/src/main/ets/pages/CustomStyle/ComboBox.ets

@@ -9,12 +9,15 @@ export struct TextComboBox {
     Menu() {
       ForEach(this.menu, (item: TitleButton, index: number) => {
         MenuItem({ content: item.eName })
-          .labelFont({ size: 20})
           .width('auto')
-          .onClick(()=>{
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          }).onClick(()=>{
           this.selectIndex=index;
-          })
+        })
-          .backgroundColor('#f3f3f0')
       })
     }
   }
@@ -34,12 +37,15 @@ export struct TextInputComboBox {
     Menu() {
       ForEach(this.menu, (item: TitleButton, index: number) => {
         MenuItem({ content: item.eName })
-          .labelFont({ size: 20})
           .width('auto')
-          .onClick(()=>{
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          }).onClick(()=>{
           this.selectIndex=index;
-          })
+        })
-          .backgroundColor('#f3f3f0')
       })
     }
   }

entry/src/main/ets/pages/CustomStyle/Menu.ets

@@ -18,8 +18,13 @@ export struct GroupTextEventMenu {
   GroupMenu(menus: Array<TitleMenu>) {
     ForEach(menus, (item: TitleMenu, index: number) => {
       MenuItem({ startIcon: $r('app.media.' + item.mIcon), content: item.mName })
-        .labelFont({ size: 20})
         .width('auto')
+        .margin({
+          top: 0,
+          left: 0,
+          bottom: 0,
+          right: 0
+        })
     })
   }
 
@@ -43,7 +48,7 @@ export struct GroupTextEventMenu {
             height: '90%' // 图片高度占满按钮
           })
           .bindMenu(this.GroupMenu(this.grpEvent.grpMenu))
-          .backgroundColor(Color.Transparent)
+          .backgroundColor('#F8F9FA')
       }
     }.align(Alignment.BottomEnd)
   }
@@ -62,7 +67,12 @@ export struct MenuBtn {
     Menu() {
       ForEach(this.menuBtn, (item: TitleButton, index: number) => {
         MenuItem({ startIcon: $r('app.media.' + item.eIcon), content: item.eName })
-          .labelFont({ size: 20})
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          })
           .onClick(()=>{
              this.curtIndex=index;
              ExecuteCommand(item as TitleButton);
@@ -80,7 +90,7 @@ export struct MenuBtn {
           .height(this.mwInfo.mainWindowWidth*0.02)
           .backgroundImage($r('app.media.' + this.menuBtn[this.curtIndex].eIcon))
           .backgroundImagePosition({ x: '5%', y: '5%' })
-          .backgroundColor(Color.Transparent)
+          .backgroundColor('#F8F9FA')
           .backgroundImageSize({
             width: '90%', // 图片宽度占满按钮
             height: '90%' // 图片高度占满按钮
@@ -91,8 +101,8 @@ export struct MenuBtn {
           .width(this.mwInfo.mainWindowWidth*0.02)
           .height(this.mwInfo.mainWindowWidth*0.005)
           .backgroundImage($r('app.media.base_chevron_down'))
-          .backgroundImagePosition({ x: '40%', y: '0%' })
+          .backgroundImagePosition({ x: '35%', y: '0%' })
-          .backgroundColor(Color.Transparent)
+          .backgroundColor('#F8F9FA')
 
         Text(this.menuBtn[this.curtIndex].eName)
           .fontSize(16)
@@ -100,8 +110,7 @@ export struct MenuBtn {
           .height(this.mwInfo.mainWindowWidth*0.005)
           .textAlign(TextAlign.Center)
       }
-    }
+    }.padding(1)
-    .padding(1)
   }
 }
 

entry/src/main/ets/pages/EventSubWindow/SWBase.ets

@@ -1,14 +1,11 @@
 import { BusinessError } from '@kit.BasicServicesKit';
-import { window,UIContext, AppStorageV2} from '@kit.ArkUI';
+import { window,UIContext} from '@kit.ArkUI';
-import { MainWindowInfo, MainWindowStageInfo } from '../AppStorageV2Class';
 
 let subWindow: window.Window | undefined = undefined;
 
 export async function CreateAndShowSubWindow(name:string,pages:string) {
   try {
-    const appws=AppStorageV2.connect<MainWindowStageInfo>(MainWindowStageInfo, () => new MainWindowStageInfo())!;
+    const windowStage = AppStorage.get('windowStage') as window.WindowStage;
-    const mwInfo = AppStorageV2.connect<MainWindowInfo>(MainWindowInfo, () => new MainWindowInfo())!;
-    const windowStage = appws.ws;
     if(windowStage==null){
       console.error('Failed to create the subwindow. Cause: windowStage is null');
       return;
@@ -28,9 +25,9 @@ export async function CreateAndShowSubWindow(name:string,pages:string) {
         console.log("设置拖拽缩放", `报错信息：${err.code}, ${err.message}`)
       })
       //子窗口创建成功后，设置子窗口的位置、大小及相关属性等。
-      subWindow.moveWindowTo(25, 25)
+      subWindow.moveWindowTo(150, 15)
       //子窗口重置大小
-      subWindow.resize(mwInfo.mainWindowWidth*0.3, mwInfo.mainWindowHeight*0.9);
+      subWindow.resize(800, 1200);
       subWindow.setUIContent(pages, (err: BusinessError) => {
         if (err.code) {
           console.error("加载页面失败:", err);

entry/src/main/ets/pages/EventSubWindow/SWExtrude.ets

@@ -1,11 +1,8 @@
-import { MainWindowInfo } from '../AppStorageV2Class';
 import { Expandable } from '../CustomStyle/Expandable';
-import { AppStorageV2 } from '@kit.ArkUI';
 
 @Entry
 @ComponentV2
 struct SWExtrude {
-  @Local mwInfo: MainWindowInfo = AppStorageV2.connect<MainWindowInfo>(MainWindowInfo, () => new MainWindowInfo())!;
   // 控制内容区域显示与隐藏的状态
   @Provider('isSubExpanded') isExpanded:boolean=true;
   build() {
@@ -15,10 +12,10 @@ struct SWExtrude {
           Row(){
             // 内容区域，使用条件渲染来控制显示与隐藏
             if (this.isExpanded) {
-              Text('*选择曲线(0)')
+              Text('*选择曲线(0)').width(px2vp(35)).height(px2vp(35))
               Blank().width('30%')
-              Button('绘制曲线')
+              Button('绘制曲线').width(px2vp(35)).height(px2vp(35))
-              Button('选择曲线')
+              Button('选择曲线').width(px2vp(35)).height(px2vp(35))
             }
           }.justifyContent(FlexAlign.Start)
         }

entry/src/main/ets/pages/Index.ets

@@ -60,16 +60,14 @@ struct Index {
         }.layoutWeight(1)
          .align(Alignment.Center)
       }.width('100%')
-       .height(this.mwInfo.mainWindowHeight * 0.36)
+      .height(this.mwInfo.mainWindowHeight * 0.36)
       //分割线
       Divider().vertical(false).strokeWidth(1).lineCap(LineCapStyle.Round).width('100%').backgroundColor(Color.Grey)
       ///状态栏
       Column() {
         Text('状态栏')
       }.width('100%')
-       .align(Alignment.End)
+      .height(this.mwInfo.mainWindowHeight * 0.05)
-       .alignItems(HorizontalAlign.Start)
-       .height(this.mwInfo.mainWindowHeight * 0.05)
     }.backgroundColor('#f3f3f0')
      .width('100%')
      .height('100%')

entry/src/main/ets/pages/LeftSideLayout/LeftSideTab.ets

@@ -26,8 +26,8 @@ export struct LeftSideTab {
           })
           .backgroundImage(this.isExpanded ? $r('app.media.base_expand_on'):$r('app.media.base_expand_off'))
           .type(ButtonType.Normal)
-          .width(this.mwInfo.mainWindowWidth*0.013)
+          .width(50)
-          .height(this.mwInfo.mainWindowWidth*0.013)
+          .height(50)
           .onClick(()=>{
             this.isExpanded = !this.isExpanded;
             if(this.isExpanded){
@@ -52,8 +52,8 @@ export struct LeftSideTab {
                   })
                   .backgroundImage($r('app.media.'+item.eIcon))
                   .fontWeight(index === this.leftSideBarFocusIndex ? FontWeight.Bold : FontWeight.Normal)
-                  .width(this.mwInfo.mainWindowWidth*0.013)
+                  .height(50)
-                  .height(this.mwInfo.mainWindowWidth*0.013)
+                  .width(50)
                   .type(ButtonType.Normal)
                   .onClick(() => {
                     this.leftSideBarTabs.changeIndex(index);
@@ -67,8 +67,7 @@ export struct LeftSideTab {
         .align(Alignment.Start)
         .scrollable(ScrollDirection.Vertical)
         .scrollBar(BarState.Off)
-        .width(this.mwInfo.mainWindowWidth*0.013)
+        .width(50)
-        .height(this.mwInfo.mainWindowWidth*0.013)
         .height('100%')
       }.borderWidth(1)
        .borderColor(Color.Grey)

entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets

@@ -7,13 +7,10 @@ import {DisplayMode} from "../LayoutInterface/Layout/DisplayMode"
 import { MenuBtn } from "../CustomStyle/Menu";
 import { LayoutOption } from "../LayoutInterface/Layout/LayoutOption";
 import { TitleData } from "../LayoutInterface/Layout/TabContent";
-import { MainWindowInfo } from "../AppStorageV2Class";
-import { AppStorageV2, font, Font } from "@kit.ArkUI";
 
 @ComponentV2
 export struct TitleColumnSub {
-  @Local mwInfo: MainWindowInfo = AppStorageV2.connect<MainWindowInfo>(MainWindowInfo, () => new MainWindowInfo())!;
+  //Title下的子行的功能
-
   @Local layerArray: Array<TitleButton> = [];
   @Local dX:number=0;
   @Local dY:number=0;
@@ -25,15 +22,20 @@ export struct TitleColumnSub {
       ForEach(menus, (item: TitleButton, index: number) => {
         MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName })
           .width('150')
-          .labelFont({size: 20})
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          })
       })
     }
   }
   private ViewDialog(): CustomDialogController {
     return new CustomDialogController({
       builder: ViewDialog(), // 确保 ViewDialog 组件已正确定义
-      width: this.mwInfo.mainWindowWidth*0.04,
+      width: '130vp',
-      height: this.mwInfo.mainWindowWidth*0.04,
+      height: '118vp',
       borderWidth: 1,
       cornerRadius: 5,
       isModal: true,
@@ -45,37 +47,31 @@ export struct TitleColumnSub {
   build(){
     Row({space:5}){
       Button()
+        .height(25)
+        .width(25)
         .padding(1)
-        .width(this.mwInfo.mainWindowWidth*0.013)
-        .height(this.mwInfo.mainWindowWidth*0.013)
-        .backgroundColor(Color.Transparent)
         .backgroundImage($r('app.media.base_shortcut_menu'))
-        .backgroundImagePosition({ x: '5%', y: '5%' })
+        .backgroundImagePosition({ x: '10%', y: '10%' })
         .backgroundImageSize({
-          width: '90%', // 图片宽度占满按钮
+          width: '80%', // 图片宽度占满按钮
-          height: '90%' // 图片高度占满按钮
+          height: '80%' // 图片高度占满按钮
         })
         .bindMenu(this.DisplayModeMenu(TitleData.mFileModel.cmEvents as Array<TitleButton>))
         .type(ButtonType.Normal)
-        .margin({ top:0, left: 5, bottom: 0, right: 0 })
+      Text('菜单').bindMenu(this.DisplayModeMenu(TitleData.mFileModel.cmEvents as Array<TitleButton>))
-      Text('菜单')
-        .fontSize(20)
-        .bindMenu(this.DisplayModeMenu(TitleData.mFileModel.cmEvents as Array<TitleButton>))
       Text('|')
       Text('拾取类型:')
-        .fontSize(20)
       TextComboBox({menu:SelectionMode})
+        .width('100vp')
         .borderWidth(1)
         .borderColor(Color.Grey)
         .borderRadius(5)
       Text('图层:')
-        .fontSize(20)
       TextInputComboBox({menu:this.layerArray}).width('10%')
       Button()
-        .width(this.mwInfo.mainWindowWidth*0.013)
+        .height(35)
-        .height(this.mwInfo.mainWindowWidth*0.013)
+        .width(35)
         .padding(1)
-        .backgroundColor(Color.Transparent)
         .backgroundImage($r('app.media.'+LayoutOption[0].eIcon))
         .backgroundImageSize({ width: '100%', height: '100%' })
         .bindMenu(this.DisplayModeMenu(LayoutOption))
@@ -87,9 +83,8 @@ export struct TitleColumnSub {
           this.viewDialog=this.ViewDialog();
         }
         this.viewDialog.open();
-      }).width(this.mwInfo.mainWindowWidth*0.013)
+      }).width('35vp')
-        .height(this.mwInfo.mainWindowWidth*0.013)
+        .height('35vp')
-        .backgroundColor(Color.Transparent)
         .backgroundImage($r('app.media.' + SwitchView[0].eIcon))
         .backgroundImageSize({
         width: '100%', // 图片宽度占满按钮
@@ -97,10 +92,9 @@ export struct TitleColumnSub {
         })
 
         Button()
-          .width(this.mwInfo.mainWindowWidth*0.013)
+          .height(35)
-          .height(this.mwInfo.mainWindowWidth*0.013)
+          .width(35)
           .padding(1)
-          .backgroundColor(Color.Transparent)
           .backgroundImage($r('app.media.'+DisplayMode[0].eIcon))
           .backgroundImageSize({ width: '100%', height: '100%' })
           .bindMenu(this.DisplayModeMenu(DisplayMode))

entry/src/main/ets/pages/TitleLayout/TitleTab.ets

@@ -31,7 +31,6 @@ export struct TitleTab {
         MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName })
           .width('auto')
           .height('auto')
-          .labelFont({size: 20})
       })
     }
   }

entry/src/main/module.json5

@@ -15,12 +15,10 @@
         "name": "EntryAbility",
         "srcEntry": "./ets/entryability/EntryAbility.ets",
         "description": "$string:EntryAbility_desc",
-        "icon": "$media:base_opencax_logo",
+        "icon": "$media:layered_image",
         "label": "$string:EntryAbility_label",
-        "startWindowIcon": "$media:base_start_background",
+        "startWindowIcon": "$media:startIcon",
         "startWindowBackground": "$color:start_window_background",
-        "minWindowWidth": 1200, // 设置最小宽度
-        "minWindowHeight": 800, // 设置最小高度
         "exported": true,
         "skills": [
           {