Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(android): dimensions api compatibility with lower version #3606

Merged
merged 2 commits into from
Nov 16, 2023
Merged

fix(android): dimensions api compatibility with lower version #3606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e2a12
fix(android): dimensions api compatibility with lower version
iPel Nov 15, 2023
78e4c87
Merge branch 'main' into dp_dimension
open-hippy Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions framework/android/src/main/java/com/tencent/mtt/hippy/HippyEngineManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,7 @@ public void updateDimension(int width, int height, boolean shouldUseScreenDispla
systemUiVisibilityChanged);
}
}
DimensionsUtil.convertDimensionsToDp(dimensionMap);
if (mEngineContext.getModuleManager() != null) {
mEngineContext.getModuleManager().getJavaScriptModule(Dimensions.class)
.set(dimensionMap);
Expand Down
2 changes: 1 addition & 1 deletion framework/android/src/main/java/com/tencent/mtt/hippy/bridge/HippyBridgeManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.openhippy.connector.JsDriver.V8InitParams;
import com.openhippy.connector.NativeCallback;
import com.openhippy.framework.BuildConfig;
import com.tencent.mtt.hippy.HippyEngine;
import com.tencent.mtt.hippy.HippyEngine.ModuleLoadStatus;
import com.tencent.mtt.hippy.HippyEngineContext;
import com.tencent.mtt.hippy.adapter.thirdparty.HippyThirdPartyAdapter;
Expand Down Expand Up @@ -508,6 +507,7 @@ String getGlobalConfigs() {
.reviseDimensionIfNeed(context, dimensionMap, false,
false);
}
DimensionsUtil.convertDimensionsToDp(dimensionMap);
globalParams.pushMap("Dimensions", dimensionMap);

String packageName = "";
Expand Down
52 changes: 36 additions & 16 deletions modules/android/hippy_support/src/main/java/com/tencent/mtt/hippy/utils/DimensionsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,43 +184,63 @@ public static HippyMap getDimensions(int ww, int wh, Context context,

// construct param
HippyMap dimensionMap = new HippyMap();
getStatusBarHeight();
int statusBarHeight = getStatusBarHeight();
int navigationBarHeight = getNavigationBarHeight(context);
int statusBarHeight =
STATUS_BAR_HEIGHT > 0 ? Math.round(PixelUtil.px2dp(STATUS_BAR_HEIGHT)) : -1;
float windowWidth = (ww >= 0) ? PixelUtil.px2dp(ww) : ww;
float windowHeight = (wh >= 0) ? PixelUtil.px2dp(wh) : wh;
float screenDisplayWidth = PixelUtil.px2dp(screenDisplayMetrics.widthPixels);
float screenDisplayHeight = PixelUtil.px2dp(screenDisplayMetrics.heightPixels);
float windowDisplayWidth = PixelUtil.px2dp(windowDisplayMetrics.widthPixels);
float windowDisplayHeight = PixelUtil.px2dp(windowDisplayMetrics.heightPixels);
navigationBarHeight = Math.round(PixelUtil.px2dp(navigationBarHeight));

HippyMap windowDisplayMetricsMap = new HippyMap();
if (shouldUseScreenDisplay) {
windowDisplayMetricsMap.pushDouble("width", windowWidth >= 0.0f ? windowWidth : screenDisplayWidth);
windowDisplayMetricsMap.pushDouble("height", windowHeight >= 0.0f ? windowHeight : screenDisplayHeight);
windowDisplayMetricsMap.pushDouble("width", ww >= 0 ? ww : screenDisplayMetrics.widthPixels);
windowDisplayMetricsMap.pushDouble("height", wh >= 0 ? wh : screenDisplayMetrics.heightPixels);
windowDisplayMetricsMap.pushDouble("scale", screenDisplayMetrics.density);
windowDisplayMetricsMap.pushDouble("fontScale", screenDisplayMetrics.scaledDensity);
windowDisplayMetricsMap.pushDouble("densityDpi", screenDisplayMetrics.densityDpi);
} else {
windowDisplayMetricsMap.pushDouble("width", windowWidth >= 0.0f ? windowWidth : windowDisplayWidth);
windowDisplayMetricsMap.pushDouble("height", windowHeight >= 0.0f ? windowHeight : windowDisplayHeight);
windowDisplayMetricsMap.pushDouble("width", ww >= 0 ? ww : windowDisplayMetrics.widthPixels);
windowDisplayMetricsMap.pushDouble("height", wh >= 0 ? wh : windowDisplayMetrics.heightPixels);
windowDisplayMetricsMap.pushDouble("scale", windowDisplayMetrics.density);
windowDisplayMetricsMap.pushDouble("fontScale", windowDisplayMetrics.scaledDensity);
windowDisplayMetricsMap.pushDouble("densityDpi", windowDisplayMetrics.densityDpi);
}
windowDisplayMetricsMap.pushDouble("statusBarHeight", statusBarHeight);
windowDisplayMetricsMap.pushDouble("navigationBarHeight", navigationBarHeight);
dimensionMap.pushMap("windowPhysicalPixels", windowDisplayMetricsMap);

HippyMap screenDisplayMetricsMap = new HippyMap();
screenDisplayMetricsMap.pushDouble("width", screenDisplayWidth);
screenDisplayMetricsMap.pushDouble("height", screenDisplayHeight);
screenDisplayMetricsMap.pushDouble("width", screenDisplayMetrics.widthPixels);
screenDisplayMetricsMap.pushDouble("height", screenDisplayMetrics.heightPixels);
screenDisplayMetricsMap.pushDouble("scale", screenDisplayMetrics.density);
screenDisplayMetricsMap.pushDouble("fontScale", screenDisplayMetrics.scaledDensity);
screenDisplayMetricsMap.pushDouble("densityDpi", screenDisplayMetrics.densityDpi);
screenDisplayMetricsMap.pushDouble("statusBarHeight", statusBarHeight);
screenDisplayMetricsMap.pushDouble("navigationBarHeight", navigationBarHeight);
dimensionMap.pushMap("screenPhysicalPixels", screenDisplayMetricsMap);

return dimensionMap;
}

public static void convertDimensionsToDp(HippyMap dimensionMap) {
if (dimensionMap != null) {
convertPhysicalPixelsToDp(dimensionMap.getMap("windowPhysicalPixels"));
convertPhysicalPixelsToDp(dimensionMap.getMap("screenPhysicalPixels"));
}
}

private static void convertPhysicalPixelsToDp(HippyMap map) {
if (map != null) {
double scale = map.getDouble("scale");
assert scale != 0;
divideByScale(map, "width", scale);
divideByScale(map, "height", scale);
divideByScale(map, "statusBarHeight", scale);
divideByScale(map, "navigationBarHeight", scale);
}
}

private static void divideByScale(HippyMap map, String key, double scale) {
double value = map.getDouble(key);
if (value > 0) {
map.pushDouble(key, value / scale);
}
}

}
Loading