Skip to content

Y
YDL-Component-Medical
Commit c70759cb by 徐健
Options

Merge branch 'dev' into feature/test_home_pager

parents 8261cbe7 908c76fd
Showing with 97 additions and 50 deletions
app/src/main/java/com/ydl/component/MainActivity.kt
......@@ -13,6 +13,8 @@ import android.util.Log
import com.alibaba.android.arouter.launcher.ARouter
import com.tbruyelle.rxpermissions2.RxPermissions
import com.umeng.analytics.MobclickAgent
import com.umeng.commonsdk.framework.UMModuleRegister.getAppContext
import com.ydl.audioim.YDLavManager
import com.ydl.component.music.MusicPlayActivity
import com.ydl.component.mvp.DemoContract
import com.ydl.component.mvp.DemoPresenter
......@@ -61,6 +63,9 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
}
override fun initDataAndEvent() {
YDLavManager.instances.init(this, "3387e9b251f3491e9221a9877e8f7830")
bindService()
reLoadData()
requestPermission()
......@@ -94,6 +99,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
startActivity(Intent(this, NewTestHomeActivity::class.java))
}
bt_to_confide.setOnClickListener {
YDLavManager.instances.login("1193016")
startActivity(Intent(this, ConfideHomeActivity::class.java))
}
bt_to_muse.setOnClickListener {
......
config.gradle
......@@ -42,13 +42,13 @@ ext {
ydlPublishVersion = [
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.18",
"m-consultant" : "0.0.29",
"m-confide" : "0.0.20",
"m-consultant" : "0.0.34",
"m-course" : "0.0.17",
"m-fm" : "0.0.15",
"m-muse" : "0.0.11",
"m-muse" : "0.0.12",
"m-tests" : "0.0.10",
"m-user" : "0.0.30",
"m-user" : "0.0.31",
//-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.1",
......@@ -64,7 +64,7 @@ ext {
//第一步
"ydl-platform" : "0.0.24",
//第二步 若干
"ydl-webview" : "0.0.24",
"ydl-webview" : "0.0.25",
"ydl-media" : "0.0.12",
"ydl-pay" : "0.0.9",
"m-audioim" : "0.0.15",
......
m-confide/src/main/java/com/ydl/confide/home/bean/ConnectParamJava.kt
......@@ -12,11 +12,14 @@ class ConnectParamJava : BaseCommand {
var id: String = "0" //倾诉id
var type: String = "1" //1 走AxB 2双呼 3声网
var callType:Int? = null //
constructor() : super()
constructor(id: String, type: String) : super() {
constructor(id: String, type: String, callType: Int?) : super() {
this.id = id
this.type = type
this.callType = callType
}
}
m-consultant/src/main/java/com/yidianling/consultant/ExpertSearchFragment.kt
......@@ -29,6 +29,7 @@ import com.ydl.ydlcommon.base.config.HttpConfig
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.BuryPointUtils
import com.ydl.ydlcommon.utils.DisplayUtils
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.remind.ToastHelper
......@@ -72,7 +73,8 @@ class ExpertSearchFragment : BaseMvpFragment<IExpertSearchView, ExpertSearchPres
override fun initDataAndEvent() {
var statusBarHeight = StatusBarUtils.getStatusBarHeight(context);
rootView.setPadding(0,statusBarHeight,0,0)
btn_back?.visibility = View.INVISIBLE
btn_back.visibility = View.GONE
title_layout.setPadding(DisplayUtils.dp2px(context,15),0,0,0)
initViews()
initData()
}
......
m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
......@@ -71,8 +71,8 @@ class ConsultAssistantDialogUtils private constructor() {
* 首页页展示
*/
fun showFromYdlHome(activity: Activity) {
consultAssistantDialogFromHomePage?.dismiss()
consultAssistantDialogFromHomePage = null
if (!activity.isFinishing) {
if (consultAssistantDialogFromHomePage == null) {
consultAssistantDialogFromHomePage = ConsultAssistantDialog(
activity,
object : ConsultAssistantDialog.OnConsultAssistantClickListener {
......@@ -82,14 +82,16 @@ class ConsultAssistantDialogUtils private constructor() {
}
})
}
consultAssistantDialogFromHomePage?.show()
}
}
/**
* 首页隐藏
*/
fun hideFromHomePage() {
consultAssistantDialogFromHomePage?.dismiss()
consultAssistantDialogFromHomePage?.hide()
}
////////////////////////////////////// 首页的展示隐藏逻辑 代码块end ///////////////////////////////////////////////////
......@@ -120,14 +122,14 @@ class ConsultAssistantDialogUtils private constructor() {
* 咨询师列表页展示浮层
*/
fun showDialog(activity: Activity) {
consultAssistantDialog?.dismiss()
consultAssistantDialog = null
if (!activity.isFinishing) {
if (consultAssistantDialog == null) {
consultAssistantDialog = ConsultAssistantDialog(
activity,
object : ConsultAssistantDialog.OnConsultAssistantClickListener {
override fun onClickAction() {
// 咨询师列表页面且未登录情况下，跳转登录页面
if (expertSearchPageHasShown && !ConsultantIn.isLogin()) {
if (!ConsultantIn.isLogin()) {
ConsultantIn.toLogin(activity)
} else {
//获取用户uid
......@@ -136,25 +138,29 @@ class ConsultAssistantDialogUtils private constructor() {
}
})
}
consultAssistantDialog?.show()
}
}
/**
* 咨询师列表页隐藏
*/
fun hide() {
consultAssistantDialog?.dismiss()
consultAssistantDialog?.hide()
}
/**
* 咨询师列表页面使用的重置本单例关于专家咨询列表页面得状态
*/
fun resetStatus() {
consultAssistantDialogFromHomePage?.dismiss()
consultAssistantDialog?.dismiss()
timer?.cancel()
timer = null
expertSearchPageHasShown = false
consultAssistantDialogFromHomePage = null
consultAssistantDialog = null
}
......
m-consultant/src/main/java/com/yidianling/consultant/router/ConsultantIn.kt
......@@ -37,7 +37,7 @@ object ConsultantIn {
}
fun toLogin(activity: Activity) {
ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity)
activity.startActivity(ModularServiceManager.provide(IUserService::class.java).loginWayIntent(activity))
}
}
\ No newline at end of file
m-consultant/src/main/res/drawable/consultant_bg_radius_line_gray_16.xml
......@@ -3,6 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
tools:ignore="MissingDefaultResource">
<corners android:radius="16dp" />
<corners android:radius="90dp" />
<solid android:color="@color/platform_color_F7F7F7" />
</shape>
\ No newline at end of file
m-consultant/src/main/res/layout/consultant_activity_expert_search_list.xml
......@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<include
......
m-consultant/src/main/res/layout/consultant_expert_search_item_view.xml
......@@ -13,7 +13,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/platform_dp_15"
android:padding="0.5dp"
android:background="@drawable/consultant_bg_radius_line_gray_05"
android:orientation="vertical">
<android.support.v7.widget.CardView
......@@ -39,9 +38,7 @@
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/consultant_online_yue"
android:layout_marginLeft="@dimen/platform_dp_2"
tools:visibility="visible"
android:layout_marginBottom="@dimen/platform_dp_05"
android:visibility="gone"/>
......@@ -53,9 +50,7 @@
android:scaleType="centerCrop"
android:layout_alignBottom="@+id/cvHead"
app:srcCompat="@drawable/consultant_online_server"
android:layout_marginLeft="@dimen/platform_dp_2"
tools:visibility="visible"
android:layout_marginBottom="@dimen/platform_dp_05"
android:visibility="gone"/>
......@@ -79,7 +74,6 @@
android:layout_toRightOf="@+id/tvName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/platform_dp_2"
android:orientation="horizontal"
android:paddingLeft="10dp"
android:gravity="center_vertical"
......@@ -93,34 +87,32 @@
android:layout_width="42dp"
android:layout_height="12dp"
android:layout_marginStart="@dimen/platform_dp_4"
android:layout_marginRight="4dp"
android:visibility="gone"/>
<!--公益图标-->
<ImageView
android:id="@+id/imgServiceFree"
android:layout_width="26dp"
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:layout_marginRight="4dp"
android:scaleType="centerCrop"
tools:background="@drawable/consultant_service_free"
android:layout_marginStart="@dimen/platform_dp_4" />
tools:background="@drawable/consultant_service_free" />
<!--新驻图标-->
<ImageView
android:id="@+id/imgNewEnter"
android:layout_width="26dp"
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:layout_marginRight="4dp"
android:scaleType="fitCenter"
tools:background="@drawable/consultant_new_enter"
android:layout_marginStart="@dimen/platform_dp_4" />
tools:background="@drawable/consultant_new_enter" />
<!--优质图标-->
<ImageView
android:id="@+id/imgAbilityLevel"
android:layout_width="26dp"
android:layout_height="@dimen/platform_dp_12"
android:layout_marginLeft="@dimen/platform_dp_4"
android:layout_marginRight="4dp"
android:scaleType="fitCenter"
tools:background="@drawable/consultant_expert_search_shixi"
android:layout_marginStart="@dimen/platform_dp_4"
android:visibility="gone"/>
</LinearLayout>
......
m-consultant/src/main/res/layout/consultant_layout_search_content.xml
......@@ -12,11 +12,13 @@
android:id="@+id/scroll"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!--筛选框-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -75,12 +77,13 @@
android:paddingLeft="10dp"
android:paddingBottom="10dp"
android:orientation="horizontal">
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/platform_line"/>
android:layout_height="6dp"
android:background="@drawable/consult_fillter_bg"/>
</LinearLayout>
</com.yidianling.consultant.ui.view.DisInterceptNestedScrollView>
......@@ -93,7 +96,7 @@
android:id="@+id/viewSep2"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/platform_divide_color"
android:background="@color/transparent"
/>
<android.support.v4.widget.SwipeRefreshLayout
......@@ -170,7 +173,6 @@
android:id="@+id/viewDim"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/viewSep2"
android:background="#40000000"
android:visibility="invisible"/>
</RelativeLayout>
......
m-consultant/src/main/res/layout/consultant_layout_search_toolbar.xml
......@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:background="@color/white"
app:layout_collapseMode="pin">
......@@ -29,9 +30,10 @@
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginLeft="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/consultant_icon_search_zixun" />
<TextView
......
m-muse/src/main/java/com/yidianling/muse/handler/MusePlugin.kt
......@@ -141,7 +141,7 @@ class MusePlugin : MethodChannel.MethodCallHandler {
if (shareUrl.isEmpty()) {
ToastUtil.toastShort("分享数据获取失败")
}else {
val dialog = YDLShareDialog.style7(mActivity!!, title, shareUrl, null, "https://img.yidianling.com/file/2019/06/10/fm0vovijx0p2br9s.png", path, appId)
val dialog = YDLShareDialog.style7(mActivity!!, title, shareUrl, "壹点零冥想", "https://img.yidianling.com/file/2019/06/10/fm0vovijx0p2br9s.png", path, appId)
dialog.setCallBack(object : YDLShareDialog.ICallBack {
override fun callBack(type: Int) {
}
......
m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt
......@@ -19,6 +19,9 @@ import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.R
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.route.UserIn
import com.yidianling.user.safePrivate.FingerPrintCheckActivity
import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.login.contract.IInputPassWordContract
import com.yidianling.user.ui.login.presenter.InputPassWordPresenterImpl
import kotlinx.android.synthetic.main.user_activity_input_password.*
......@@ -282,7 +285,12 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
var flag = 0
//判断stack中activity是否属于登录相关的三个页面
for (activity in ActivityManager.getInstance().getActivitys()) {
if (activity is RegisterAndLoginActivity || activity is VerificationCodeActivity || activity is InputPassWordActivity) {
if (activity is RegisterAndLoginActivity
|| activity is VerificationCodeActivity
|| activity is InputPassWordActivity
|| activity is FingerPrintCheckActivity
|| activity is HandUnlockCheckActivity
) {
flag++
}
}
......@@ -291,6 +299,9 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
} else {
ActivityManager.finishAll()
startActivity(UserIn.mainIntent(this))
......
m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt
......@@ -44,6 +44,9 @@ import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.http.request.PhoneLoginAutoParam
import com.yidianling.user.http.response.ChcekPhoneResponeBean
import com.yidianling.user.route.UserIn
import com.yidianling.user.safePrivate.FingerPrintCheckActivity
import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.CountryListActivity
import com.yidianling.user.ui.login.contract.ILoginContract
import com.yidianling.user.ui.login.presenter.LoginPresenterImpl
......@@ -450,9 +453,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
tv_reg_title.text = "手机号绑定"
tv_protocol.visibility = View.GONE
} else {
ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
finishPrePage()
if (isFromGuide) {
startActivity(UserIn.mainIntent(this))
}
......@@ -527,9 +528,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
UserHelper.getUserInfo()!!.userInfo!!.bind_phone = 1
UserHelper.getUserInfo()!!.userInfo!!.phone = userPhoneNumber
ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
finishPrePage()
}
/**
......@@ -559,11 +558,20 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
ActivityManager.finishAll()
startActivity(UserIn.mainIntent(this))
} else {
finishPrePage()
}
}, 3000)
}
private fun finishPrePage() {
ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
}
}, 3000)
//关闭手势解锁页面与指纹解锁页面
ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
}
......
m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt
......@@ -10,10 +10,8 @@ import android.view.View
import com.ydl.ydlcommon.base.BaseMvpActivity
import com.ydl.ydlcommon.utils.ActivityManager
import com.ydl.ydlcommon.utils.StatusBarUtils
import com.ydl.ydlcommon.utils.YDLCacheUtils
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.common.tools.RxKeyboardTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.user.R
......@@ -21,6 +19,9 @@ import com.yidianling.user.UserHelper
import com.yidianling.user.constants.UserBIConstants
import com.yidianling.user.http.request.BindPhoneJavaParam
import com.yidianling.user.route.UserIn
import com.yidianling.user.safePrivate.FingerPrintCheckActivity
import com.yidianling.user.safePrivate.FingerPrintUtil
import com.yidianling.user.safePrivate.HandUnlockCheckActivity
import com.yidianling.user.ui.login.contract.IVerificationCodeContract
import com.yidianling.user.ui.login.presenter.VerificationCodePresenterImpl
import io.reactivex.Observable
......@@ -280,7 +281,12 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
var flag = 0
//判断stack中activity是否属于登录相关的三个页面
for (activity in ActivityManager.getInstance().getActivitys()) {
if (activity is RegisterAndLoginActivity || activity is VerificationCodeActivity || activity is InputPassWordActivity) {
if (activity is RegisterAndLoginActivity
|| activity is VerificationCodeActivity
|| activity is InputPassWordActivity
|| activity is FingerPrintCheckActivity
|| activity is HandUnlockCheckActivity
) {
flag++
}
}
......@@ -289,6 +295,9 @@ class VerificationCodeActivity : BaseMvpActivity<IVerificationCodeContract.View,
ActivityManager.getInstance().finishActivity(VerificationCodeActivity::class.java)
ActivityManager.getInstance().finishActivity(InputPassWordActivity::class.java)
ActivityManager.getInstance().finishActivity(RegisterAndLoginActivity::class.java)
ActivityManager.getInstance().finishActivity(FingerPrintCheckActivity::class.java)
ActivityManager.getInstance().finishActivity(HandUnlockCheckActivity::class.java)
FingerPrintUtil.instance().setCurrentUnLockTime(System.currentTimeMillis())
} else {
ActivityManager.finishAll()
startActivity(UserIn.mainIntent(this))
......
ydl-webview/src/main/java/com/ydl/webview/H5JsBean.kt
......@@ -121,6 +121,9 @@ class H5JsBean {
var toggleShareMenu: Int = 0 //0 关闭，1 打开
//标识首页第几个tab
var selectTab:Int = 0
//倾诉拨打电话使用参数
var callType:Int?=null
}
}
}
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