合并无关历史并解决冲突

entry/build-profile.json5

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "apiType": "stageMode",
   "buildOption": {
@@ -25,4 +26,33 @@
       "name": "ohosTest",
     }
   ]
+=======
+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": false,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          }
+        }
+      }
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    },
+    {
+      "name": "ohosTest",
+    }
+  ]
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/oh-package.json5

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "name": "entry",
   "version": "1.0.0",
@@ -8,3 +9,15 @@
   "dependencies": {}
 }
 
+=======
+{
+  "name": "entry",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "",
+  "author": "",
+  "license": "",
+  "dependencies": {}
+}
+
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4

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

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { AbilityConstant, ConfigurationConstant, UIAbility, Want } from '@kit.AbilityKit';
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { window } from '@kit.ArkUI';
@@ -41,4 +42,49 @@ export default class EntryAbility extends UIAbility {
     // Ability has back to background
     hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onBackground');
   }
+=======
+import { AbilityConstant, ConfigurationConstant, UIAbility, Want } from '@kit.AbilityKit';
+import { hilog } from '@kit.PerformanceAnalysisKit';
+import { window } from '@kit.ArkUI';
+
+const DOMAIN = 0x0000;
+
+export default class EntryAbility extends UIAbility {
+  onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void {
+    this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET);
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onCreate');
+  }
+
+  onDestroy(): void {
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onDestroy');
+  }
+
+  onWindowStageCreate(windowStage: window.WindowStage): void {
+    // Main window is created, set main page for this ability
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onWindowStageCreate');
+
+    windowStage.loadContent('pages/Index', (err) => {
+      if (err.code) {
+        hilog.error(DOMAIN, 'testTag', 'Failed to load the content. Cause: %{public}s', JSON.stringify(err));
+        return;
+      }
+      hilog.info(DOMAIN, 'testTag', 'Succeeded in loading the content.');
+    });
+  }
+
+  onWindowStageDestroy(): void {
+    // Main window is destroyed, release UI related resources
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onWindowStageDestroy');
+  }
+
+  onForeground(): void {
+    // Ability has brought to foreground
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onForeground');
+  }
+
+  onBackground(): void {
+    // Ability has back to background
+    hilog.info(DOMAIN, 'testTag', '%{public}s', 'Ability onBackground');
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/ets/entrybackupability/EntryBackupAbility.ets

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { hilog } from '@kit.PerformanceAnalysisKit';
 import { BackupExtensionAbility, BundleVersion } from '@kit.CoreFileKit';
 
@@ -13,4 +14,21 @@ export default class EntryBackupAbility extends BackupExtensionAbility {
     hilog.info(DOMAIN, 'testTag', 'onRestore ok %{public}s', JSON.stringify(bundleVersion));
     await Promise.resolve();
   }
+=======
+import { hilog } from '@kit.PerformanceAnalysisKit';
+import { BackupExtensionAbility, BundleVersion } from '@kit.CoreFileKit';
+
+const DOMAIN = 0x0000;
+
+export default class EntryBackupAbility extends BackupExtensionAbility {
+  async onBackup() {
+    hilog.info(DOMAIN, 'testTag', 'onBackup ok');
+    await Promise.resolve();
+  }
+
+  async onRestore(bundleVersion: BundleVersion) {
+    hilog.info(DOMAIN, 'testTag', 'onRestore ok %{public}s', JSON.stringify(bundleVersion));
+    await Promise.resolve();
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

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

@@ -60,7 +60,11 @@ struct Index {
       .backgroundColor('#7B48F8')
       .borderRadius(24)
       .onClick(() => {
+<<<<<<< HEAD
         router.pushUrl({url:'pages/dong/Dong'})
+=======
+        // 处理加号按钮点击事件
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
       })
     }
   }

entry/src/main/ets/pages/home/Home.ets

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import http from '@ohos.net.http';
 import router from '@ohos.router'
 import preferences from '@ohos.data.preferences';
@@ -520,4 +521,17 @@ export default struct Home {
       })
     }
   }
