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

feat：提升Android核心SDK版本，处理微信小程序版本对应问题；

master
yangbingqiao 2022-10-08 22:58:20 +08:00
parent de789b398c
commit ffbc1b16d7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.38.1' implementation 'com.finogeeks.lib:finapplet:2.38.2-alpha20221008v03'
implementation 'com.finogeeks.mop:plugins:2.38.1' implementation 'com.finogeeks.mop:plugins:2.38.1'
} }

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

@ -10,7 +10,7 @@ import com.finogeeks.lib.applet.anim.SlideFromLeftToRightAnim;
import com.finogeeks.lib.applet.anim.SlideFromRightToLeftAnim; import com.finogeeks.lib.applet.anim.SlideFromRightToLeftAnim;
import com.finogeeks.lib.applet.anim.SlideFromTopToBottomAnim; import com.finogeeks.lib.applet.anim.SlideFromTopToBottomAnim;
import com.finogeeks.lib.applet.client.FinAppClient; import com.finogeeks.lib.applet.client.FinAppClient;
import com.finogeeks.lib.applet.db.entity.FinApplet; import com.finogeeks.lib.applet.client.FinAppInfo;
import com.finogeeks.lib.applet.interfaces.FinCallback; import com.finogeeks.lib.applet.interfaces.FinCallback;
import com.finogeeks.lib.applet.rest.model.WechatLoginInfo; import com.finogeeks.lib.applet.rest.model.WechatLoginInfo;
import com.finogeeks.mop.api.BaseApi; import com.finogeeks.mop.api.BaseApi;
@ -41,19 +41,19 @@ public class AppletManageModule extends BaseApi {
if (event.equals("currentApplet")) { if (event.equals("currentApplet")) {
String appId = FinAppClient.INSTANCE.getAppletApiManager().getCurrentAppletId(); String appId = FinAppClient.INSTANCE.getAppletApiManager().getCurrentAppletId();
if (appId != null) { if (appId != null) {
FinApplet applet = FinAppClient.INSTANCE.getAppletApiManager().getUsedApplet(appId); FinAppInfo appletInfo = FinAppClient.INSTANCE.getAppletApiManager().getAppletInfoFromRunning(appId);
if (applet != null) { if (appletInfo != null) {
//Log.e(TAG, "applet:" + new Gson().toJson(applet)); //Log.e(TAG, "applet:" + new Gson().toJson(applet));
Map<String, Object> res = new HashMap<>(); Map<String, Object> res = new HashMap<>();
res.put("appId", applet.getId()); res.put("appId", appletInfo.getAppId());
res.put("name", applet.getName()); res.put("name", appletInfo.getAppTitle());
res.put("icon", applet.getIcon()); res.put("icon", appletInfo.getAppAvatar());
res.put("description", applet.getDescription()); res.put("description", appletInfo.getAppDescription());
res.put("version", applet.getVersion()); res.put("version", appletInfo.getAppVersion());
res.put("thumbnail", applet.getThumbnail()); res.put("thumbnail", appletInfo.getAppThumbnail());
res.put("appletType", applet.getAppletType()); res.put("appletType", appletInfo.getAppType());
Map<String, String> wechatLoginInfo = new HashMap<>(3); Map<String, String> wechatLoginInfo = new HashMap<>(4);
WechatLoginInfo wechatLogin = applet.getWechatLoginInfo(); WechatLoginInfo wechatLogin = appletInfo.getWechatLoginInfo();
if (wechatLogin != null) { if (wechatLogin != null) {
wechatLoginInfo.put("wechatOriginId", wechatLogin.getWechatOriginId()); wechatLoginInfo.put("wechatOriginId", wechatLogin.getWechatOriginId());
wechatLoginInfo.put("profileUrl", wechatLogin.getProfileUrl()); wechatLoginInfo.put("profileUrl", wechatLogin.getProfileUrl());