diff --git a/commons/basic/obfuscation-rules.txt b/commons/basic/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/commons/basic/obfuscation-rules.txt +++ b/commons/basic/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/fund/obfuscation-rules.txt b/features/fund/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/fund/obfuscation-rules.txt +++ b/features/fund/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/fund/oh-package.json5 b/features/fund/oh-package.json5 index 317afbd47f17dad18b8982363a3949eb6cf76001..7e2de41fd8cc9050ee29a7c7fdecce285811c29a 100644 --- a/features/fund/oh-package.json5 +++ b/features/fund/oh-package.json5 @@ -12,6 +12,6 @@ "@ohos/transaction": "file:../transaction", "@ohos/fundComparison": "file:../fundComparison", "@ohos/basic": "file:../../commons/basic", - "@ohos/mpchart": "3.0.0-rc.1" + "@ohos/mpchart": "^3.0.0-rc.1" } } diff --git a/features/fundComparison/obfuscation-rules.txt b/features/fundComparison/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/fundComparison/obfuscation-rules.txt +++ b/features/fundComparison/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/fundComparison/src/main/ets/view/ComparisonDetailComponent.ets b/features/fundComparison/src/main/ets/view/ComparisonDetailComponent.ets index c341be8f1439dd314b03b671211bbb4ced440c61..fbcc3947771aa4fe232a9236c00a14acefcc5290 100644 --- a/features/fundComparison/src/main/ets/view/ComparisonDetailComponent.ets +++ b/features/fundComparison/src/main/ets/view/ComparisonDetailComponent.ets @@ -155,7 +155,7 @@ export struct ComparisonDetailComponent { .scrollBar(BarState.Off) .listDirection(Axis.Horizontal) .edgeEffect(EdgeEffect.None) - .onScroll((scrollOffset: number) => { + .onWillScroll((_scrollOffset: number) => { if (this.isScroll) { let offset = this.scrollerList.currentOffset().xOffset; this.scroller.scrollTo({ xOffset: offset, yOffset: 0 }); @@ -290,7 +290,7 @@ export struct ComparisonDetailComponent { .scrollable(ScrollDirection.Horizontal) .scrollBar(BarState.Off) .edgeEffect(EdgeEffect.None) - .onScroll((scrollOffset: number) => { + .onWillScroll((_scrollOffset: number) => { if (this.isListScroll) { let offset = this.scroller.currentOffset().xOffset; this.scrollerList.scrollTo({ xOffset: offset, yOffset: 0 }); diff --git a/features/home/obfuscation-rules.txt b/features/home/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/home/obfuscation-rules.txt +++ b/features/home/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/transaction/obfuscation-rules.txt b/features/transaction/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/transaction/obfuscation-rules.txt +++ b/features/transaction/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/product/phone/obfuscation-rules.txt b/product/phone/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/product/phone/obfuscation-rules.txt +++ b/product/phone/obfuscation-rules.txt @@ -15,4 +15,8 @@ # 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 \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file