+=======
+
+
+@Component
+export default struct Home {
+
+
+  build() {
+    Column(){
+      Text('首页')
+    }
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/ets/pages/message/Message.ets

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @Component
 export default struct Message {
   build() {
@@ -10,4 +11,18 @@ export default struct Message {
     .height('100%')
     .backgroundColor('#F1F3F5')
   }
+=======
+@Component
+export default struct Message {
+  build() {
+    Column() {
+      Text('消息')
+        .fontSize(20)
+        .fontWeight(FontWeight.Bold)
+    }
+    .width('100%')
+    .height('100%')
+    .backgroundColor('#F1F3F5')
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/ets/pages/my/My.ets

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @Component
 export default struct My {
   build() {
@@ -10,4 +11,19 @@ export default struct My {
     .height('100%')
     .backgroundColor('#F1F3F5')
   }
-}
+}
+=======
+@Component
+export default struct My {
+  build() {
+    Column() {
+      Text('生活圈')
+        .fontSize(20)
+        .fontWeight(FontWeight.Bold)
+    }
+    .width('100%')
+    .height('100%')
+    .backgroundColor('#F1F3F5')
+  }
+}
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4

entry/src/main/ets/pages/profile/profile.ets

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 @Component
 export default struct Profile {
   build() {
@@ -10,4 +11,18 @@ export default struct Profile {
     .height('100%')
     .backgroundColor('#F1F3F5')
   }
+=======
+@Component
+export default struct Profile {
+  build() {
+    Column() {
+      Text('我的')
+        .fontSize(20)
+        .fontWeight(FontWeight.Bold)
+    }
+    .width('100%')
+    .height('100%')
+    .backgroundColor('#F1F3F5')
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/module.json5

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "module": {
     "name": "entry",
@@ -70,4 +71,57 @@
       }
     ]
   }
+=======
+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "description": "$string:module_desc",
+    "mainElement": "EntryAbility",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "abilities": [
+      {
+        "name": "EntryAbility",
+        "srcEntry": "./ets/entryability/EntryAbility.ets",
+        "description": "$string:EntryAbility_desc",
+        "icon": "$media:layered_image",
+        "label": "$string:EntryAbility_label",
+        "startWindowIcon": "$media:startIcon",
+        "startWindowBackground": "$color:start_window_background",
+        "exported": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ],
+    "extensionAbilities": [
+      {
+        "name": "EntryBackupAbility",
+        "srcEntry": "./ets/entrybackupability/EntryBackupAbility.ets",
+        "type": "backup",
+        "exported": false,
+        "metadata": [
+          {
+            "name": "ohos.extension.backup",
+            "resource": "$profile:backup_config"
+          }
+        ],
+      }
+    ]
+  }
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/resources/base/element/color.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "color": [
     {
@@ -5,4 +6,13 @@
       "value": "#FFFFFF"
     }
   ]
+=======
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#FFFFFF"
+    }
+  ]
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/resources/base/element/float.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "float": [
     {
@@ -6,3 +7,13 @@
     }
   ]
 }
+=======
+{
+  "float": [
+    {
+      "name": "page_text_font_size",
+      "value": "50fp"
+    }
+  ]
+}
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4

entry/src/main/resources/base/element/string.json

@@ -11,6 +11,7 @@
     {
       "name": "EntryAbility_label",
       "value": "label"
+<<<<<<< HEAD
     },
     {
       "name": "permission_internet_reason",
@@ -28,6 +29,8 @@
     {
       "name": "permission_tts_reason",
       "value": ""
+=======
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
     }
   ]
 }

entry/src/main/resources/base/profile/backup_config.json

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 {
   "allowToBackupRestore": true
+=======
+{
+  "allowToBackupRestore": true
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/main/resources/base/profile/main_pages.json

@@ -1,5 +1,6 @@
 {
   "src": [
+<<<<<<< HEAD
     "pages/Index",
     "pages/nursing/Nursing",
     "pages/rehabilitation/Rehabilitation",
@@ -18,5 +19,8 @@
     "pages/nursing/NursingDetail",
     "pages/nursing/CommentList",
     "pages/region/Region"
+=======
+    "pages/Index"
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
   ]
 }

entry/src/main/resources/dark/element/color.json

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "color": [
     {
@@ -5,4 +6,13 @@
       "value": "#000000"
     }
   ]
+=======
+{
+  "color": [
+    {
+      "name": "start_window_background",
+      "value": "#000000"
+    }
+  ]
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/mock/mock-config.json5

@@ -1,3 +1,6 @@
 {
+<<<<<<< HEAD
 
+=======
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4
 }

entry/src/ohosTest/module.json5

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 {
   "module": {
     "name": "entry_test",
@@ -11,3 +12,18 @@
     "installationFree": false
   }
 }
+=======
+{
+  "module": {
+    "name": "entry_test",
+    "type": "feature",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false
+  }
+}
+>>>>>>> 78d4053a4b4de55729e6dc489f25006b715845d4