Commit aa52679c by konghaorui

1. 修复课程分类页面4.x版本崩溃问题

2. 修复客户信息手机页面索引越界问题
3. 修复私聊补充手机号码跳转失效问题
4. 补充课程分类页面、课程搜索页面沉浸式状态栏
parent f4996342
...@@ -47,12 +47,12 @@ ext { ...@@ -47,12 +47,12 @@ ext {
"m-fm" : "0.0.24", "m-fm" : "0.0.24",
"m-user" : "0.0.42", "m-user" : "0.0.42",
"m-home" : "0.0.8.2", "m-home" : "0.0.8.2",
"m-im" : "0.0.4.3", "m-im" : "0.0.4.4",
"m-dynamic" : "0.0.2.1", "m-dynamic" : "0.0.2.1",
"m-muse" : "0.0.21", "m-muse" : "0.0.21",
"m-tests" : "0.0.16", "m-tests" : "0.0.16",
"m-course" : "0.0.35", "m-course" : "0.0.35.1",
//-------------- 业务模块 API 层 -------------- //-------------- 业务模块 API 层 --------------
"m-audioim-api" : "0.0.5", "m-audioim-api" : "0.0.5",
......
...@@ -38,10 +38,14 @@ ...@@ -38,10 +38,14 @@
<activity <activity
android:name=".courseNew.courseList.CourseListContainerActivity" android:name=".courseNew.courseList.CourseListContainerActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" /> android:theme="@style/platform_NoTitleTheme" />
<activity android:name=".courseNew.CourseTopicActivity" />
<activity android:name=".courseNew.CourseTopicActivity"
android:theme="@style/platform_NoTitleTheme"
/>
<activity android:name=".courseSearch.CourseSearchActivity" <activity android:name=".courseSearch.CourseSearchActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/platform_NoTitleTheme"
/> />
<activity <activity
android:name=".courseNew.mine.MyCourseActivity" android:name=".courseNew.mine.MyCourseActivity"
......
...@@ -15,13 +15,14 @@ import com.alibaba.android.arouter.facade.annotation.Route ...@@ -15,13 +15,14 @@ import com.alibaba.android.arouter.facade.annotation.Route
import com.ydl.ydl_image.module.GlideApp import com.ydl.ydl_image.module.GlideApp
import com.ydl.ydlcommon.actions.share.ShareUtils import com.ydl.ydlcommon.actions.share.ShareUtils
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils import com.ydl.ydlcommon.data.http.RxUtils
import com.yidianling.common.tools.LogUtil import com.yidianling.common.tools.LogUtil
import com.yidianling.common.tools.RxNetTool import com.yidianling.common.tools.RxNetTool
import com.yidianling.course.R import com.yidianling.course.R
import com.yidianling.course.net.CourseRetrofitUtils
import com.yidianling.course.bean.Course import com.yidianling.course.bean.Course
import com.yidianling.course.model.TopicCourseBean import com.yidianling.course.model.TopicCourseBean
import com.yidianling.course.net.CourseRetrofitUtils
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_course_topic.* import kotlinx.android.synthetic.main.activity_course_topic.*
...@@ -40,7 +41,9 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa ...@@ -40,7 +41,9 @@ class CourseTopicActivity : BaseActivity(), View.OnClickListener, SwipeRefreshLa
private var headView: ImageView? = null private var headView: ImageView? = null
private var footerView: View? = null private var footerView: View? = null
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
companion object { companion object {
fun start(context: Context, id: String) { fun start(context: Context, id: String) {
val i = Intent(context, CourseTopicActivity::class.java) val i = Intent(context, CourseTopicActivity::class.java)
......
...@@ -13,6 +13,7 @@ import android.graphics.Typeface ...@@ -13,6 +13,7 @@ import android.graphics.Typeface
import android.support.v4.content.ContextCompat import android.support.v4.content.ContextCompat
import android.text.TextUtils import android.text.TextUtils
import android.view.View import android.view.View
import android.widget.AbsListView
import android.widget.AdapterView import android.widget.AdapterView
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
...@@ -21,6 +22,7 @@ import com.ydl.webview.H5Params ...@@ -21,6 +22,7 @@ import com.ydl.webview.H5Params
import com.ydl.webview.NewH5Activity import com.ydl.webview.NewH5Activity
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.ShareData import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.RxUtils import com.ydl.ydlcommon.data.http.RxUtils
import com.ydl.ydlcommon.ui.LogoLoadingView import com.ydl.ydlcommon.ui.LogoLoadingView
import com.ydl.ydlcommon.utils.NetworkParamsUtils import com.ydl.ydlcommon.utils.NetworkParamsUtils
...@@ -78,6 +80,10 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -78,6 +80,10 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
//热门筛选数据 //热门筛选数据
private var hotSearchList = ArrayList<CourseCategoryBean>() private var hotSearchList = ArrayList<CourseCategoryBean>()
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
companion object { companion object {
const val PARAMS_LISTTYPE = "listType" const val PARAMS_LISTTYPE = "listType"
const val PARAMS_ISFREE = "isFree" const val PARAMS_ISFREE = "isFree"
...@@ -158,7 +164,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler ...@@ -158,7 +164,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
val header = MaterialHeader(this) val header = MaterialHeader(this)
val colors = resources.getIntArray(R.array.course_colors) val colors = resources.getIntArray(R.array.course_colors)
header.setColorSchemeColors(colors) header.setColorSchemeColors(colors)
header.layoutParams = PtrFrameLayout.LayoutParams(-1, -2) header.layoutParams = AbsListView.LayoutParams(-1, -2)
val padding = resources.getDimension(R.dimen.default_dis_size).toInt() val padding = resources.getDimension(R.dimen.default_dis_size).toInt()
header.setPadding(0, padding, 0, padding) header.setPadding(0, padding, 0, padding)
header.setPtrFrameLayout(store_house_ptr_frame) header.setPtrFrameLayout(store_house_ptr_frame)
......
...@@ -15,6 +15,7 @@ import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener ...@@ -15,6 +15,7 @@ import com.ydl.ydl_image.listener.YDLImageRecyclerOnScrollListener
import com.ydl.ydl_image.manager.YDLImageCacheManager import com.ydl.ydl_image.manager.YDLImageCacheManager
import com.ydl.ydlcommon.base.BaseActivity import com.ydl.ydlcommon.base.BaseActivity
import com.ydl.ydlcommon.bean.ShareData import com.ydl.ydlcommon.bean.ShareData
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.data.http.ThrowableConsumer import com.ydl.ydlcommon.data.http.ThrowableConsumer
import com.ydl.ydlcommon.router.IYDLRouterConstant import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.yidianling.common.tools.RxKeyboardTool import com.yidianling.common.tools.RxKeyboardTool
...@@ -50,7 +51,9 @@ class CourseSearchActivity : BaseActivity(), CourseSearchAdapter.OnItemClick, IC ...@@ -50,7 +51,9 @@ class CourseSearchActivity : BaseActivity(), CourseSearchAdapter.OnItemClick, IC
private var courseSearchAdapter: CourseSearchAdapter? = null private var courseSearchAdapter: CourseSearchAdapter? = null
private var courseSearchAdapterWrapper: CourseSearchAdapterWrapper? = null private var courseSearchAdapterWrapper: CourseSearchAdapterWrapper? = null
override fun getStatusViewOptions(): StatusBarOptions {
return StatusBarOptions(isAddStatusView = true, statusBarDarkMode = true)
}
override fun layoutResId(): Int { override fun layoutResId(): Int {
return R.layout.activity_course_search return R.layout.activity_course_search
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white" android:background="@color/white"
android:fitsSystemWindows="true"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
......
...@@ -258,7 +258,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler { ...@@ -258,7 +258,7 @@ public class P2PCustomActionHandlerImpl implements IP2PCustomActionHandler {
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
activity.startActivity(ImIn.INSTANCE.inputPhoneIntent(activity, ImConstants.BIND_PHONE)); activity.startActivity(ImIn.INSTANCE.inputPhoneIntent(activity, ImConstants.BIND_PHONE_ACTION));
dialog.dismiss(); dialog.dismiss();
} }
}); });
......
...@@ -119,28 +119,30 @@ class CollectUserInformationView(var mContext: Context, var skipEvent: () -> Uni ...@@ -119,28 +119,30 @@ class CollectUserInformationView(var mContext: Context, var skipEvent: () -> Uni
}, 300) }, 300)
} }
if (list.size >= 3){
val adapter = CollectInfoStyleAdapter(list[3].answerList!!) {
addContentView(it, false)
rl_question_style.postDelayed({
questionStyleStr = "咨询类型:${it}"
val adapter = CollectInfoStyleAdapter(list[3].answerList!!) { addContentView(resultInfoList[currentIndex].question!!, true, resultInfoList[currentIndex].answerList!![0])
addContentView(it, false) rl_question_style.visibility = View.GONE
rl_question_style.postDelayed({ ll_input.visibility = View.VISIBLE
questionStyleStr = "咨询类型:${it}"
addContentView(resultInfoList[currentIndex].question!!, true, resultInfoList[currentIndex].answerList!![0]) rl_question_style.postDelayed({ showInputMethod(et_input) }, 100)
rl_question_style.visibility = View.GONE
ll_input.visibility = View.VISIBLE
rl_question_style.postDelayed({ showInputMethod(et_input) }, 100) scrollView.postDelayed({
scrollView.postDelayed({ scrollView.fullScroll(ScrollView.FOCUS_DOWN)
}, 300)
scrollView.fullScroll(ScrollView.FOCUS_DOWN)
}, 300) }, 300)
}, 300) }
val layoutManager = GridLayoutManager(mContext, 3)
rl_question_style.layoutManager = layoutManager
rl_question_style.adapter = adapter
}else{
rl_question_style.visibility = View.GONE
} }
val layoutManager = GridLayoutManager(mContext, 3)
rl_question_style.layoutManager = layoutManager
rl_question_style.adapter = adapter
tv_send.setOnClickListener { tv_send.setOnClickListener {
val content = et_input.text.trim().toString() val content = et_input.text.trim().toString()
......
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