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

iOS:Support debugging

Browse Source
This commit is contained in:
pengfeizhou
2021-02-22 19:03:34 +08:00
committed by osborn
parent 5ca650c9cb
commit 9db60d94ba
26 changed files with 461 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
doric-android/devkit/src/main/AndroidManifest.xml
View File

@@ -1,12 +1,15 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="pub.doric.devkit">
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<application>
<activity android:name=".ui.DoricDevActivity" />
<activity android:name=".qrcode.activity.CaptureActivity"/>
<activity
android:name=".ui.DoricDevActivity"
android:exported="true" />
<activity android:name=".qrcode.activity.CaptureActivity" />
</application>
</manifest>

2
doric-android/devkit/src/main/java/pub/doric/devkit/IDevKit.java
View File

@@ -6,7 +6,7 @@ import org.json.JSONObject;
public interface IDevKit {
enum Command {
HOT_RELOAD, EXCEPTION, LOG
HOT_RELOAD, EXCEPTION, LOG, DEBUG
}
void connectDevKit(String url);

2
doric-android/devkit/src/main/java/pub/doric/devkit/WSClient.java
View File

@@ -49,7 +49,7 @@ public class WSClient extends WebSocketListener {
boolean intercept(String type, String command, JSONObject payload) throws JSONException;
}
private Set<Interceptor> interceptors = new HashSet<>();
private final Set<Interceptor> interceptors = new HashSet<>();
public WSClient(String url) {
OkHttpClient okHttpClient = new OkHttpClient

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

@@ -17,6 +17,8 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import com.github.pengfeizhou.jscore.JSONBuilder;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -25,6 +27,7 @@ import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
import pub.doric.devkit.DevKit;
import pub.doric.devkit.DoricDev;
import pub.doric.devkit.IDevKit;
import pub.doric.devkit.R;
import pub.doric.devkit.event.ConnectExceptionEvent;
import pub.doric.devkit.event.EOFExceptionEvent;
@@ -150,7 +153,11 @@ public class DoricDevActivity extends AppCompatActivity {
cell.findViewById(R.id.debug_text_view).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
DevKit.getInstance().sendDevCommand(
IDevKit.Command.DEBUG,
new JSONBuilder()
.put("source", doricContext.getSource())
.toJSONObject());
}
});