fix(ohos): adapt for pad density change condition

Author: etkmao

framework/ohos/src/main/cpp/impl/renderer/native/src/text_measure/text_measurer.cc

@@ -582,8 +582,8 @@ OhMeasureResult TextMeasurer::EndMeasure(int width, int widthMode, int height, i
 
   OH_Drawing_TypographyLayout(typography_, maxWidth);
 
-  // MATE 60, beta5, "新品" "商店" text cannot be fully displayed. So add 0.5.
-  ret.width = ceil(OH_Drawing_TypographyGetLongestLine(typography_) + paddingWidthReduce + 0.5 * density);
+  // MATE 60, beta5, "新品" "商店" text cannot be fully displayed. So add 0.5+.
+  ret.width = ceil(OH_Drawing_TypographyGetLongestLine(typography_) + paddingWidthReduce + 0.9 * density);
   double drawResultHeight = OH_Drawing_TypographyGetHeight(typography_);
   ret.height = drawResultHeight;
   ret.isEllipsized = OH_Drawing_TypographyDidExceedMaxLines(typography_);

framework/ohos/src/main/ets/hippy_framework/HippyEngine.ets

@@ -18,6 +18,7 @@
  * limitations under the License.
  */
 import { HippyLibrary } from '../hippy_library/HippyLibrary';
+import { PixelUtil } from "../support/utils/PixelUtil";
 import { NativeRenderContext } from '../renderer_native/NativeRenderContext';
 import { NativeRenderProvider } from '../renderer_native/NativeRenderProvider';
 import { HippyAny, HippyMap } from '../support/common/HippyTypes';
@@ -93,6 +94,7 @@ export interface HippyEngine {
 
 export function createHippyEngine(params: EngineInitParams): HippyEngine {
   params.check()
+  PixelUtil.doInitDensity()
   LogUtils.enableDebugLog(params.enableLog)
   params.libHippy?.Setting_SetFlags(params.enableUpdateAnimLog);
   return new HippyEngineManagerImpl(params)

framework/ohos/src/main/ets/hippy_framework/HippyEngineManagerImpl.ets

@@ -492,6 +492,8 @@ export class HippyEngineManagerImpl implements HippyEngine, FrameworkProxy, DevS
   }
 
   onSizeChanged(rootId: number, w: number, h: number, ow: number, oh: number): void {
+    // pad上切换悬浮窗时，size改变，density改变
+    PixelUtil.updateDensity(this.libHippy)
     if (this.mEngineContext) {
       let manager = this.mEngineContext.getModuleManager();
       if (manager) {

framework/ohos/src/main/ets/support/utils/PixelUtil.ets

@@ -77,9 +77,21 @@ export class PixelUtil {
     }
   }
 
+  // density要在业务加载hippy，触发调用该方法时再获取；
+  // 不要在static时初始化，static在app启动就初始化，这时候业务可能还没加载hippy，
+  // 在pad上悬浮窗后再加载hippy，会使用到错误的density。（pad上悬浮窗后density会变）
+  public static doInitDensity(): void {
+    if (!PixelUtil.densityInitted) {
+      PixelUtil.density = vp2px(1.0) / 1.0
+      PixelUtil.vp2pxValue = vp2px(1.0)
+      PixelUtil.densityInitted = true;
+    }
+  }
+
+  private static densityInitted: boolean = false
   private static densityScale: number = 1.0
-  private static density: number = vp2px(1.0) / 1.0
-  private static vp2pxValue: number = vp2px(1.0)
+  private static density: number = 1.0
+  private static vp2pxValue: number = 1.0
   private static fontSizeScale: number = 1.0
   private static fontWeightScale: number = 1.0
 }