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

refact: use DoricSingleton to hold all static or singleton objects

Browse Source
This commit is contained in:
pengfei.zhou
2021-07-21 17:56:03 +08:00
committed by osborn
parent 7d4d6713c6
commit 61c262bcc6
30 changed files with 320 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doric-android/devkit/src/main/java/pub/doric/devkit/DoricDev.java
View File

@@ -19,6 +19,7 @@ import pub.doric.Doric;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.DoricNativeDriver;
import pub.doric.DoricSingleton;
import pub.doric.devkit.ui.DoricDevActivity;
import pub.doric.devkit.util.SimulatorUtil;
import pub.doric.performance.DoricPerformanceProfile;
@@ -51,8 +52,8 @@ public class DoricDev {
private DoricDev() {
this.isRunningInEmulator = SimulatorUtil.isSimulator(Doric.application());
DoricNativeDriver.getInstance().getRegistry().registerMonitor(new DoricDevMonitor());
DoricNativeDriver.getInstance().getRegistry().setGlobalPerformanceAnchorHook(new DoricDevPerformanceAnchorHook());
DoricSingleton.getInstance().getNativeDriver().getRegistry().registerMonitor(new DoricDevMonitor());
DoricSingleton.getInstance().getNativeDriver().getRegistry().setGlobalPerformanceAnchorHook(new DoricDevPerformanceAnchorHook());
}
public static DoricDev getInstance() {

14
doric-android/devkit/src/main/java/pub/doric/devkit/ui/DoricDevActivity.java
View File

@@ -54,9 +54,9 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import pub.doric.Doric;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.DoricRegistry;
import pub.doric.devkit.DoricDebugDriver;
import pub.doric.devkit.DoricDev;
import pub.doric.devkit.R;
@@ -209,21 +209,21 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
}
});
SwitchCompat snapshotSwitch = findViewById(R.id.switch_snapshot);
snapshotSwitch.setChecked(DoricRegistry.isEnableRenderSnapshot());
snapshotSwitch.setChecked(Doric.isEnableRenderSnapshot());
snapshotSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
DoricRegistry.enableRenderSnapshot(isChecked);
Doric.enableRenderSnapshot(isChecked);
}
});
setSwitch(snapshotSwitch);
SwitchCompat profileSwitch = findViewById(R.id.switch_profile);
profileSwitch.setChecked(DoricRegistry.isEnablePerformance());
profileSwitch.setChecked(Doric.isEnablePerformance());
profileSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
DoricRegistry.enablePerformance(isChecked);
Doric.enablePerformance(isChecked);
}
});
setSwitch(profileSwitch);
@@ -396,7 +396,7 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
});
}
}
if (DoricRegistry.isEnableRenderSnapshot()) {
if (Doric.isEnableRenderSnapshot()) {
actionMap.put("Snapshot", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@@ -410,7 +410,7 @@ public class DoricDevActivity extends AppCompatActivity implements DoricDev.Stat
}
});
}
if (DoricRegistry.isEnablePerformance()) {
if (Doric.isEnablePerformance()) {
actionMap.put("Performance", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {