From d1a9e3312387b6c47e6186af506787a8a66369d1 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期六, 09 十一月 2024 18:40:36 +0800
Subject: [PATCH] fix
---
app/src/main/java/com/sinata/xqmuse/ui/course/CourseDetailActivity.kt | 67 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/course/CourseDetailActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/course/CourseDetailActivity.kt
index 49a60fb..8f046b2 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/course/CourseDetailActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/course/CourseDetailActivity.kt
@@ -1,5 +1,6 @@
package com.sinata.xqmuse.ui.course
+import android.content.Intent
import android.os.CountDownTimer
import android.util.TypedValue
import android.webkit.WebChromeClient
@@ -13,9 +14,11 @@
import cn.sinata.xldutils.utils.showAllowingStateLoss
import cn.sinata.xldutils.visible
import com.google.android.material.appbar.AppBarLayout
+import com.share.utils.ShareUtils
import com.sinata.xqmuse.R
import com.sinata.xqmuse.dialog.SendConfirmDialog
import com.sinata.xqmuse.dialog.ShareDialog
+import com.sinata.xqmuse.network.Apis
import com.sinata.xqmuse.network.HttpManager
import com.sinata.xqmuse.network.entity.Chapter
import com.sinata.xqmuse.network.entity.CourseBean
@@ -26,17 +29,9 @@
import com.sinata.xqmuse.ui.course.adapter.CourseGridAdapter
import com.sinata.xqmuse.utils.AppBarStateChangeListener
import com.sinata.xqmuse.utils.interfaces.StringCallback
-import kotlinx.android.synthetic.main.activity_buy_course.*
+import com.umeng.socialize.bean.SHARE_MEDIA
import kotlinx.android.synthetic.main.activity_course_deatil.*
-import kotlinx.android.synthetic.main.activity_course_deatil.iv_cover
-import kotlinx.android.synthetic.main.activity_course_deatil.tv_1
-import kotlinx.android.synthetic.main.activity_course_deatil.tv_action
-import kotlinx.android.synthetic.main.activity_course_deatil.tv_count
-import kotlinx.android.synthetic.main.activity_course_deatil.tv_name
-import kotlinx.android.synthetic.main.activity_course_deatil.tv_teacher
-import org.jetbrains.anko.imageResource
-import org.jetbrains.anko.startActivity
-import org.jetbrains.anko.textColorResource
+import org.jetbrains.anko.*
class CourseDetailActivity : TransparentStatusBarActivity() {
override fun setContentView() = R.layout.activity_course_deatil
@@ -60,19 +55,34 @@
}
tv_action.setOnClickListener {
- getData(false)
+ if (tv_action.text == "立即学习"){
+ if (data?.list?.isNullOrEmpty() == true)
+ toast("章节有误")
+ else
+ startActivity<StudyActivity>("id" to data?.list?.firstOrNull()?.id)
+ } else
+ getData(false)
}
iv_collect.setOnClickListener {
HttpManager.collectCourse(data?.id?:"").request(this){_,_->
data?.recommend = if (data?.recommend == 1) 2 else 1
iv_collect.setImageResource(if (data?.recommend == 1) R.mipmap.collected else R.mipmap.uncollect)
+ toast(if (data?.recommend == 1) "收藏成功" else "已取消收藏")
}
}
iv_share.setOnClickListener {
val shareDialog = ShareDialog()
shareDialog.callback = object :StringCallback{
override fun onResult(rst: String) {
-
+ if (rst == "wx"){
+ ShareUtils.share(this@CourseDetailActivity,
+ SHARE_MEDIA.WEIXIN,data?.courseTitle,"分享你一个课程",
+ Apis.SHARE_COURSE.format(data?.id),null,"")
+ }else{
+ ShareUtils.share(this@CourseDetailActivity,
+ SHARE_MEDIA.WEIXIN_CIRCLE,data?.courseTitle,"分享你一个课程",
+ Apis.SHARE_COURSE.format(data?.id),null,"")
+ }
}
}
shareDialog.showAllowingStateLoss(supportFragmentManager,"share")
@@ -98,7 +108,19 @@
}
}
chapterAdapter.setOnItemClickListener { view, position ->
- getData(false)
+ if (tv_action.text == "立即学习")
+ startActivity<StudyActivity>("id" to data?.list?.get(position)?.id,"index" to position)
+ else
+ getData(false)
+ }
+ courseAdapter.setOnItemClickListener { view, position ->
+ showDialog()
+ HttpManager.getPayCourseInfoById(courseList[position].id?:"").request(this,success = { _, data->
+ dismissDialog()
+ data?.goDetail(this)
+ }){_,_->
+ dismissDialog()
+ }
}
}
@@ -141,7 +163,7 @@
data?.apply {
iv_collect.setImageResource(if (data?.recommend == 1) R.mipmap.collected else R.mipmap.uncollect)
- iv_cover.setImageURI(detailUrl)
+ iv_cover.setImageURI(coverUrl)
tv_name.text = courseTitle
tv_teacher.text = "导师 ${tutor}"
tv_count.text = "${count}人已加入学习"
@@ -158,11 +180,12 @@
chapterAdapter.notifyDataSetChanged()
courseList.addAll(list2)
courseAdapter.notifyDataSetChanged()
-
- if (chargeType == 1||(courseType == 2&&isVip == 1)){
+ if (chargeType == 3)
+ tv_send.visible()
+ if (chargeType == 1||isBuy == 1||(chargeType == 2&&isVip == 1)){
tv_action.text = "立即学习"
}else{
- val s = "¥ %s 立即购买".format(generalPrice)
+ val s = "¥ %s 立即购买".format(generalPrice!!)
tv_action.text = SpanBuilder(s).size(0,1,12).size(2,generalPrice.length+2,21).build()
}
}
@@ -240,7 +263,15 @@
}
})
}else
- startActivity<BuyCourseActivity>("isSend" to isSend,"data" to data)
+ startActivityForResult<BuyCourseActivity>(1,"isSend" to isSend,"data" to data)
+ }
+ }
+
+ override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+ super.onActivityResult(requestCode, resultCode, data)
+ if (resultCode == RESULT_OK){
+ this.data?.isBuy = 1
+ tv_action.text = "立即学习"
}
}
}
--
Gitblit v1.7.1