Skip to content

Y
YDL-Component-Medical
Commit 119487eb by 霍志良
Options

Merge branch '最新Dev' into MDT群聊搭建

parents 49700251 f6da08cb
Showing with 90 additions and 82 deletions
config.gradle
...@@ -5,12 +5,12 @@ ext { ...@@ -5,12 +5,12 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.38", "m-confide" : "0.0.49.52",
"m-consultant" : "0.0.60.04", "m-consultant" : "0.0.60.04",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.94", "m-user" : "0.0.61.94",
"m-home" : "0.0.22.84", "m-home" : "0.0.22.85",
"m-im" : "0.0.21.15", "m-im" : "0.0.21.17",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.10", "m-article" : "0.0.0.10",
...@@ -39,7 +39,7 @@ ext { ...@@ -39,7 +39,7 @@ ext {
"ydl-webview" : "0.0.38.58", "ydl-webview" : "0.0.38.58",
"ydl-media" : "0.0.21.42", "ydl-media" : "0.0.21.42",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.59", "m-audioim" : "0.0.49.29.70",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
...@@ -88,12 +88,12 @@ ext { ...@@ -88,12 +88,12 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.51", "m-confide" : "0.0.49.52",
"m-consultant" : "0.0.60.03", "m-consultant" : "0.0.60.03",
"m-fm" : "0.0.30.07", "m-fm" : "0.0.30.07",
"m-user" : "0.0.61.94", "m-user" : "0.0.61.94",
"m-home" : "0.0.22.84", "m-home" : "0.0.22.85",
"m-im" : "0.0.21.15", "m-im" : "0.0.21.17",
"m-dynamic" : "0.0.7.35", "m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.8", "m-article" : "0.0.0.8",
...@@ -121,7 +121,7 @@ ext { ...@@ -121,7 +121,7 @@ ext {
"ydl-webview" : "0.0.38.58", "ydl-webview" : "0.0.38.58",
"ydl-media" : "0.0.21.42", "ydl-media" : "0.0.21.42",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.59", "m-audioim" : "0.0.49.29.70",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
m-audioim/build.gradle
...@@ -75,7 +75,7 @@ dependencies { ...@@ -75,7 +75,7 @@ dependencies {
kapt "com.alibaba:arouter-compiler:$arouter_compiler" kapt "com.alibaba:arouter-compiler:$arouter_compiler"
api "com.alibaba:arouter-api:$arouter_api" api "com.alibaba:arouter-api:$arouter_api"
api ('com.ydl:ydl-av:1.3.2@aar'){ api ('com.ydl:ydl-av:1.3.4@aar'){
transitive = true transitive = true
} }
......
m-home/src/ydl/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt
...@@ -5,6 +5,7 @@ import android.view.View ...@@ -5,6 +5,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
...@@ -65,14 +66,15 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent: ...@@ -65,14 +66,15 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
var viewHeight = viewWidth * 78 / 80 var viewHeight = viewWidth * 78 / 80
buttonParams = LinearLayout.LayoutParams(viewWidth, viewHeight) buttonParams = LinearLayout.LayoutParams(viewWidth, viewHeight)
buttonParamsFrame = FrameLayout.LayoutParams(viewWidth, viewHeight) buttonParamsFrame = FrameLayout.LayoutParams(viewWidth, viewHeight)
buttonParamsFrame2= FrameLayout.LayoutParams((viewWidth/2)+10, viewHeight/2-30) buttonParamsFrame2= FrameLayout.LayoutParams((viewWidth/2.0).toInt(), (viewHeight/2.3).toInt())
buttonParamsFrame2!!.setMargins(RxImageTool.dp2px((viewWidth/19f)),0,0,0) buttonParamsFrame2!!.setMargins((((viewWidth/6f).toInt())),0,0,0)
qingsuGif.layoutParams=buttonParamsFrame2 qingsuGif.layoutParams=buttonParamsFrame2
homeModuleButtonBannerSecondFrame.layoutParams=buttonParamsFrame
homeModuleButtonBannerFirst.layoutParams = buttonParams homeModuleButtonBannerFirst.layoutParams = buttonParams
homeModuleButtonBannerSecond.layoutParams = buttonParams homeModuleButtonBannerSecond.layoutParams = buttonParams
homeModuleButtonBannerThird.layoutParams = buttonParams homeModuleButtonBannerThird.layoutParams = buttonParams
homeModuleButtonBannerFourth.layoutParams = buttonParams homeModuleButtonBannerFourth.layoutParams = buttonParams
homeModuleButtonBannerSecondFrame.layoutParams=buttonParamsFrame
} }
} }
} }
\ No newline at end of file
m-im/src/main/java/com/yidianling/im/ui/activity/CmsExamQuestionPaperActivity.kt
...@@ -348,8 +348,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() { ...@@ -348,8 +348,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
} else { } else {
addType71Request(et_input_problem.text.toString(), "") addType71Request(et_input_problem.text.toString(), "")
} }
//最后一题答玩展示立即前往按钮，隐藏跳过按钮
tv_finish.visibility = View.VISIBLE
tv_skip.visibility = View.GONE tv_skip.visibility = View.GONE
mackType2(lastAnswer, "") mackType2(lastAnswer, "")
setFirstAndLatQuestion(mQuestionBean!!.questions[2].question) setFirstAndLatQuestion(mQuestionBean!!.questions[2].question)
...@@ -359,6 +358,9 @@ class CmsExamQuestionPaperActivity : BaseActivity() { ...@@ -359,6 +358,9 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
mData.forEachIndexed { index, _ -> mData.forEachIndexed { index, _ ->
mData[index].type5CanClick = false mData[index].type5CanClick = false
} }
//最后一题答玩展示立即前往按钮，隐藏跳过按钮
// tv_finish.visibility = View.VISIBLE
skipToIm()//最后一题答完直接进入私聊页面。
} }
/** /**
...@@ -432,7 +434,8 @@ class CmsExamQuestionPaperActivity : BaseActivity() { ...@@ -432,7 +434,8 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
} else { } else {
//没有下一题了,跳转按钮展示 //没有下一题了,跳转按钮展示
setFirstAndLatQuestion(mQuestionBean!!.questions[2].question) setFirstAndLatQuestion(mQuestionBean!!.questions[2].question)
tv_finish.visibility = View.VISIBLE // tv_finish.visibility = View.VISIBLE
skipToIm()
tv_skip.visibility = View.GONE tv_skip.visibility = View.GONE
} }
mQuestionAdapter.notifyDataSetChanged() mQuestionAdapter.notifyDataSetChanged()
...@@ -756,88 +759,90 @@ class CmsExamQuestionPaperActivity : BaseActivity() { ...@@ -756,88 +759,90 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
private fun skipToIm() { private fun skipToIm() {
showProgressDialog() showProgressDialog()
SharedPreferencesEditor.putString("skip_time_", System.currentTimeMillis().toString()) recycle.postDelayed(Runnable {
SharedPreferencesEditor.putString("skip_time_", System.currentTimeMillis().toString())
if (toUid != null) { if (toUid != null) {
//代表是聊天列表进来的 //代表是聊天列表进来的
instance.batchSendCustomizeMessage(JSON.toJSONString(mType70RequestList)) instance.batchSendCustomizeMessage(JSON.toJSONString(mType70RequestList))
.subscribeOn(Schedulers.io())
.observeOn(Schedulers.io())
.subscribe()
Handler().postDelayed({
instance.batchSendCustomizeMessage(JSON.toJSONString(mType71RequestList))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe() .subscribe()
}, 100L)
Handler().postDelayed({ Handler().postDelayed({
IMChatUtil.startChatSessionByCms( instance.batchSendCustomizeMessage(JSON.toJSONString(mType71RequestList))
toUid!!, .subscribeOn(Schedulers.io())
expertInfo, .observeOn(Schedulers.io())
isFromQingShu, .subscribe()
this@CmsExamQuestionPaperActivity }, 100L)
)
}, 200L)
Handler().postDelayed({
finish()
}, 1000L)
} else {
//代表是导医进来的 导医进来的需要获取导医后再发送消息
var questionPaperId = ""
mQuestionBean?.questionPaper?.id?.let { questionPaperId = it }
ImRetrofitApi.getImJavaApi()
.getConsultAssistantUidRequest(location, ffrom2, answerQuestionId, questionPaperId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ uidBean ->
if (uidBean.code == "200" && uidBean.data != 0.toLong()) {
mType70RequestList.forEachIndexed { index, answerQuestionType70RequestBean ->
mType70RequestList[index].toUid = uidBean.data.toString()
}
instance.batchSendCustomizeMessage(JSON.toJSONString(mType70RequestList)) Handler().postDelayed({
.subscribeOn(Schedulers.io()) IMChatUtil.startChatSessionByCms(
.observeOn(Schedulers.io()) toUid!!,
.subscribe() expertInfo,
isFromQingShu,
this@CmsExamQuestionPaperActivity
)
}, 200L)
mType71RequestList.forEachIndexed { index, answerQuestionType71RequestBean -> Handler().postDelayed({
mType71RequestList[index].toUid = uidBean.data.toString() finish()
} }, 1000L)
} else {
//代表是导医进来的 导医进来的需要获取导医后再发送消息
var questionPaperId = ""
mQuestionBean?.questionPaper?.id?.let { questionPaperId = it }
Handler().postDelayed({ ImRetrofitApi.getImJavaApi()
instance.batchSendCustomizeMessage(JSON.toJSONString(mType71RequestList)) .getConsultAssistantUidRequest(location, ffrom2, answerQuestionId, questionPaperId)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe({ uidBean ->
if (uidBean.code == "200" && uidBean.data != 0.toLong()) {
mType70RequestList.forEachIndexed { index, answerQuestionType70RequestBean ->
mType70RequestList[index].toUid = uidBean.data.toString()
}
instance.batchSendCustomizeMessage(JSON.toJSONString(mType70RequestList))
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(Schedulers.io()) .observeOn(Schedulers.io())
.subscribe() .subscribe()
}, 100L)
mType71RequestList.forEachIndexed { index, answerQuestionType71RequestBean ->
Handler().postDelayed({ mType71RequestList[index].toUid = uidBean.data.toString()
IMChatUtil.startChat( }
this@CmsExamQuestionPaperActivity,
uidBean.data.toString(), Handler().postDelayed({
0 instance.batchSendCustomizeMessage(JSON.toJSONString(mType71RequestList))
) .subscribeOn(Schedulers.io())
}, 200L) .observeOn(Schedulers.io())
.subscribe()
Handler().postDelayed({ }, 100L)
finish()
}, 1000L) Handler().postDelayed({
} else { IMChatUtil.startChat(
this@CmsExamQuestionPaperActivity,
uidBean.data.toString(),
0
)
}, 200L)
Handler().postDelayed({
finish()
}, 1000L)
} else {
dismissProgressDialog()
ToastUtil.toastShort("咨询助理忙碌中，请稍后再试")
}
}, {
dismissProgressDialog() dismissProgressDialog()
ToastUtil.toastShort("咨询助理忙碌中，请稍后再试") ToastUtil.toastShort("咨询助理忙碌中，请稍后再试")
} })
}
}, { },2000)
dismissProgressDialog()
ToastUtil.toastShort("咨询助理忙碌中，请稍后再试")
})
}
} }
/** /**
......
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