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

Fix when print log string which contains special control characters in doric,cause native crash

Browse Source
This commit is contained in:
pengfei.zhou
2023-02-09 14:06:47 +08:00
committed by jingpeng
parent 54ecddf994
commit fc4628dde9
27 changed files with 895 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import java.io.StringWriter;
import pub.doric.DoricContext;
import pub.doric.IDoricMonitor;
import pub.doric.utils.DoricLog;
/**
* @Description: pub.doric.devkit
@@ -55,15 +54,12 @@ public class DoricDevMonitor implements IDoricMonitor {
String typeString = "DEFAULT";
switch (type) {
case Log.ERROR:
DoricLog.suffix_e("_js", message);
typeString = "ERROR";
break;
case Log.WARN:
DoricLog.suffix_w("_js", message);
typeString = "WARN";
break;
default:
DoricLog.suffix_d("_js", message);
break;
}
DoricDev.getInstance().sendDevCommand(

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

@@ -26,8 +26,6 @@ import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.Nullable;
import com.github.pengfeizhou.jscore.JSDecoder;
import com.github.pengfeizhou.jscore.JSONBuilder;
import com.github.pengfeizhou.jscore.JavaFunction;
@@ -39,6 +37,7 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import androidx.annotation.Nullable;
import pub.doric.Doric;
import pub.doric.DoricContext;
import pub.doric.DoricContextManager;
@@ -343,13 +342,13 @@ public class DoricJSEngine implements Handler.Callback, DoricTimerExtension.Time
public void onLog(int type, String message) {
switch (type) {
case Log.ERROR:
DoricLog.suffix_e("_js", "%s", message);
DoricLog.suffix_e("_js", message);
break;
case Log.WARN:
DoricLog.suffix_w("_js", "%s", message);
DoricLog.suffix_w("_js", message);
break;
default:
DoricLog.suffix_d("_js", "%s", message);
DoricLog.suffix_d("_js", message);
break;
}
}

5
doric-android/doric/src/main/java/pub/doric/utils/DoricLog.java
View File

@@ -59,6 +59,9 @@ public class DoricLog {
}
private static String format(String message, Object... args) {
return String.format(message, args);
if (args.length > 0) {
return String.format(message, args);
}
return message;
}
}