Merge pull request #4 from ajkshfjkaj/sig

feat: 优化代码提高代码容错

Author: mingmingaini

harmony/picker/src/main/cpp/RTNPickerTurboModule.cpp

@@ -5,22 +5,22 @@ using namespace rnoh;
 using namespace facebook;
 
 static jsi::Value __hostFunction_RTNPickerTurboModule_init(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "init", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "init", args, count);
 }
 static jsi::Value __hostFunction_RTNPickerTurboModule_toggle(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "toggle", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "toggle", args, count);
 }
 static jsi::Value __hostFunction_RTNPickerTurboModule_show(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "show", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "show", args, count);
 }
 static jsi::Value __hostFunction_RTNPickerTurboModule_hide(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "hide", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "hide", args, count);
 }
 static jsi::Value __hostFunction_RTNPickerTurboModule_select(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "select", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "select", args, count);
 }
 static jsi::Value __hostFunction_RTNPickerTurboModule_isPickerShow(jsi::Runtime &rt, react::TurboModule &turboModule, const jsi::Value *args, size_t count) {
-  return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "isPickerShow", args, count);
+  return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "isPickerShow", args, count);
 }
 
 RTNPickerTurboModule::RTNPickerTurboModule(const ArkTSTurboModule::Context ctx, const std::string name): ArkTSTurboModule(ctx, name) {

harmony/picker/src/main/ets/Logger.ts

@@ -0,0 +1,64 @@
+/*
+ * MIT License
+ *
+ * Copyright (C) 2023 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import hilog from '@ohos.hilog';
+
+class Logger {
+  private domain: number;
+  private prefix: string;
+  private format: string = '%{public}s, %{public}s';
+  private isDebug: boolean;
+
+  /**
+   * constructor.
+   *
+   * @param Prefix Identifies the log tag.
+   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
+   */
+  constructor(prefix: string = 'MyApp', domain: number = 0xFF00, isDebug = false) {
+    this.prefix = prefix;
+    this.domain = domain;
+    this.isDebug = isDebug;
+  }
+
+  debug(...args: string[]): void {
+    if (this.isDebug) {
+      hilog.debug(this.domain, this.prefix, this.format, args);
+    }
+  }
+
+  info(...args: string[]): void {
+    hilog.info(this.domain, this.prefix, this.format, args);
+  }
+
+  warn(...args: string[]): void {
+    hilog.warn(this.domain, this.prefix, this.format, args);
+  }
+
+  error(...args: string[]): void {
+    hilog.error(this.domain, this.prefix, this.format, args);
+  }
+}
+
+export default new Logger('Picker', 0xFF00, false)

harmony/picker/src/main/ets/Magic.ts

@@ -0,0 +1,67 @@
+export interface initOptions {
+  pickerData: string[] | string[][] | ResultItem[] | undefined,
+  onPickerConfirm: (event: string) => string,
+  onPickerCancel: () => void,
+  onPickerSelect: () => void,
+  selectedValue: string | string[] | undefined,
+  pickerCancelBtnText: string,
+  isLoop: boolean,
+  pickerTextEllipsisLen: number,
+  pickerConfirmBtnText: string,
+  pickerConfirmBtnColor: Array<number>,
+  pickerTitleText: string,
+  pickerCancelBtnColor: Array<number>,
+  pickerTitleColor: Array<number>,
+  pickerToolBarBg: Array<number>,
+  pickerBg: Array<number>,
+  pickerToolBarFontSize: number,
+  wheelFlex: Array<number>,
+  pickerFontSize: number,
+  pickerFontColor: Array<number>,
+  pickerFontFamily: string,
+  pickerRowHeight: number,
+}
+
+export interface PickerTextStyle {
+  color: string,
+  font: FontStyle
+}
+
+export interface FontStyle {
+  size: number;
+}
+
+export interface GlobalDialogParam {
+  content: string;
+}
+
+export interface ResultItem {
+  text: string;
+  children: ResultItem[];
+}
+
+export const SELECTED: number = 1.1;
+
+export const SIXTEEN: number = 16;
+
+export const TWO: number = 2;
+
+export const FIVE_PERCENT: string = '5%';
+
+export const HUNDRED_PERCENT: string = '100%';
+
+export const TWENTY_PERCENT: string = '20%';
+
+export const THIRTY_PERCENT: string = '30%';
+
+export const EVENT: string = 'pickerEvent';
+
+export const CONFIRM: string = 'confirm';
+
+export const CANCEL: string = 'cancel';
+
+export const SELECT: string = 'select';
+
+export const FALSE: boolean = false;
+
+export const TRUE: boolean = true;