修改设置-仓储

entry/src/main/ets/common/component/BottomOperateComp.ets

@@ -54,7 +54,7 @@ struct factoryCardDialog {
  * */
 @Component
 export struct BottomOperateComp {
-  @Link SmartFactoryCardDelete:number
+  // @Link SmartFactoryCardDelete:number
   private isHomePage?: boolean = false
   @State isClick:boolean = false
   //弹窗
@@ -66,16 +66,16 @@ export struct BottomOperateComp {
       this.isClick =! this.isClick
     }
   })
-  SmartFactoryCardDialogController: CustomDialogController = new CustomDialogController({
-    builder:factoryCardDialog({
-      SmartFactoryCardDelete:this.SmartFactoryCardDelete
-    }
-    ),
-    alignment: DialogAlignment.Bottom,
-    autoCancel:true,
-    customStyle:true,
-    offset: { dx: 20, dy: 50 }
-  })
+  // SmartFactoryCardDialogController: CustomDialogController = new CustomDialogController({
+  //   builder:factoryCardDialog({
+  //     SmartFactoryCardDelete:this.SmartFactoryCardDelete
+  //   }
+  //   ),
+  //   alignment: DialogAlignment.Bottom,
+  //   autoCancel:true,
+  //   customStyle:true,
+  //   offset: { dx: 20, dy: 50 }
+  // })
 
   build() {
     Stack() {
@@ -127,7 +127,7 @@ export struct BottomOperateComp {
         .gesture(
           LongPressGesture({ repeat: false })
             .onActionEnd(() => {
-             this.SmartFactoryCardDialogController.open()
+             // this.SmartFactoryCardDialogController.open()
             })
         )
 

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

@@ -8,6 +8,7 @@ import StorageModel from '../model/database/StorageModel';
 import StorageSpaceModel from '../model/database/StorageSpaceModel';
 import UserModel from '../model/database/UserModel';
 import AssistantSetModel from '../model/database/AssistantSetModel';
+import UniversalCardModel from '../model/database/UniversalCardModel';
 
 export default class EntryAbility extends UIAbility {
 
@@ -19,6 +20,7 @@ export default class EntryAbility extends UIAbility {
     StorageModel.initTaskDB(this.context)
     UserModel.initTaskDB(this.context)
     AssistantSetModel.initTaskDB(this.context)
+    UniversalCardModel.initTaskDB(this.context)
   }
 
   onDestroy(): void {
@@ -52,7 +54,7 @@ export default class EntryAbility extends UIAbility {
       windowClass.setWindowLayoutFullScreen(true)
     })
 
-    windowStage.loadContent('pages/LoginPage', (err, data) => {
+    windowStage.loadContent('pages/Index', (err, data) => {
       if (err.code) {
         hilog.error(0x0000, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err) ?? '');
         return;

entry/src/main/ets/model/database/StorageModel.ets

@@ -1,15 +1,12 @@
 import relationalStore from '@ohos.data.relationalStore';
 import CommonConstants from '../../common/constants/CommonConstants';
 import StorageInfo from '../StorageInfo';
-import StorageSpaceModel from './StorageSpaceModel';
 
 class StorageModel {
 
   private rdbStore: relationalStore.RdbStore
   private tableName: string = 'STORAGE'
 
-  private storages: StorageInfo[] = CommonConstants.STORAGES
-
   /**
    * 初始化表
    */
@@ -41,17 +38,6 @@ class StorageModel {
       })
       // 保存rdbStore
       this.rdbStore = rdbStore
-      for (const storage of this.storages) {
-        this.addStorage(storage.storageName, storage.xSize, storage.ySize, storage.defaultLayer).then((id)=>{
-          if (storage.xSize && storage.xSize > 0 && storage.ySize && storage.ySize > 0) {
-            for (let y = 1; y <= storage.ySize; y++) {
-              for (let x = 1; x <= storage.xSize; x++) {
-                StorageSpaceModel.addStorageSpace(id, x, y, 1, '', storage.defaultLayer, 1, 2)
-              }
-            }
-          }
-        })
-      }
     })
   }
 

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

@@ -590,8 +590,8 @@ struct Index {
           }
           .width('100%')
           .height('16%')
-          BottomOperateComp({ isHomePage: this.isHomePage,
-            SmartFactoryCardDelete:this.SmartFactoryCardDelete})
+          BottomOperateComp({ isHomePage: this.isHomePage,/*
+            SmartFactoryCardDelete:this.SmartFactoryCardDelete*/})
         }
         .backgroundImage($r('app.media.BG'))
         .backgroundImageSize({ width: '100%', height: '100%' })