Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

WEEX][Weex-Android] Add Build Model For MateX And Galaxy Fopld #2453

Merged
merged 8 commits into from
May 17, 2019
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
import com.taobao.weex.ui.flat.FlatGUIContext;
import com.taobao.weex.ui.view.WXScrollView;
import com.taobao.weex.utils.Trace;
import com.taobao.weex.utils.WXDeviceUtils;
import com.taobao.weex.utils.WXExceptionUtils;
import com.taobao.weex.utils.WXFileUtils;
import com.taobao.weex.utils.WXJsonUtils;
Expand Down Expand Up @@ -738,7 +739,7 @@ private void renderInternal(String pageName,
mApmForInstance.addStats(WXInstanceApm.KEY_PAGE_STATS_BUNDLE_SIZE,mWXPerformance.JSTemplateSize);
mRenderStartTime = System.currentTimeMillis();
WXSDKManager.getInstance().setCrashInfo(WXEnvironment.WEEX_CURRENT_KEY,pageName);;
if(mAutoAdjustDeviceWidth){
if(mAutoAdjustDeviceWidth && WXDeviceUtils.isAutoResize(mContext)){
if(WXEnvironment.AUTO_UPDATE_APPLICATION_SCREEN_SIZE) {
WXViewUtils.updateApplicationScreen(mContext);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.taobao.weex.utils;

import android.content.Context;
import android.os.Build;

public class WXDeviceUtils {


public static boolean isAutoResize(Context context){
return isMateX(context) || isGalaxyFold(context);
}

/**
* Mate X
* */
public static boolean isMateX(Context context) {
return "HUAWEI".equalsIgnoreCase(Build.BRAND) && ("unknownRLI".equalsIgnoreCase(Build.DEVICE) || ("HWTAH".equalsIgnoreCase(Build.DEVICE)));
}


/**
* Galaxy Fopld
* */
public static boolean isGalaxyFold(Context context) {

if("samsung".equalsIgnoreCase(Build.BRAND) && "SM-F9000".equalsIgnoreCase(Build.MODEL)) {
return true;
}

return false;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ int ScriptSideInQueue::UpdateInitFrameworkParams(const std::string& key, const s
LOGD("ScriptSideInQueue::UpdateInitFrameworkParams");
weexTaskQueue_->addTask(new UpdateInitFrameworkParamsTask(key, value, desc));
if (WeexEnv::getEnv()->enableBackupThread()) {
UpdateInitFrameworkParamsTask* task = new UpdateInitFrameworkParamsTask(key, value, desc)
UpdateInitFrameworkParamsTask* task = new UpdateInitFrameworkParamsTask(key, value, desc);
if(WeexEnv::getEnv()->can_m_cache_task_() && weexTaskQueue_bk_ == nullptr){
WeexEnv::getEnv()->m_task_cache_.push_back(task);
} else {
Expand Down