Skip to content

Y
YDL-Component-Medical
Commit b4051592 by 范玉宾
Options

Merge branch 'd/4.3.93_muse' of… 

Merge branch 'd/4.3.93_muse' of http://gitlab.yidianling.com/app_android_lib/YDL-Component into d/4.3.93_muse

* 'd/4.3.93_muse' of http://gitlab.yidianling.com/app_android_lib/YDL-Component:
  feat: 合并重新打包，解决返回无效问题
  feat: 合并release分支
  feat: webview加入页内跳转url方法
  feat: 金刚位文案改回抑郁测量
  feat: 分享弹窗bug修复

# Conflicts:
#	config.gradle
parents 08f035f4 e8c6a1ea
Showing with 46 additions and 24 deletions
config.gradle
......@@ -8,7 +8,8 @@ ext {
"m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.12",
"m-user" : "0.0.62.16",
"m-home" : "0.0.23.63",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
......@@ -35,10 +36,10 @@ ext {
//mdt 组件
"ydl-tuicore" : "0.0.23",
//第一步
"ydl-platform" : "0.0.41.06",
"ydl-platform" : "0.0.41.15",
//第二步 若干
"ydl-webview" : "0.0.38.75",
"ydl-webview" : "0.0.38.79",
"ydl-media" : "0.0.21.44",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.90",
......@@ -93,8 +94,10 @@ ext {
"m-confide" : "0.0.49.74",
"m-consultant" : "0.0.60.25",
"m-fm" : "0.0.30.08",
"m-user" : "0.0.62.12",
"m-user" : "0.0.62.16",
"m-home" : "0.0.23.63",
"m-im" : "0.0.21.44",
"m-dynamic" : "0.0.7.73",
"m-article" : "0.0.0.8",
......@@ -118,10 +121,10 @@ ext {
//mdt组件
"ydl-tuicore" : "0.0.23",
//第一步
"ydl-platform" : "0.0.41.06",
"ydl-platform" : "0.0.41.15",
//第二步 若干
"ydl-webview" : "0.0.38.75",
"ydl-webview" : "0.0.38.79",
"ydl-media" : "0.0.21.44",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.90",
......
m-fm/build.gradle
......@@ -73,7 +73,6 @@ dependencies {
if (rootProject.ext.dev_mode){
//开发时使用
api project(":ydl-platform")
api project(':m-user')
implementation modularPublication('com.ydl:m-user-api')
implementation modularPublication('com.ydl:m-dynamic-api')
implementation project(':ydl-media')
......
m-home/src/ydl/res/layout/home_button_banner_view.xml
......@@ -53,7 +53,7 @@
android:layout_height="wrap_content"
android:textColor="@color/platform_color_FFFFFF"
android:textSize="@dimen/platform_dp_12"
android:text="应有尽有"/>
android:text="抑郁测量"/>
</RelativeLayout>
<RelativeLayout
......
m-user/src/main/java/com/yidianling/user/mine/MineFragment.kt
......@@ -27,6 +27,7 @@ import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.Utils
import com.ydl.ydlcommon.utils.YdlBuryPointUtil
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils.Companion.count
import com.ydl.ydlcommon.view.dialog.YDLShareDialog
import com.ydl.ydlcommon.view.dialog.YDLShareDialog.Companion.style4
import com.yidianling.consultant.api.IConsultantService
import com.yidianling.dynamic.api.IDynamicService
......@@ -53,6 +54,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.user_mine_fragment_mine.*
import java.util.*
/**
* 我的Tab
......@@ -65,7 +67,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
var share_head = "http://static.ydlcdn.com/v1/images/logo320.png"
var share_url = "http://m.yidianling.com/app"
var userInfoData: UserResponseBean.UserInfo? = null
private var mShareDialog: YDLShareDialog? = null
private var startTime: Long = 0
private var endTime: Long = 0
override fun layoutResId(): Int {
......@@ -131,14 +133,10 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
.getGlobalInfo()?.info && null != PlatformRamImpl.getInstance()
.getGlobalInfo()?.info?.app_share
) {
share_title =
PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.title.toString()
share_context =
PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.descrip.toString()
share_head =
PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.cover_url.toString()
share_url =
PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.dl_url.toString()
share_title = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.title.toString()
share_context = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.descrip.toString()
share_head = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.cover_url.toString()
share_url = PlatformRamImpl.getInstance().getGlobalInfo()?.info?.app_share?.dl_url.toString()
}
}
......@@ -393,8 +391,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
.put("mine_name", "我的动态")
.burryPoint("mine")
try {
val intentm =
provide(IDynamicService::class.java).getMyTrendsActivityIntent(activity)
val intentm = provide(IDynamicService::class.java).getMyTrendsActivityIntent(activity)
startActivity(intentm)
} catch (e: Exception) {
e.printStackTrace()
......@@ -421,8 +418,7 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
BuryPointUtils.getInstance().createMap()
.put("mine_name", "预约订单")
.burryPoint("mine")
val h5Params3 =
H5Params(MH5_URL + "wb/user/order/list?needOrderHelperAlert=1", null)
val h5Params3 = H5Params(MH5_URL + "wb/user/order/list?needOrderHelperAlert=1", null)
NewH5Activity.start(activity, h5Params3)
}
......@@ -515,10 +511,12 @@ class MineFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener, View.
}
private fun share() {
val dialog = mActivity?.let { activity ->
style4(activity, share_title, share_url, share_context, share_head)
if (mShareDialog == null) {
mShareDialog = mActivity?.let { activity ->
style4(activity, share_title, share_url, share_context, share_head)
}
}
dialog?.show(activity?.fragmentManager, "lose")
mShareDialog?.show(activity?.fragmentManager, "lose")
}
/**
......
ydl-platform/src/main/res/layout/platform_dialog_share.xml
......@@ -131,6 +131,7 @@
android:layout_width="55dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:orientation="vertical">
<ImageView
......@@ -248,6 +249,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_18"
android:visibility="gone"
android:orientation="horizontal">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
......
ydl-webview/src/main/java/com/ydl/event/ReloadUrlEvent.kt 0 → 100644
package com.ydl.event
/**
* h5页面内访问URL
*/
class ReloadUrlEvent {
var url: String? = null
constructor(url: String) {
this.url = url
}
}
\ No newline at end of file
ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java
......@@ -34,6 +34,7 @@ import com.tencent.smtt.sdk.WebView;
import com.tencent.smtt.sdk.WebViewClient;
import com.umeng.socialize.UMShareAPI;
import com.umeng.socialize.bean.SHARE_MEDIA;
import com.ydl.event.ReloadUrlEvent;
import com.ydl.utils.PopUtils;
import com.ydl.utils.ProxyCheckUtils;
import com.ydl.utils.WebUrlParamsUtils;
......@@ -1064,6 +1065,12 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
}
}
public void onEvent(ReloadUrlEvent event) {
//刷新页面
loadUrl(event.getUrl());
shouldClearHistory = true;
}
public void onEvent(UserBindPhoneEvent event) {
//刷新页面
loadUrl(h5Params.getUrl());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment