Browse Source

修改抽屉动画

cjb 3 weeks ago
parent
commit
6f93d9404a

+ 2 - 2
entry/src/main/ets/pages/DeviceControllerPage.ets

@@ -765,7 +765,7 @@ struct DeviceControllerPage {
             Row() {
               Text('参数预设')
                 .fontColor($r('app.color.FFFFFF'))
-                .fontSize($r('app.float.fontSize_12'))
+                .fontSize($r('app.float.fontSize_30'))
                 .fontWeight(FontWeight.Medium)
                 .opacity(0.9)
             }
@@ -861,7 +861,7 @@ struct DeviceControllerPage {
             Row() {
               Text('参数设置')
                 .fontColor($r('app.color.FFFFFF'))
-                .fontSize($r('app.float.fontSize_12'))
+                .fontSize($r('app.float.fontSize_30'))
                 .fontWeight(FontWeight.Medium)
                 .opacity(0.9)
             }

+ 12 - 0
entry/src/main/ets/pages/ProcessIndex.ets

@@ -40,6 +40,7 @@ import { PictureDrawingDialog } from '../view/PictureDrawingDialog';
 import { AuxiliaryOperationView } from '../view/AuxiliaryOperationView';
 import { BusinessError } from '@ohos.base';
 import window from '@ohos.window';
+import { EquipmentInspectionDialog } from '../view/EquipmentInspectionDialog';
 
 // 声明接受参数的类型
 interface Params {
@@ -926,6 +927,9 @@ struct ProcessIndex {
             openPictureDrawingDialog: ()=>{
               this.pictureDrawingController.open()
             },
+            openEquipmentInspectionDialog: ()=>{
+              this.EquipmentInspectionController.open()
+            },
           })
             .height('93.5%')
             .width('100%')
@@ -1207,4 +1211,12 @@ struct ProcessIndex {
     alignment:DialogAlignment.Center,
     maskColor: 'rgba(0,0,0,0.8)',  // 黑色遮罩
   })
+  // 设备点检弹窗
+  EquipmentInspectionController: CustomDialogController = new CustomDialogController({
+    builder: EquipmentInspectionDialog({}),
+    autoCancel: true, // 点击遮罩关闭
+    customStyle: true,
+    alignment:DialogAlignment.Center,
+    maskColor: 'rgba(0,0,0,0.8)',  // 黑色遮罩
+  })
 }

+ 6 - 2
entry/src/main/ets/view/AuxiliaryOperationView.ets

@@ -65,6 +65,8 @@ export struct AuxiliaryOperationView {
   openBarcodeAssociationDialog?: () => void = () => {}
   // 打开图纸资料弹窗
   openPictureDrawingDialog?: () => void = () => {}
+  //设备点检弹窗
+  openEquipmentInspectionDialog?: () => void = () => {}
 
   // 获取条码关联中的统计
   getBarcodeStatistics() {
@@ -553,7 +555,9 @@ export struct AuxiliaryOperationView {
               .backgroundColor($r('app.color.20FFFFFF'))
               .borderRadius($r('app.float.fontSize_16'))
               .onClick(()=>{
-
+                if (this.openEquipmentInspectionDialog) {
+                  this.openEquipmentInspectionDialog()
+                }
               })
             }
             .width('90%')
@@ -650,7 +654,7 @@ export struct AuxiliaryOperationView {
                       .height($r('app.float.virtualSize_14'))
                       .fill(this.cameraStatus ? $r('app.color.30D158') : $r('app.color.15FFFFFF'))
                     Text('工业相机')
-                      .fontColor(this.cameraStatus ? $r('app.color.90000000') : $r('app.color.FFFFFF'))
+                      .fontColor($r('app.color.FFFFFF'))
                       .fontSize($r('app.float.fontSize_24'))
                       .fontWeight(FontWeight.Medium)
                   }

+ 5 - 5
entry/src/main/ets/view/SwitchingProductDialog.ets

@@ -215,11 +215,11 @@ export struct SwitchingProductDialog{
          Row() {
            // 左侧二维码图标
            Image($r('app.media.material_qr_code'))
-             .width($r('app.float.virtualSize_32'))
-             .height($r('app.float.virtualSize_32'))
+             .width($r('app.float.virtualSize_24'))
+             .height($r('app.float.virtualSize_24'))
              .fillColor($r('app.color.FFFFFF'))
              .objectFit(ImageFit.Contain)
-             .margin({left:'2%'})
+             .margin({left:'5%'})
            // 扫码输入框
            TextInput({text:this.scanSeqValue, placeholder: '请扫描或录入流水、序列或铭牌号' })
              .type(InputType.Normal)
@@ -235,8 +235,8 @@ export struct SwitchingProductDialog{
                this.scanSeqValue = value;
              })
          }
-         .height('6%')
-         .width('60%')
+         .height('8%')
+         .width('65%')
          .borderRadius($r('app.float.virtualSize_16'))
          .backgroundColor($r('app.color.000000'))
          .margin({top:'2%',bottom:'5%',left:'20%'})

+ 1 - 1
entry/src/main/ets/view/process/MultiMediaCollect.ets

@@ -532,7 +532,7 @@ export struct MultiMediaCollect {
           }
           .width('10%')
           .height('6%')
-          .backgroundColor($r('app.color.20FFFFFF'))
+          .backgroundColor($r('app.color.60000000'))
           .position({ x: '88%', y: '91%' })
           .borderRadius($r('app.float.virtualSize_16'))
           .justifyContent(FlexAlign.Center)