Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -217,6 +217,18 @@
           ]
           ]
         }
         }
       ]
       ]
+    },
+    {
+      "name": "wdHwAbility",
+      "srcPath": "./features/wdHwAbility",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
     }
     }
   ]
   ]
 }
 }

@@ -43,5 +43,3 @@ export { ErrorToastUtils } from './src/main/ets/utils/ErrorToastUtils'
 export { EmitterUtils } from './src/main/ets/utils/EmitterUtils'
 export { EmitterUtils } from './src/main/ets/utils/EmitterUtils'
 
 
 export { EmitterEventId } from './src/main/ets/utils/EmitterEventId'
 export { EmitterEventId } from './src/main/ets/utils/EmitterEventId'
-
-export { HWLocationUtils } from './src/main/ets/utils/HWLocationUtils'

@@ -5,6 +5,7 @@ import axios, {
   HttpStatusCode,
   HttpStatusCode,
   InternalAxiosRequestConfig
   InternalAxiosRequestConfig
 } from '@ohos/axios';
 } from '@ohos/axios';
+import { Logger } from 'wdKit/Index';
 
 
 // import type ResponseDTO from '../models/ResponseDTO';
 // import type ResponseDTO from '../models/ResponseDTO';
 
 
@@ -84,6 +85,9 @@ instance.interceptors.response.use(// 响应拦截器response类型就是Axios.r
       //   return Promise.reject(new Error(message))
       //   return Promise.reject(new Error(message))
       // }
       // }
       // const data: ResponseBean<any> = response.data
       // const data: ResponseBean<any> = response.data
+      Logger.debug('HttpRequest', 'response ======start======= ')
+      Logger.debug('HttpRequest', 'response: ' + JSON.stringify(response.data))
+      Logger.debug('HttpRequest', 'response ======end======= ')
       // 改造返回的数据，即将AxiosResponse的data返回,服务端返回的数据
       // 改造返回的数据，即将AxiosResponse的data返回,服务端返回的数据
       return response.data;
       return response.data;
     } else {
     } else {

+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test

+export { add } from "./src/main/ets/utils/Calc"
+
+export { HWLocationUtils } from './src/main/ets/location/HWLocationUtils'

+{
+  "apiType": "stageMode",
+  "buildOption": {
+  },
+  "buildOptionSet": [
+    {
+      "name": "release",
+      "arkOptions": {
+        "obfuscation": {
+          "ruleOptions": {
+            "enable": true,
+            "files": [
+              "./obfuscation-rules.txt"
+            ]
+          }
+        }
+      },
+    },
+  ],
+  "targets": [
+    {
+      "name": "default"
+    }
+  ]
+}

+import { hspTasks } from '@ohos/hvigor-ohos-plugin';
+
+export default {
+    system: hspTasks,  /* Built-in plugin of Hvigor. It cannot be modified. */
+    plugins:[]         /* Custom plugin to extend the functionality of Hvigor. */
+}

+# Define project specific obfuscation rules here.
+# You can include the obfuscation configuration files in the current module's build-profile.json5.
+#
+# For more details, see
+#   https://gitee.com/openharmony/arkcompiler_ets_frontend/blob/master/arkguard/README.md
+
+# Obfuscation options:
+# -disable-obfuscation: disable all obfuscations
+# -enable-property-obfuscation: obfuscate the property names
+# -enable-toplevel-obfuscation: obfuscate the names in the global scope
+# -compact: remove unnecessary blank spaces and all line feeds
+# -remove-log: remove all console.* statements
+# -print-namecache: print the name cache that contains the mapping from the old names to new names
+# -apply-namecache: reuse the given cache file
+
+# Keep options:
+# -keep-property-name: specifies property names that you want to keep
+# -keep-global-name: specifies names that you want to keep in the global scope

+{
+  "meta": {
+    "stableOrder": true
+  },
+  "lockfileVersion": 3,
+  "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
+  "specifiers": {
+    "@ohos/axios@^2.1.1": "@ohos/axios@2.2.0",
+    "wdBean@../wdBean": "wdBean@../wdBean",
+    "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
+    "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",
+    "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
+    "wdLogin@../wdLogin": "wdLogin@../wdLogin",
+    "wdNetwork@../../commons/wdNetwork": "wdNetwork@../../commons/wdNetwork",
+    "wdRouter@../../commons/wdRouter": "wdRouter@../../commons/wdRouter",
+    "wdWebComponent@../../commons/wdWebComponent": "wdWebComponent@../../commons/wdWebComponent"
+  },
+  "packages": {
+    "@ohos/axios@2.2.0": {
+      "name": "@ohos/axios",
+      "integrity": "sha512-v1QBWk6DfcN8wUW3D0ieFbHTR1taSI5cOgxp5l6B5cegXuNYhSc8ggKlAIXe6h/14LsfM+NW0ZGfSXcNEIM5yA==",
+      "resolved": "https://repo.harmonyos.com/ohpm/@ohos/axios/-/axios-2.2.0.har",
+      "registryType": "ohpm"
+    },
+    "wdBean@../wdBean": {
+      "name": "wdbean",
+      "resolved": "../wdBean",
+      "registryType": "local"
+    },
+    "wdConstant@../../commons/wdConstant": {
+      "name": "wdconstant",
+      "resolved": "../../commons/wdConstant",
+      "registryType": "local"
+    },
+    "wdJsBridge@../../commons/wdJsBridge": {
+      "name": "wdjsbridge",
+      "resolved": "../../commons/wdJsBridge",
+      "registryType": "local"
+    },
+    "wdKit@../../commons/wdKit": {
+      "name": "wdkit",
+      "resolved": "../../commons/wdKit",
+      "registryType": "local"
+    },
+    "wdLogin@../wdLogin": {
+      "name": "wdlogin",
+      "resolved": "../wdLogin",
+      "registryType": "local",
+      "dependencies": {
+        "wdConstant": "file:../../commons/wdConstant",
+        "wdKit": "file:../../commons/wdKit",
+        "wdWebComponent": "file:../../commons/wdWebComponent",
+        "wdBean": "file:../../features/wdBean",
+        "wdRouter": "file:../../commons/wdRouter",
+        "wdNetwork": "file:../../commons/wdNetwork"
+      }
+    },
+    "wdNetwork@../../commons/wdNetwork": {
+      "name": "wdnetwork",
+      "resolved": "../../commons/wdNetwork",
+      "registryType": "local",
+      "dependencies": {
+        "wdConstant": "file:../wdConstant",
+        "wdKit": "file:../wdKit",
+        "@ohos/axios": "^2.1.1"
+      }
+    },
+    "wdRouter@../../commons/wdRouter": {
+      "name": "wdrouter",
+      "resolved": "../../commons/wdRouter",
+      "registryType": "local",
+      "dependencies": {
+        "wdKit": "file:../wdKit",
+        "wdBean": "file:../../features/wdBean",
+        "wdNetwork": "file:../../commons/wdNetwork",
+        "wdConstant": "file:../../commons/wdConstant"
+      }
+    },
+    "wdWebComponent@../../commons/wdWebComponent": {
+      "name": "wdwebcomponent",
+      "resolved": "../../commons/wdWebComponent",
+      "registryType": "local",
+      "dependencies": {
+        "wdConstant": "file:../wdConstant",
+        "wdKit": "file:../wdKit",
+        "wdJsBridge": "file:../wdJsBridge",
+        "wdBean": "file:../../features/wdBean",
+        "wdRouter": "file:../wdRouter"
+      }
+    }
+  }
+}

+{
+  "name": "wdhwability",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "packageType": "InterfaceHar",
+  "dependencies": {
+    "wdConstant": "file:../../commons/wdConstant",
+    "wdLogin": "file:../../features/wdLogin",
+    "wdKit": "file:../../commons/wdKit",
+    "wdBean": "file:../../features/wdBean",
+    "wdNetwork": "file:../../commons/wdNetwork"
+  }
+}

-import { Logger } from './Logger';
-import { PermissionUtils } from './PermissionUtils';
 import { abilityAccessCtrl, bundleManager, Permissions } from '@kit.AbilityKit';
 import { abilityAccessCtrl, bundleManager, Permissions } from '@kit.AbilityKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { BusinessError } from '@kit.BasicServicesKit';
 import { geoLocationManager } from '@kit.LocationKit';
 import { geoLocationManager } from '@kit.LocationKit';
-import { SPHelper } from './SPHelper';
+import { Logger, PermissionUtils, ResourcesUtils, SPHelper } from 'wdKit/Index';
 
 
 /**
 /**
  * 系统定位服务实现
  * 系统定位服务实现
@@ -101,23 +99,18 @@ export class HWLocationUtils {
       "longitude": longitude,
       "longitude": longitude,
       "maxItems": 2
       "maxItems": 2
     };
     };
-    geoLocationManager.getAddressesFromLocation(requestInfo, (error, data) => {
+    geoLocationManager.getAddressesFromLocation(requestInfo, async (error, data) => {
       if (error) {
       if (error) {
         Logger.debug('location :' + JSON.stringify(error))
         Logger.debug('location :' + JSON.stringify(error))
       }
       }
       if (data) {
       if (data) {
         Logger.debug('location :' + JSON.stringify(data))
         Logger.debug('location :' + JSON.stringify(data))
-        if (data[0] && data[0].countryName) {
-          if (data[0].descriptionsSize && data[0].descriptions) {
-            let code = data[0].descriptions[1]
-            let cityCode = code.substring(0, 6)
-            let cityName = data[0].subAdministrativeArea;
-            if (cityName) {
-              SPHelper.default.save(HWLocationUtils.LOCATION_CITY_NAME, cityName)
-            }
-            if (cityCode) {
-              SPHelper.default.save(HWLocationUtils.LOCATION_CITY_NAME, cityCode)
-            }
+        if (data[0] && data[0].administrativeArea && data[0].subAdministrativeArea) {
+          let cityName = data[0].subAdministrativeArea;
+          let code = await HWLocationUtils.getCityCode(data[0].administrativeArea, data[0].subAdministrativeArea)
+          if (code) {
+            SPHelper.default.save(HWLocationUtils.LOCATION_CITY_NAME, cityName)
+            SPHelper.default.save(HWLocationUtils.LOCATION_CITY_CODE, code)
           }
           }
         }
         }
       }
       }
@@ -135,4 +128,55 @@ export class HWLocationUtils {
       })
       })
     })
     })
   }
   }
+
+  private static async getCityCode(administrativeArea: string, cityName: string) {
+    let bean = await ResourcesUtils.getResourcesJson<ResponseDTO<Array<LocalData>>>(getContext(), 'areaList_data.json');
+    if (bean) {
+      if (bean.code == 0 && bean.data) {
+        for (let i = 0; i < bean.data.length; i++) {
+          if (bean.data[i].label == administrativeArea) {
+            for (let j = 0; j < bean.data[i].children.length; j++) {
+              if (bean.data[i].children[j].label == cityName) {
+                Logger.debug("huaw" + bean.data[i].children[j].code)
+                return bean.data[i].children[j].code
+              }
+            }
+          }
+
+        }
+
+      }
+    }
+    return ''
+  }
+}
+
+interface ResponseDTO<T> {
+  success: boolean;
+
+  // 服务请求响应值/微服务响应状态码”
+  code: number;
+
+  // 服务请求响应说明
+  message: string;
+
+  // 响应结果
+  data?: T;
+  totalCount?: number;
+
+  // 请求响应时间戳（unix格式）
+  timestamp?: number;
+}
+
+interface LocalData {
+  "code": string,
+  "id": string,
+  "label": string,
+  "children": Array<ChildrenData>
+}
+
+interface ChildrenData {
+  "code": string,
+  "id": string,
+  "label": string,
 }
 }

+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}

+export function add(a:number, b:number) {
+    return a + b;
+}

+{
+  "module": {
+    "name": "wdHwAbility",
+    "type": "shared",
+    "description": "$string:shared_desc",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+    "deliveryWithInstall": true,
+    "pages": "$profile:main_pages"
+  }
+}

+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}

+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
+}

+{
+  "src": [
+    "pages/Index"
+  ]
+}

+import localUnitTest from './LocalUnit.test';
+
+export default function testsuite() {
+  localUnitTest();
+}

+import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
+
+export default function localUnitTest() {
+  describe('localUnitTest',() => {
+    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
+    beforeAll(() => {
+      // Presets an action, which is performed only once before all test cases of the test suite start.
+      // This API supports only one parameter: preset action function.
+    });
+    beforeEach(() => {
+      // Presets an action, which is performed before each unit test case starts.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: preset action function.
+    });
+    afterEach(() => {
+      // Presets a clear action, which is performed after each unit test case ends.
+      // The number of execution times is the same as the number of test cases defined by **it**.
+      // This API supports only one parameter: clear action function.
+    });
+    afterAll(() => {
+      // Presets a clear action, which is performed after all test cases of the test suite end.
+      // This API supports only one parameter: clear action function.
+    });
+    it('assertContain', 0, () => {
+      // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function.
+      let a = 'abc';
+      let b = 'b';
+      // Defines a variety of assertion methods, which are used to declare expected boolean conditions.
+      expect(a).assertContain(b);
+      expect(a).assertEqual(a);
+    });
+  });
+}

@@ -52,7 +52,7 @@ export struct LoginInputComponent {
         .margin({ top: 36 })
         .margin({ top: 36 })
         .backgroundColor("#F5F5F5")
         .backgroundColor("#F5F5F5")
         .borderRadius(4)
         .borderRadius(4)
-        .type(InputType.PhoneNumber)
+        .type(InputType.Number)
         .onChange((content) => {
         .onChange((content) => {
           this.phoneContent = content
           this.phoneContent = content
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)
           this.isSubmit = (this.phoneContent.length >= 11 && this.codeContent.length >= 6)

@@ -12,6 +12,7 @@
     "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
     "wdConstant@../../commons/wdConstant": "wdConstant@../../commons/wdConstant",
     "wdDetailPlayApi@../../features/wdDetailPlayApi": "wdDetailPlayApi@../../features/wdDetailPlayApi",
     "wdDetailPlayApi@../../features/wdDetailPlayApi": "wdDetailPlayApi@../../features/wdDetailPlayApi",
     "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo": "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo",
     "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo": "wdDetailPlayShortVideo@../../features/wdDetailPlayShortVideo",
+    "wdHwAbility@../../features/wdHwAbility": "wdHwAbility@../../features/wdHwAbility",
     "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",
     "wdJsBridge@../../commons/wdJsBridge": "wdJsBridge@../../commons/wdJsBridge",
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
     "wdKit@../../commons/wdKit": "wdKit@../../commons/wdKit",
     "wdLogin@../../features/wdLogin": "wdLogin@../../features/wdLogin",
     "wdLogin@../../features/wdLogin": "wdLogin@../../features/wdLogin",
@@ -87,6 +88,19 @@
         "wdDetailPlayApi": "file:../../features/wdDetailPlayApi"
         "wdDetailPlayApi": "file:../../features/wdDetailPlayApi"
       }
       }
     },
     },
+    "wdHwAbility@../../features/wdHwAbility": {
+      "name": "wdhwability",
+      "resolved": "../../features/wdHwAbility",
+      "registryType": "local",
+      "dependencies": {
+        "wdConstant": "file:../../commons/wdConstant",
+        "wdLogin": "file:../../features/wdLogin",
+        "wdKit": "file:../../commons/wdKit",
+        "wdBean": "file:../../features/wdBean",
+        "wdNetwork": "file:../../commons/wdNetwork"
+      },
+      "packageType": "InterfaceHar"
+    },
     "wdJsBridge@../../commons/wdJsBridge": {
     "wdJsBridge@../../commons/wdJsBridge": {
       "name": "wdjsbridge",
       "name": "wdjsbridge",
       "resolved": "../../commons/wdJsBridge",
       "resolved": "../../commons/wdJsBridge",

@@ -14,6 +14,7 @@
     "wdBean": "file:../../features/wdBean",
     "wdBean": "file:../../features/wdBean",
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdDetailPlayShortVideo": "file:../../features/wdDetailPlayShortVideo",
     "wdRouter": "file:../../commons/wdRouter",
     "wdRouter": "file:../../commons/wdRouter",
-    "wdNetwork": "file:../../commons/wdNetwork"
+    "wdNetwork": "file:../../commons/wdNetwork",
+    "wdHwAbility": "file:../../features/wdHwAbility"
   }
   }
 }
 }

 import { BottomNavigationComponent, LogoutViewModel} from 'wdComponent';
 import { BottomNavigationComponent, LogoutViewModel} from 'wdComponent';
 import { BreakpointConstants } from 'wdConstant';
 import { BreakpointConstants } from 'wdConstant';
 
 
-import { BreakpointSystem, EmitterEventId, EmitterUtils, HWLocationUtils, Logger } from 'wdKit';
+import { BreakpointSystem, EmitterEventId, EmitterUtils,  Logger } from 'wdKit';
 import router from '@ohos.router';
 import router from '@ohos.router';
 import { promptAction } from '@kit.ArkUI';
 import { promptAction } from '@kit.ArkUI';
+import { HWLocationUtils } from 'wdHwAbility/Index';
 
 
 
 
 const TAG = 'MainPage';
 const TAG = 'MainPage';

@@ -88,7 +88,6 @@ struct LaunchPage {
           // let isJumpPrivacy: boolean = globalThis.isJumpPrivacy ?? false;
           // let isJumpPrivacy: boolean = globalThis.isJumpPrivacy ?? false;
           // let isJumpPrivacy: boolean = (GlobalContext.getContext().getObject('isJumpPrivacy') as boolean) ?? false;
           // let isJumpPrivacy: boolean = (GlobalContext.getContext().getObject('isJumpPrivacy') as boolean) ?? false;
           //if (!isJumpPrivacy) {
           //if (!isJumpPrivacy) {
-          this.requestAgreement()
             this.dialogController.open();
             this.dialogController.open();
          // }
          // }
         } else {
         } else {
@@ -165,5 +164,9 @@ struct LaunchPage {
 
 
   }
   }
 
 
+  aboutToAppear(): void {
+    this.requestAgreement()
+  }
+
 
 
 }
 }