phiz-bak
/
mop-flutter-sdk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat：迁移日志锚点至新日志系统；

master
yangbinqiao 2023-04-17 14:32:58 +08:00
parent e8da56b290
commit 3d7ceb51f5
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@ -91,6 +91,6 @@ kapt {
} }
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.finogeeks.lib:finapplet:2.40.3' implementation 'com.finogeeks.lib:finapplet:2.40.4-dev20230417v01'
implementation 'com.finogeeks.mop:plugins:2.40.3' implementation 'com.finogeeks.mop:plugins:2.40.4-dev20230417v01'
} }

24
android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java
View File

@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
import com.finogeeks.lib.applet.client.FinAppProcessClient; import com.finogeeks.lib.applet.client.FinAppProcessClient;
import com.finogeeks.lib.applet.client.FinAppClient; import com.finogeeks.lib.applet.client.FinAppClient;
import com.finogeeks.lib.applet.client.FinAppTrace; import com.finogeeks.lib.applet.modules.log.FLog;
import com.finogeeks.lib.applet.interfaces.FinCallback; import com.finogeeks.lib.applet.interfaces.FinCallback;
import com.finogeeks.lib.applet.page.view.moremenu.MoreMenuItem; import com.finogeeks.lib.applet.page.view.moremenu.MoreMenuItem;
import com.finogeeks.lib.applet.page.view.moremenu.MoreMenuType; import com.finogeeks.lib.applet.page.view.moremenu.MoreMenuType;
@ -58,7 +58,7 @@ public class AppletHandlerModule extends BaseApi {
public void invoke(String event, Map param, ICallback callback) { public void invoke(String event, Map param, ICallback callback) {
if ("getPhoneNumberResult".equals(event)) { if ("getPhoneNumberResult".equals(event)) {
FinAppTrace.d("AppletHandlerModule", "getPhoneNumberResult"); FLog.d("AppletHandlerModule", "getPhoneNumberResult");
getPhoneNumberResult(event, param, callback); getPhoneNumberResult(event, param, callback);
return; return;
} }
@ -203,13 +203,13 @@ public class AppletHandlerModule extends BaseApi {
@Override @Override
public void error(String errorCode, String errorMessage, Object errorDetails) { public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(TAG, "getCustomMenus errorCode : " + errorCode + " errorMessage : " + errorMessage); FLog.e(TAG, "getCustomMenus errorCode : " + errorCode + " errorMessage : " + errorMessage);
latch.countDown(); latch.countDown();
} }
@Override @Override
public void notImplemented() { public void notImplemented() {
FinAppTrace.d(TAG, "getCustomMenus notImplemented"); FLog.d(TAG, "getCustomMenus notImplemented");
latch.countDown(); latch.countDown();
} }
}); });
@ -219,7 +219,7 @@ public class AppletHandlerModule extends BaseApi {
} catch (InterruptedException e) { } catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
} }
FinAppTrace.d(TAG, "getRegisteredMoreMenuItems moreMenuItems : " + moreMenuItems + " size : " + moreMenuItems.size()); FLog.d(TAG, "getRegisteredMoreMenuItems moreMenuItems : " + moreMenuItems + " size : " + moreMenuItems.size());
return moreMenuItems; return moreMenuItems;
} }
@ -234,19 +234,19 @@ public class AppletHandlerModule extends BaseApi {
channel.invokeMethod("extensionApi:onCustomMenuClick", params, new MethodChannel.Result() { channel.invokeMethod("extensionApi:onCustomMenuClick", params, new MethodChannel.Result() {
@Override @Override
public void success(Object result) { public void success(Object result) {
FinAppTrace.d(TAG, "onCustomMenuClick success"); FLog.d(TAG, "onCustomMenuClick success");
iAppletCallback.onSuccess(null); iAppletCallback.onSuccess(null);
} }
@Override @Override
public void error(String errorCode, String errorMessage, Object errorDetails) { public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(TAG, "onCustomMenuClick errorCode : " + errorCode + " errorMessage : " + errorMessage); FLog.e(TAG, "onCustomMenuClick errorCode : " + errorCode + " errorMessage : " + errorMessage);
iAppletCallback.onFailure(); iAppletCallback.onFailure();
} }
@Override @Override
public void notImplemented() { public void notImplemented() {
FinAppTrace.d(TAG, "onCustomMenuClick notImplemented"); FLog.d(TAG, "onCustomMenuClick notImplemented");
iAppletCallback.onFailure(); iAppletCallback.onFailure();
} }
}); });
@ -303,20 +303,20 @@ public class AppletHandlerModule extends BaseApi {
channel.invokeMethod("extensionApi:getPhoneNumber", params, new MethodChannel.Result() { channel.invokeMethod("extensionApi:getPhoneNumber", params, new MethodChannel.Result() {
@Override @Override
public void success(Object result) { public void success(Object result) {
FinAppTrace.d(TAG, "onCustomMenuClick success"); FLog.d(TAG, "onCustomMenuClick success");
// callback.onSuccess(null); // callback.onSuccess(null);
phoneNumberCallback = callback; phoneNumberCallback = callback;
} }
@Override @Override
public void error(String errorCode, String errorMessage, Object errorDetails) { public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(TAG, "onCustomMenuClick errorCode : " + errorCode + " errorMessage : " + errorMessage); FLog.e(TAG, "onCustomMenuClick errorCode : " + errorCode + " errorMessage : " + errorMessage);
callback.onFailure(); callback.onFailure();
} }
@Override @Override
public void notImplemented() { public void notImplemented() {
FinAppTrace.d(TAG, "onCustomMenuClick notImplemented"); FLog.d(TAG, "onCustomMenuClick notImplemented");
callback.onFailure(); callback.onFailure();
} }
}); });
@ -368,7 +368,7 @@ public class AppletHandlerModule extends BaseApi {
} }
private void getPhoneNumberResult(String event, Map param, ICallback callback) { private void getPhoneNumberResult(String event, Map param, ICallback callback) {
FinAppTrace.d("AppletHandlerModule", "getPhoneNumberResult,param:" + param.toString()); FLog.d("AppletHandlerModule", "getPhoneNumberResult,param:" + param.toString());
callback.onSuccess(null); callback.onSuccess(null);
if (phoneNumberCallback != null) { if (phoneNumberCallback != null) {
try { try {

10
android/src/main/java/com/finogeeks/mop/api/mop/ExtensionApiModule.java
View File

@ -6,7 +6,7 @@ import android.os.Looper;
import android.util.Log; import android.util.Log;
import com.finogeeks.lib.applet.client.FinAppClient; import com.finogeeks.lib.applet.client.FinAppClient;
import com.finogeeks.lib.applet.client.FinAppTrace; import com.finogeeks.lib.applet.modules.log.FLog;
import com.finogeeks.mop.api.BaseApi; import com.finogeeks.mop.api.BaseApi;
import com.finogeeks.mop.interfaces.ICallback; import com.finogeeks.mop.interfaces.ICallback;
import com.finogeeks.mop.service.MopPluginService; import com.finogeeks.mop.service.MopPluginService;
@ -57,7 +57,7 @@ public class ExtensionApiModule extends BaseApi {
@Override @Override
public void success(Object result) { public void success(Object result) {
String json = GsonUtil.gson.toJson(result); String json = GsonUtil.gson.toJson(result);
FinAppTrace.d(ExtensionApiModule.TAG, "channel invokeMethod:" + name FLog.d(ExtensionApiModule.TAG, "channel invokeMethod:" + name
+ " success, result=" + result + ", json=" + json); + " success, result=" + result + ", json=" + json);
JSONObject ret = null; JSONObject ret = null;
if (json != null && !json.equals("null")) { if (json != null && !json.equals("null")) {
@ -80,7 +80,7 @@ public class ExtensionApiModule extends BaseApi {
@Override @Override
public void error(String errorCode, String errorMessage, Object errorDetails) { public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(ExtensionApiModule.TAG, "channel invokeMethod:" + name FLog.e(ExtensionApiModule.TAG, "channel invokeMethod:" + name
+ " error, errorCode=" + errorCode + " error, errorCode=" + errorCode
+ ", errorMessage=" + errorMessage + ", errorMessage=" + errorMessage
+ ", errorDetails=" + errorDetails); + ", errorDetails=" + errorDetails);
@ -114,7 +114,7 @@ public class ExtensionApiModule extends BaseApi {
@Override @Override
public void success(Object result) { public void success(Object result) {
String json = GsonUtil.gson.toJson(result); String json = GsonUtil.gson.toJson(result);
FinAppTrace.d(ExtensionApiModule.TAG, "channel invokeMethod:" + name FLog.d(ExtensionApiModule.TAG, "channel invokeMethod:" + name
+ " success, result=" + result + ", json=" + json); + " success, result=" + result + ", json=" + json);
JSONObject ret = null; JSONObject ret = null;
if (json != null && !json.equals("null")) { if (json != null && !json.equals("null")) {
@ -137,7 +137,7 @@ public class ExtensionApiModule extends BaseApi {
@Override @Override
public void error(String errorCode, String errorMessage, Object errorDetails) { public void error(String errorCode, String errorMessage, Object errorDetails) {
FinAppTrace.e(ExtensionApiModule.TAG, "channel invokeMethod:" + name FLog.e(ExtensionApiModule.TAG, "channel invokeMethod:" + name
+ " error, errorCode=" + errorCode + " error, errorCode=" + errorCode
+ ", errorMessage=" + errorMessage + ", errorMessage=" + errorMessage
+ ", errorDetails=" + errorDetails); + ", errorDetails=" + errorDetails);