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

refact:change field name from scheme to source

Browse Source
This commit is contained in:
pengfei.zhou
2020-02-17 21:23:02 +08:00
committed by osborn
parent 9e54ba1ea6
commit 0961cb9fc9
32 changed files with 72 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doric-android/app/src/main/java/pub/doric/demo/MainActivity.java
View File

@@ -106,7 +106,7 @@ public class MainActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
Intent intent = new Intent(tv.getContext(), DemoDebugActivity.class);
intent.putExtra("scheme", "assets://src/" + data[position]);
intent.putExtra("source", "assets://src/" + data[position]);
intent.putExtra("alias", data[position]);
tv.getContext().startActivity(intent);
}

6
doric-android/doric/src/main/java/pub/doric/DoricActivity.java
View File

@@ -33,7 +33,7 @@ public class DoricActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.doric_activity);
if (savedInstanceState == null) {
mDoricFragment = DoricFragment.newInstance(getScheme(), getAlias(), getExtra());
mDoricFragment = DoricFragment.newInstance(getSource(), getAlias(), getExtra());
getSupportFragmentManager().beginTransaction()
.add(R.id.container, mDoricFragment)
.commit();
@@ -43,8 +43,8 @@ public class DoricActivity extends AppCompatActivity {
/**
* @return Scheme for DoricFragment to load.
*/
protected String getScheme() {
return getIntent().getStringExtra("scheme");
protected String getSource() {
return getIntent().getStringExtra("source");
}
/**

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

@@ -35,9 +35,9 @@ import androidx.navigation.Navigation;
*/
public class DoricFragment extends Fragment {
public static DoricFragment newInstance(String scheme, String alias, String extra) {
public static DoricFragment newInstance(String source, String alias, String extra) {
Bundle args = new Bundle();
args.putString("scheme", scheme);
args.putString("source", source);
args.putString("alias", alias);
args.putString("extra", extra);
DoricFragment fragment = new DoricFragment();

8
doric-android/doric/src/main/java/pub/doric/DoricPanelFragment.java
View File

@@ -72,9 +72,9 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
}
@Override
public void push(String scheme, String alias, String extra) {
public void push(String source, String alias, String extra) {
Bundle argument = new Bundle();
argument.putString("scheme", scheme);
argument.putString("source", source);
argument.putString("alias", alias);
argument.putString("extra", extra);
getNavController()
@@ -170,9 +170,9 @@ public class DoricPanelFragment extends Fragment implements IDoricNavigator {
}
showLoading();
final String alias = argument.getString("alias");
String scheme = argument.getString("scheme");
String source = argument.getString("source");
final String extra = argument.getString("extra");
DoricJSLoaderManager.getInstance().loadJSBundle(scheme).setCallback(new AsyncResult.Callback<String>() {
DoricJSLoaderManager.getInstance().loadJSBundle(source).setCallback(new AsyncResult.Callback<String>() {
@Override
public void onResult(String result) {
doricPanel.config(result, alias, extra);

8
doric-android/doric/src/main/java/pub/doric/loader/DoricAssetJSLoader.java
View File

@@ -30,14 +30,14 @@ import pub.doric.async.AsyncResult;
*/
public class DoricAssetJSLoader implements IDoricJSLoader {
@Override
public boolean filter(String scheme) {
return scheme.startsWith("assets");
public boolean filter(String source) {
return source.startsWith("assets");
}
@Override
public AsyncResult<String> request(String scheme) {
public AsyncResult<String> request(String source) {
AsyncResult<String> result = new AsyncResult<>();
String assetPath = scheme.substring("assets://".length());
String assetPath = source.substring("assets://".length());
InputStream inputStream = null;
try {
AssetManager assetManager = Doric.application().getAssets();

8
doric-android/doric/src/main/java/pub/doric/loader/DoricHttpJSLoader.java
View File

@@ -35,14 +35,14 @@ public class DoricHttpJSLoader implements IDoricJSLoader {
private OkHttpClient okHttpClient = new OkHttpClient();
@Override
public boolean filter(String scheme) {
return scheme.startsWith("http");
public boolean filter(String source) {
return source.startsWith("http");
}
@Override
public AsyncResult<String> request(String scheme) {
public AsyncResult<String> request(String source) {
final AsyncResult<String> ret = new AsyncResult<>();
okHttpClient.newCall(new Request.Builder().url(scheme).build()).enqueue(new Callback() {
okHttpClient.newCall(new Request.Builder().url(source).build()).enqueue(new Callback() {
@Override
public void onFailure(@NonNull Call call, @NonNull IOException e) {
ret.setError(e);

6
doric-android/doric/src/main/java/pub/doric/loader/DoricJSLoaderManager.java
View File

@@ -52,11 +52,11 @@ public class DoricJSLoaderManager {
return Inner.sInstance;
}
public AsyncResult<String> loadJSBundle(String scheme) {
public AsyncResult<String> loadJSBundle(String source) {
Collection<IDoricJSLoader> jsLoaders = getJSLoaders();
for (IDoricJSLoader jsLoader : jsLoaders) {
if (jsLoader.filter(scheme)) {
return jsLoader.request(scheme);
if (jsLoader.filter(source)) {
return jsLoader.request(source);
}
}
return new AsyncResult<>("");

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

@@ -23,7 +23,7 @@ import pub.doric.async.AsyncResult;
* @CreateDate: 2019-11-23
*/
public interface IDoricJSLoader {
boolean filter(String scheme);
boolean filter(String source);
AsyncResult<String> request(String scheme);
AsyncResult<String> request(String source);
}

2
doric-android/doric/src/main/java/pub/doric/navigator/IDoricNavigator.java
View File

@@ -21,7 +21,7 @@ package pub.doric.navigator;
* @CreateDate: 2019-11-23
*/
public interface IDoricNavigator {
void push(String scheme, String alias, String extra);
void push(String source, String alias, String extra);
void pop();
}

6
doric-android/doric/src/main/java/pub/doric/plugin/NavigatorPlugin.java
View File

@@ -46,8 +46,8 @@ public class NavigatorPlugin extends DoricJavaPlugin {
if (navigator != null) {
try {
JSObject jsObject = jsDecoder.decode().asObject();
String scheme = jsObject.getProperty("scheme").asString().value();
String alias = scheme;
String source = jsObject.getProperty("source").asString().value();
String alias = source;
String extra = "";
JSValue config = jsObject.getProperty("config");
if (config.isObject()) {
@@ -60,7 +60,7 @@ public class NavigatorPlugin extends DoricJavaPlugin {
extra = extraJS.asString().value();
}
}
navigator.push(jsObject.getProperty("scheme").asString().value(),
navigator.push(jsObject.getProperty("source").asString().value(),
alias,
extra
);