Skip to content

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

Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

parents 1508bbc4 5892c62e
Showing with 90 additions and 67 deletions
config.gradle
ext {
kotlin_version = "1.3.21"
dev_mode = false
dev_mode = true
ydl_app = [
appName : "心理咨询壹点灵",
......@@ -44,8 +44,8 @@ ext {
//第三步 若干
"m-confide" : "0.0.18",
"m-consultant" : "0.0.27",
"m-course" : "0.0.16",
"m-fm" : "0.0.14",
"m-course" : "0.0.17",
"m-fm" : "0.0.15",
"m-muse" : "0.0.11",
"m-tests" : "0.0.9",
"m-user" : "0.0.30",
......@@ -81,8 +81,8 @@ ext {
//第三步 若干
"m-confide" : "0.0.15",
"m-consultant" : "0.0.26",
"m-course" : "0.0.16",
"m-fm" : "0.0.11",
"m-course" : "0.0.17",
"m-fm" : "0.0.15",
"m-muse" : "0.0.7",
"m-tests" : "0.0.4",
"m-user" : "0.0.25",
......
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
......@@ -129,7 +129,6 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
search_view.setTextTitle("搜索")
init()
loadData()
initCouponHintView()
setClick()
......@@ -195,7 +194,8 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
NewH5Activity.start(this@CourseListContainerActivity, h5Params)
}
}
getData(false)
loadData()
}
/**
......@@ -225,6 +225,9 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
}
}
}
getData(false)
if (selectedCourseList.size > 0) {
classify_layout.typeface = Typeface.defaultFromStyle(Typeface.BOLD)
classify_layout.setTextColor(
......@@ -536,6 +539,10 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
iv_course_list_empty_view.visibility = View.GONE
v_loading.visibility = View.GONE
} else {
if (adapter!!.count > 0) {
// hasMore = false
load_more_list_view_container.loadMoreFinish(false, false)
} else {
lv_content.visibility = View.GONE
tv_course_list_empty_prompt.visibility = View.VISIBLE
iv_course_list_empty_view.visibility = View.VISIBLE
......@@ -543,6 +550,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
tv_course_list_empty_prompt.text = "还没有相应的课程哦~"
v_loading.visibility = View.GONE
}
}
}, { throwable ->
v_loading.visibility = View.GONE
if (adapter!!.mDataList == null || adapter!!.mDataList.size <= 0) {
......
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayActivity.kt
......@@ -497,7 +497,6 @@ class CoursePlayActivity : BaseActivity() {
}
fun showLoadingDialog() {
showProgressDialog(null)
}
......@@ -636,14 +635,11 @@ class CoursePlayActivity : BaseActivity() {
AudioPlayer.get().playMusic?.coverPath = courPlayBean?.courseExtra?.pic
AudioPlayer.get().playMusic?.artist = courPlayBean?.courseExtra?.doctorName
PlayerFloatHelper.playTempData.clear()
val hashMap = HashMap<String, String>()
hashMap["course_id"] = course_id.toString()
PlayerFloatHelper.playTempData.putAll(hashMap)
// PlayerFloatHelper.show(
// this,
// playTypeEnum = PlayTypeEnum.PLAY_TYPE_COURSE,
// playData = hashMap
// )
}
......@@ -655,14 +651,6 @@ class CoursePlayActivity : BaseActivity() {
var status = Utils.getValue(videoView, "status")
//视频课程正在播放中
if (status == PlayStateParams.STATE_PLAYING) {
//todo 视屏播放
// YDLMusicHelper.title = courPlayBean?.courseExtra?.title
// YDLMusicHelper.cover = courPlayBean?.courseExtra?.pic
// YDLMusicHelper.name = courPlayBean?.courseExtra?.doctorName
// YDLMusicHelper.isVideoPlaying = true
// YDLMusicHelper.playType = 1
// YDLMusicHelper.courseVideoUlr = (play_view as CoursePlayItemViewVideo).videoUrl
// YDLMusicHelper.course_id = courPlayBean?.courseExtra?.id!!.toInt()
VideoFloatHelper.setVideoInfo(
course_id.toString(),
......@@ -702,9 +690,9 @@ class CoursePlayActivity : BaseActivity() {
}
override fun onDestroy() {
super.onDestroy()
videoView?.onDestroy()
play_view?.onDestroy()
play_view = null
super.onDestroy()
}
}
m-course/src/main/java/com/yidianling/course/coursePlay/CoursePlayItemViewAudio.kt
......@@ -187,14 +187,7 @@ class CoursePlayItemViewAudio : RelativeLayout, PlayViewInterface {
}
override fun onDestroy() {
//释放播放器
if (AudioPlayer.get().isPlaying) {
playView?.onDestroy()
playView = null
AudioPlayer.get().stopPlayer()
} else {
playView?.onDestroy()
playView = null
}
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchActicity.kt
......@@ -17,6 +17,7 @@ import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.common.tools.RxKeyboardTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.CourseConstants
import com.yidianling.course.R
......@@ -111,6 +112,8 @@ class CourseSearchActivity : BaseActivity(), CourseSearchAdapter.OnItemClick, IC
loadCourseList(true)
}
})
RxKeyboardTool.showSoftInput(this,)
}
/**
......
m-course/src/main/java/com/yidianling/course/flutterPlugin/CoursePlugin.kt
......@@ -190,6 +190,7 @@ class CoursePlugin : MethodChannel.MethodCallHandler {
if (demoType == 1) {
music.path = url
PlayerFloatHelper.playTempData.clear()
val hashMap = HashMap<String, String>()
hashMap["course_id"] = fileInfo["courseId"].toString()
AudioPlayer.get().singlePlay(music)
......
m-course/src/main/java/com/yidianling/course/lifeCallback/CoursePlayLifecycle.kt
......@@ -3,6 +3,7 @@ package com.yidianling.course.lifeCallback
import android.app.Activity
import android.app.Application
import android.os.Bundle
import android.text.TextUtils
import com.ydl.media.audio.AudioPlayer
import com.ydl.media.view.PlayTypeEnum
import com.ydl.media.view.PlayerFloatHelper
......@@ -26,8 +27,13 @@ class CoursePlayLifecycle : Application.ActivityLifecycleCallbacks {
AudioPlayer.get().stopPlayer()
} else {
PlayerFloatHelper.showIfPlaying(activity!!)
if (!TextUtils.isEmpty(PlayerFloatHelper.playTempData["course_id"])) {
PlayerFloatHelper.playingType = PlayTypeEnum.PLAY_TYPE_COURSE
}
if (!TextUtils.isEmpty(PlayerFloatHelper.playTempData["fmId"])) {
PlayerFloatHelper.playingType = PlayTypeEnum.PLAY_TYPE_FM
}
}
}
override fun onActivityStarted(activity: Activity?) {
......
m-course/src/main/java/com/yidianling/course/widget/CourseItemNewView.kt
......@@ -20,7 +20,6 @@ import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity
import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import com.ydl.ydlcommon.utils.actionutil.BIConstants
import com.yidianling.common.tools.RxImageTool
import com.yidianling.common.tools.ToastUtil
import com.yidianling.course.CourseConstants
......@@ -136,11 +135,18 @@ class CourseItemNewView : ConstraintLayout {
iv_play.setOnClickListener {
playMedia()
ActionCountUtils.count(CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_AUDITION_CLICK, course.id)
ActionCountUtils.count(
CourseBIConstants.CourseListEvent.POSITION_COURSE_LIST_AUDITION_CLICK,
course.id
)
}
tv_view_course.setOnClickListener {
if (TextUtils.equals(course.courseType, "1") || TextUtils.equals(course.courseType, "7") || TextUtils.equals(course.courseType, "6")) {
if (TextUtils.equals(course.courseType, "1") || TextUtils.equals(
course.courseType,
"7"
) || TextUtils.equals(course.courseType, "6")
) {
ARouter.getInstance()
.build("/course/play")
.withInt("course_id", course.id.toInt())
......@@ -164,7 +170,11 @@ class CourseItemNewView : ConstraintLayout {
}
}
if (TextUtils.equals("1", course.isPromotion) || TextUtils.equals("3", course.isPromotion)) {
if (TextUtils.equals("1", course.isPromotion) || TextUtils.equals(
"3",
course.isPromotion
)
) {
tv_cu_xiao.visibility = View.VISIBLE
if (TextUtils.equals("1", course.isPromotion)) {
if (course.promotionApplyFee.contains(".")) {
......@@ -181,7 +191,11 @@ class CourseItemNewView : ConstraintLayout {
if (course.isBuy) {
tv_view_course.visibility = View.VISIBLE
if (TextUtils.equals(course.courseType, "1") || TextUtils.equals(course.courseType, "7") || TextUtils.equals(course.courseType, "6")) {
if (TextUtils.equals(course.courseType, "1") || TextUtils.equals(
course.courseType,
"7"
) || TextUtils.equals(course.courseType, "6")
) {
tv_view_course.text = "立即听课"
} else {
tv_view_course.text = "查看课程"
......@@ -201,7 +215,14 @@ class CourseItemNewView : ConstraintLayout {
tv_price_decimal.visibility = View.VISIBLE
if (TextUtils.isEmpty(course.originalApplyFee) || TextUtils.equals(course.originalApplyFee, "0") || TextUtils.equals(course.originalApplyFee, "0.0") || TextUtils.equals(course.originalApplyFee, "0.00")) {
if (TextUtils.isEmpty(course.originalApplyFee) || TextUtils.equals(
course.originalApplyFee,
"0"
) || TextUtils.equals(
course.originalApplyFee,
"0.0"
) || TextUtils.equals(course.originalApplyFee, "0.00")
) {
tv_original_price.visibility = View.GONE
} else {
tv_original_price.visibility = View.VISIBLE
......@@ -221,20 +242,19 @@ class CourseItemNewView : ConstraintLayout {
PlayerFloatHelper.removeView(mContext)
}
val music=Music()
music.title=course.title
music.artist=doctorName
music.coverPath=if (!TextUtils.isEmpty(course.image)) course.image else course.pic
val music = Music()
music.title = course.title
music.artist = doctorName
music.coverPath = if (!TextUtils.isEmpty(course.image)) course.image else course.pic
PlayerFloatHelper.isCanClick = false
if (course.demoType == 1) {
PlayerFloatHelper.playingType=PlayTypeEnum.PLAY_TYPE_COURSE
music.path=course.demoFile
music.path = course.demoFile
val hashMap = HashMap<String, String>()
hashMap["course_id"] =course.id.toString()
PlayerFloatHelper.playTempData.clear()
hashMap["course_id"] = course.id.toString()
AudioPlayer.get().singlePlay(music)
PlayerFloatHelper.show(
mContext,
......
m-course/src/main/java/com/yidianling/course/widget/HPlayView.kt
......@@ -249,8 +249,8 @@ class HPlayView : RelativeLayout, OnPlayerEventListener {
}
fun onDestroy() {
AudioPlayer.get().removeOnPlayEventListener(this)
mContext = null
mHandler = null
AudioPlayer.get().removeOnPlayEventListener(this)
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/widget/SearchBarView.kt
......@@ -9,6 +9,7 @@ import android.util.AttributeSet
import android.view.Gravity
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.LinearLayout
import android.widget.TextView
import com.ydl.ydl_router.manager.YDLRouterManager
......@@ -157,6 +158,11 @@ class SearchBarView : LinearLayout {
searchCallBack = mSearchCallback
}
fun getEditText():EditText{
return common_search_bar_edit_text
}
interface SearchCallBack {
fun clickSearchBtn(str: String) //设置监听（跳转逻辑已在组件内部实现，该方法主要用于回调点击键盘搜索按钮事件）
......
m-course/src/main/res/layout/activity_courses.xml
......@@ -5,38 +5,37 @@
android:layout_height="match_parent"
android:background="@color/white"
android:fitsSystemWindows="true"
android:orientation="vertical"
>
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="44dp"
android:background="@color/course_color_FFFFFF"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="16dp">
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="13dp"
android:layout_height="22dp"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:padding="15dp"
android:scaleType="centerCrop"
android:src="@drawable/course_icon_back_black" />
<com.yidianling.course.widget.SearchBarView
android:id="@+id/search_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
</LinearLayout>
<View
android:id="@+id/divider_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#f0f0f0"/>
android:background="#f0f0f0" />
<LinearLayout
......@@ -54,7 +53,7 @@
android:text="综合排序"
android:textColor="@color/main_theme"
android:textSize="14sp"
android:textStyle="bold"/>
android:textStyle="bold" />
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/classify_layout"
......@@ -65,7 +64,7 @@
android:gravity="center"
android:text="分类"
android:textColor="@color/course_color_242424"
android:textSize="14sp"/>
android:textSize="14sp" />
<com.ydl.ydlcommon.view.DrawableRightTextView
android:id="@+id/filter_layout"
......@@ -76,7 +75,7 @@
android:gravity="center"
android:text="筛选"
android:textColor="@color/course_color_242424"
android:textSize="14sp"/>
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
......@@ -86,20 +85,20 @@
android:orientation="horizontal"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingBottom="10dp"/>
android:paddingBottom="10dp" />
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#f0f0f0"/>
android:background="#f0f0f0" />
<com.yidianling.course.widget.CouponHintView
android:id="@+id/hint_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
......@@ -121,7 +120,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@color/course_color_EDEDED"
android:dividerHeight="0dp"/>
android:dividerHeight="0dp" />
<ImageView
android:id="@+id/iv_course_list_empty_view"
......@@ -130,7 +129,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="50dp"
android:src="@drawable/course_blank"
android:visibility="gone"/>
android:visibility="gone" />
<TextView
android:id="@+id/tv_course_list_empty_prompt"
......@@ -140,14 +139,14 @@
android:layout_marginTop="14dp"
android:text="暂无相应记录"
android:textColor="#b2b2b2"
android:visibility="gone"/>
android:visibility="gone" />
<com.ydl.ydlcommon.ui.LogoLoadingView
android:id="@+id/v_loading"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
android:visibility="gone" />
</in.srain.cube.views.loadmore.LoadMoreListViewContainer>
......@@ -160,7 +159,7 @@
android:layout_height="match_parent"
android:alpha="0.4"
android:background="@android:color/black"
android:visibility="gone"/>
android:visibility="gone" />
</FrameLayout>
</LinearLayout>
m-course/src/main/res/layout/course_filter_popup_window.xml
......@@ -51,7 +51,7 @@
android:background="@drawable/course_filter_select_nor"
android:gravity="center"
android:orientation="vertical"
android:text="免费"
android:text="10元体验"
android:textColor="@color/course_color_242424"
android:textSize="14dp" />
......
m-fm/src/main/java/com/yidianling/fm/FMDetailActivity.java
......@@ -416,6 +416,7 @@ public class FMDetailActivity extends BaseActivity implements View.OnClickListen
}
LogUtil.d("fmDetail.id not equal " + fmDetail.getId());
HashMap<String,String> map = new HashMap();
PlayerFloatHelper.Companion.getPlayTempData().clear();
map.put("fmId", String.valueOf(fmDetail.getId()));
map.put("fmTitle", String.valueOf(fmDetail.getTitle()));
map.put("fmAuthor", String.valueOf(fmDetail.getAuthor()));
......
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