tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: add onEnvChanged

Browse Source
This commit is contained in:
pengfei.zhou
2021-07-07 12:44:40 +08:00
committed by osborn
parent 70bde4fba9
commit 0c10b513b9
13 changed files with 109 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doric-android/doric/src/main/java/pub/doric/DoricContext.java
View File

@@ -288,4 +288,8 @@ public class DoricContext {
}
}
}
public void onEnvChanged() {
callEntity(DoricConstant.DORIC_ENTITY_ENV_CHANGE);
}
}

18
doric-android/doric/src/main/java/pub/doric/DoricRegistry.java
View File

@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import pub.doric.engine.DoricJSEngine;
import pub.doric.plugin.AnimatePlugin;
import pub.doric.plugin.CoordinatorPlugin;
import pub.doric.plugin.DoricJavaPlugin;
@@ -72,8 +73,6 @@ public class DoricRegistry {
private static final Map<String, String> bundles = new ConcurrentHashMap<>();
private static final Set<DoricLibrary> doricLibraries = new HashSet<>();
private static final List<WeakReference<DoricRegistry>> registries = new ArrayList<>();
private final Map<String, Object> extendedEnvValues = new HashMap<>();
private final Map<String, DoricMetaInfo<DoricJavaPlugin>> pluginInfoMap = new HashMap<>();
private final Map<String, DoricMetaInfo<ViewNode>> nodeInfoMap = new HashMap<>();
@@ -99,7 +98,10 @@ public class DoricRegistry {
}
}
public DoricRegistry() {
private final WeakReference<DoricJSEngine> doricJSEngineWeakReference;
public DoricRegistry(DoricJSEngine doricJSEngine) {
doricJSEngineWeakReference = new WeakReference<>(doricJSEngine);
this.registerNativePlugin(ShaderPlugin.class);
this.registerNativePlugin(ModalPlugin.class);
this.registerNativePlugin(NetworkPlugin.class);
@@ -168,11 +170,11 @@ public class DoricRegistry {
}
public void setEnvironmentVariable(String key, Object val) {
extendedEnvValues.put(key, val);
}
public Map<String, Object> getEnvironmentVariables() {
return extendedEnvValues;
DoricJSEngine doricJSEngine = doricJSEngineWeakReference.get();
if (doricJSEngine == null) {
return;
}
doricJSEngine.setEnvironmentVariable(key, val);
}
public void registerMonitor(IDoricMonitor monitor) {

66
doric-android/doric/src/main/java/pub/doric/engine/DoricJSEngine.java
View File

@@ -34,11 +34,12 @@ import com.github.pengfeizhou.jscore.JavaFunction;
import com.github.pengfeizhou.jscore.JavaValue;
import java.util.ArrayList;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import pub.doric.Doric;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.DoricRegistry;
import pub.doric.IDoricMonitor;
import pub.doric.extension.bridge.DoricBridgeExtension;
@@ -59,8 +60,9 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
private final DoricBridgeExtension mDoricBridgeExtension = new DoricBridgeExtension();
protected IDoricJSE mDoricJSE;
private final DoricTimerExtension mTimerExtension;
private final DoricRegistry mDoricRegistry = new DoricRegistry();
private final JSONBuilder mEnvironment = new JSONBuilder();
private final DoricRegistry mDoricRegistry = new DoricRegistry(this);
private final Map<String, Object> mEnvironmentMap = new ConcurrentHashMap<>();
private boolean initialized = false;
public DoricJSEngine() {
handlerThread = new HandlerThread(this.getClass().getSimpleName());
@@ -73,6 +75,7 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
initJSEngine();
injectGlobal();
initDoricRuntime();
initialized = true;
}
});
mTimerExtension = new DoricTimerExtension(looper, this);
@@ -87,6 +90,26 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
mDoricJSE = new DoricNativeJSExecutor();
}
public void setEnvironmentVariable(String key, Object v) {
mEnvironmentMap.put(key, v);
if (initialized) {
final JSONBuilder jsonBuilder = new JSONBuilder();
for (String k : mEnvironmentMap.keySet()) {
jsonBuilder.put(k, mEnvironmentMap.get(k));
}
mJSHandler.post(new Runnable() {
@Override
public void run() {
mDoricJSE.injectGlobalJSObject(DoricConstant.INJECT_ENVIRONMENT,
new JavaValue(jsonBuilder.toJSONObject()));
}
});
for(DoricContext context:DoricContextManager.aliveContexts()){
context.onEnvChanged();
}
}
}
private void injectGlobal() {
String appName = "";
String appVersion = "";
@@ -101,29 +124,26 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
} catch (Exception e) {
e.printStackTrace();
}
mEnvironment
.put("platform", "Android")
.put("platformVersion", String.valueOf(android.os.Build.VERSION.SDK_INT))
.put("appName", appName)
.put("appVersion", appVersion)
.put("screenWidth", DoricUtils.px2dp(DoricUtils.getScreenWidth()))
.put("screenHeight", DoricUtils.px2dp(DoricUtils.getScreenHeight()))
.put("screenScale", DoricUtils.getScreenScale())
.put("statusBarHeight", DoricUtils.px2dp(DoricUtils.getStatusBarHeight()))
.put("hasNotch", false)
.put("deviceBrand", Build.BRAND)
.put("deviceModel", Build.MODEL)
.put("localeLanguage", context.getResources().getConfiguration().locale.getLanguage())
.put("localeCountry", context.getResources().getConfiguration().locale.getCountry());
mEnvironmentMap.put("platform", "Android");
mEnvironmentMap.put("platformVersion", String.valueOf(android.os.Build.VERSION.SDK_INT));
mEnvironmentMap.put("appName", appName);
mEnvironmentMap.put("appVersion", appVersion);
mEnvironmentMap.put("screenWidth", DoricUtils.px2dp(DoricUtils.getScreenWidth()));
mEnvironmentMap.put("screenHeight", DoricUtils.px2dp(DoricUtils.getScreenHeight()));
mEnvironmentMap.put("screenScale", DoricUtils.getScreenScale());
mEnvironmentMap.put("statusBarHeight", DoricUtils.px2dp(DoricUtils.getStatusBarHeight()));
mEnvironmentMap.put("hasNotch", false);
mEnvironmentMap.put("deviceBrand", Build.BRAND);
mEnvironmentMap.put("deviceModel", Build.MODEL);
mEnvironmentMap.put("localeLanguage", context.getResources().getConfiguration().locale.getLanguage());
mEnvironmentMap.put("localeCountry", context.getResources().getConfiguration().locale.getCountry());
Map<String, Object> extend = mDoricRegistry.getEnvironmentVariables();
for (String key : extend.keySet()) {
mEnvironment.put(key, extend.get(key));
JSONBuilder jsonBuilder = new JSONBuilder();
for (String key : mEnvironmentMap.keySet()) {
jsonBuilder.put(key, mEnvironmentMap.get(key));
}
mDoricJSE.injectGlobalJSObject(DoricConstant.INJECT_ENVIRONMENT,
new JavaValue(mEnvironment.toJSONObject()));
new JavaValue(jsonBuilder.toJSONObject()));
mDoricJSE.injectGlobalJSFunction(DoricConstant.INJECT_LOG, new JavaFunction() {
@Override
public JavaValue exec(JSDecoder[] args) {

1
doric-android/doric/src/main/java/pub/doric/utils/DoricConstant.java
View File

@@ -73,4 +73,5 @@ public class DoricConstant {
public static final String DORIC_ENTITY_SHOW = "__onShow__";
public static final String DORIC_ENTITY_HIDDEN = "__onHidden__";
public static final String DORIC_ENTITY_BUILD = "__build__";
public static final String DORIC_ENTITY_ENV_CHANGE = "__onEnvChanged__";
}