diff --git a/android/build.gradle b/android/build.gradle index 9c2a4da..b7e2f95 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.40.3' - implementation 'com.finogeeks.mop:plugins:2.40.3' + implementation 'com.finogeeks.lib:finapplet:2.40.4-dev20230417v01' + implementation 'com.finogeeks.mop:plugins:2.40.4-dev20230417v01' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index a19b4db..097b636 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import com.finogeeks.lib.applet.client.FinAppProcessClient; 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.page.view.moremenu.MoreMenuItem; 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) { if ("getPhoneNumberResult".equals(event)) { - FinAppTrace.d("AppletHandlerModule", "getPhoneNumberResult"); + FLog.d("AppletHandlerModule", "getPhoneNumberResult"); getPhoneNumberResult(event, param, callback); return; } @@ -203,13 +203,13 @@ public class AppletHandlerModule extends BaseApi { @Override 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(); } @Override public void notImplemented() { - FinAppTrace.d(TAG, "getCustomMenus notImplemented"); + FLog.d(TAG, "getCustomMenus notImplemented"); latch.countDown(); } }); @@ -219,7 +219,7 @@ public class AppletHandlerModule extends BaseApi { } catch (InterruptedException e) { e.printStackTrace(); } - FinAppTrace.d(TAG, "getRegisteredMoreMenuItems moreMenuItems : " + moreMenuItems + " size : " + moreMenuItems.size()); + FLog.d(TAG, "getRegisteredMoreMenuItems moreMenuItems : " + moreMenuItems + " size : " + moreMenuItems.size()); return moreMenuItems; } @@ -234,19 +234,19 @@ public class AppletHandlerModule extends BaseApi { channel.invokeMethod("extensionApi:onCustomMenuClick", params, new MethodChannel.Result() { @Override public void success(Object result) { - FinAppTrace.d(TAG, "onCustomMenuClick success"); + FLog.d(TAG, "onCustomMenuClick success"); iAppletCallback.onSuccess(null); } @Override 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(); } @Override public void notImplemented() { - FinAppTrace.d(TAG, "onCustomMenuClick notImplemented"); + FLog.d(TAG, "onCustomMenuClick notImplemented"); iAppletCallback.onFailure(); } }); @@ -303,20 +303,20 @@ public class AppletHandlerModule extends BaseApi { channel.invokeMethod("extensionApi:getPhoneNumber", params, new MethodChannel.Result() { @Override public void success(Object result) { - FinAppTrace.d(TAG, "onCustomMenuClick success"); + FLog.d(TAG, "onCustomMenuClick success"); // callback.onSuccess(null); phoneNumberCallback = callback; } @Override 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(); } @Override public void notImplemented() { - FinAppTrace.d(TAG, "onCustomMenuClick notImplemented"); + FLog.d(TAG, "onCustomMenuClick notImplemented"); callback.onFailure(); } }); @@ -368,7 +368,7 @@ public class AppletHandlerModule extends BaseApi { } 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); if (phoneNumberCallback != null) { try { diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/ExtensionApiModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/ExtensionApiModule.java index 3e07c59..6f8bac6 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/ExtensionApiModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/ExtensionApiModule.java @@ -6,7 +6,7 @@ import android.os.Looper; import android.util.Log; 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.interfaces.ICallback; import com.finogeeks.mop.service.MopPluginService; @@ -57,7 +57,7 @@ public class ExtensionApiModule extends BaseApi { @Override public void success(Object 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); JSONObject ret = null; if (json != null && !json.equals("null")) { @@ -80,7 +80,7 @@ public class ExtensionApiModule extends BaseApi { @Override 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 + ", errorMessage=" + errorMessage + ", errorDetails=" + errorDetails); @@ -114,7 +114,7 @@ public class ExtensionApiModule extends BaseApi { @Override public void success(Object 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); JSONObject ret = null; if (json != null && !json.equals("null")) { @@ -137,7 +137,7 @@ public class ExtensionApiModule extends BaseApi { @Override 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 + ", errorMessage=" + errorMessage + ", errorDetails=" + errorDetails);