Commit Graph

1152 Commits (195b2d11a9d614232275f353ea1be83d5f40420c)

Author SHA1 Message Date
kangxuyao bb4f5e5f6c merge conflict 2023-04-23 16:32:53 +08:00
kangxuyao 861bab0492 Merge branch 'master' into major
# Conflicts:
#	android/build.gradle
2023-04-23 16:12:25 +08:00
wanghualei ad595d45cf fix 参数错误 2023-04-22 11:33:38 +08:00
wanghualei a03efa8ae2 增加iOS useNativeLiveComponent配置 2023-04-22 11:23:47 +08:00
wanghualei 6bf91b716a update 测试更多菜单 2023-04-22 10:49:55 +08:00
chenhui b45dd8ff47 fix: live组件默认值支持 2023-04-21 21:48:53 +08:00
wangzhaoyao 31a1ee489c 1.删除默认值。 2023-04-21 20:52:28 +08:00
kangxuyao 4888297cc1 Merge remote-tracking branch 'origin/feat/stable_log' 2023-04-20 15:56:27 +08:00
yangbinqiao 3d7ceb51f5 feat:迁移日志锚点至新日志系统; 2023-04-17 14:32:58 +08:00
wanghualei d47cbbe44c update flutter 安卓和ios工程 2023-04-10 16:22:48 +08:00
gaoyunfei e8da56b290 完善Android自定义加载页 2023-04-10 12:20:26 +08:00
wanghualei 512175fd51 add 自定义的loading页 2023-04-10 11:23:11 +08:00
wanghualei 2b1691f26c 去掉分享按钮的代理设置 2023-04-09 18:43:30 +08:00
jenkins b98dc5a5a4 release: version:2.40.3 2023-04-09 15:09:04 +08:00
wangyong 3abf418144 feat:更新版本号 2023-04-08 02:26:06 +08:00
wangyong a66803c56e Merge branch 'master' of https://gitlab.finogeeks.club/finclipsdk/finclip-flutter-sdk into X5
 Conflicts:
	android/build.gradle
	example/pubspec.lock
	lib/mop.dart
2023-04-08 02:00:50 +08:00
jenkins 6b6dfa89e6 version++ 2023-04-08 00:12:53 +08:00
jenkins 71b72c5e5b version++ 2023-04-07 23:43:51 +08:00
wanghualei 17579d8f65 Feat/opt 2023-04-07 13:40:02 +00:00
zhongweiguang eff2f43007 Merge branch 'master' into X5 2023-03-30 13:20:48 +08:00
wanghualei 462ef3382e 调整方法注释和顺序 2023-03-27 18:10:41 +08:00
yangbinqiao 86fde17579 update:更新依赖版本; 2023-03-27 15:38:07 +08:00
wanghualei 6597433980 update ios version 2023-03-25 07:56:11 +08:00
yangbinqiao 8dc324fe66 Merge branch 'master' into X5
# Conflicts:
#	android/build.gradle
2023-03-25 02:35:10 +08:00
jenkins 7775e36ee4 version++ 2023-03-25 01:31:13 +08:00
jenkins a981ce5c09 version++ 2023-03-25 00:56:24 +08:00
wangyong f73a1d5ecc fix:Java层直播的属性配置遗漏补齐; 2023-03-24 22:54:25 +08:00
zhongweiguang 189cb5a3e8 Merge branch 'master' into X5 2023-03-24 21:55:56 +08:00
zhongweiguang ca4d45dce6 修复enableScreenShot、enablePreNewProcess配置项默认值错误问题 2023-03-24 21:55:35 +08:00
zhongweiguang b882a23db1 更新核心sdk版本 2023-03-24 12:41:14 +08:00
zhongweiguang 00d0014544 fix error 2023-03-24 12:23:22 +08:00
zhongweiguang 76fabf9187 initSDK新增useLocalTbsCore、tbsCoreUrl配置项;initialize去除useLocalTbsCore、tbsCoreUrl配置项; 2023-03-24 11:52:37 +08:00
zhongweiguang 484a2878b2 Merge branch 'master' into X5
# Conflicts:
#	android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java
#	lib/mop.dart
2023-03-24 11:18:27 +08:00
zhongweiguang 368b7d843a android: 新增isHideAddToDesktopMenu、isHideFavoriteMenu配置项 2023-03-24 10:57:54 +08:00
wangtao 8a7bcf75b8 Merge branch 'feat/add_config' of ssh://gitlab.finogeeks.club:2233/finclipsdk/finclip-flutter-sdk into feat/add_config 2023-03-24 10:46:53 +08:00
wangtao 1780804df2 feat: 添加隐藏更多菜单中的 收藏和添加到桌面的按钮配置 2023-03-24 10:46:28 +08:00
zhongweiguang a91cfc31ba 还原错误注释的代码 2023-03-24 10:43:57 +08:00
zhongweiguang 864d79e79a Merge branch 'master' into feat/add_config
# Conflicts:
#	android/build.gradle
#	lib/mop.dart
2023-03-24 10:39:29 +08:00
yangbinqiao 446814c2e8 opt:配置依赖版本; 2023-03-23 20:41:06 +08:00
yangbinqiao 93fd37f934 Merge branch 'master' into X5
# Conflicts:
#	android/build.gradle
2023-03-23 19:47:17 +08:00
yangbinqiao 76c6011d45 Merge branch 'feat/major_more_menu' 2023-03-23 18:35:40 +08:00
yangbinqiao 6f2147a988 feat:新增“添加到桌面”、“收藏”的显隐配置项; 2023-03-23 18:35:27 +08:00
zhongweiguang c61c876044 Merge branch 'master' into X5 2023-03-23 15:38:52 +08:00
wangtao d63b37f4e9 fix: 日志枚举值顺序调整 2023-03-23 14:23:22 +08:00
wangtao 280592e888 fix:修改addWebExtentionApi类名错误导致不能生效的问题
iOS添加changeUserId的API实现
2023-03-23 11:45:52 +08:00
wangtao 67ccec51e4 fix: ios添加日志参数配置,调整安卓日志等级的配置 2023-03-23 11:22:01 +08:00
zhongweiguang f4269be3c5 调整注释 2023-03-22 17:32:32 +08:00
zhongweiguang d74303db3c Merge branch 'feat/add_config' of https://gitlab.finogeeks.club/finclipsdk/finclip-flutter-sdk into feat/add_config 2023-03-22 17:29:11 +08:00
zhongweiguang dce531bdec initSDK补充部分属性 2023-03-22 17:29:02 +08:00
zhongweiguang acea046f33 initSDK补充部分属性 2023-03-22 17:27:17 +08:00