Commit cbb6b083 by 刘鹏

feat : 信息收集卡问题修复

parent bf46ed07
......@@ -10,7 +10,7 @@ ext {
"m-fm" : "0.0.30.04",
"m-user" : "0.0.61.94",
"m-home" : "0.0.22.92",
"m-im" : "0.0.21.11",
"m-im" : "0.0.21.13",
"m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.10",
......@@ -93,7 +93,7 @@ ext {
"m-fm" : "0.0.30.07",
"m-user" : "0.0.61.94",
"m-home" : "0.0.22.92",
"m-im" : "0.0.21.11",
"m-im" : "0.0.21.13",
"m-dynamic" : "0.0.7.35",
"m-article" : "0.0.0.8",
......
......@@ -87,8 +87,9 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
private var location: Int = 0
private var ffrom2: String? = null
/**单选类型*/
private const val RADIO_KEY="radio"
private const val RADIO_KEY = "radio"
@JvmStatic
fun start(context: Context, toUid: String, expertInfo: IMExpertBuild, isFromQingShu: Int) {
......@@ -98,7 +99,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
this.isFromQingShu = isFromQingShu
context.startActivity(starter)
val activity = context as Activity
activity.overridePendingTransition(R.anim.platform_activity_anim_in,R.anim.platform_activity_anim_in)
activity.overridePendingTransition(
R.anim.platform_activity_anim_in,
R.anim.platform_activity_anim_in
)
}
@JvmStatic
......@@ -325,6 +329,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
}
}
}
/**
* 最后一题
* */
......@@ -351,6 +356,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
mData[index].type5CanClick = false
}
}
/**
* 隐藏输入框
* */
......@@ -408,7 +414,7 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
//还有下一题
questionMultiItem2.questionsBean = questionsBean
if (RADIO_KEY == questionsBean.type) {
if (!questionsBean.image.isNullOrEmpty() || !questionsBean.url.isNullOrEmpty()) {
if (!TextUtils.isEmpty(questionsBean.image) || !TextUtils.isEmpty(questionsBean.url)) {
tv_skip.visibility = View.GONE
questionMultiItem2.viewType = 7
} else {
......@@ -593,10 +599,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
val questionsBean = mQuestionBean!!.questionPaper.questions[questionChain.questionId]
questionMultiItem2.questionsBean = questionsBean
if (RADIO_KEY == questionsBean?.type) {
if(!questionsBean.image.isNullOrEmpty()||!questionsBean.url.isNullOrEmpty()){
if (!TextUtils.isEmpty(questionsBean.image) || !TextUtils.isEmpty(questionsBean.url)) {
tv_skip.visibility = View.GONE
questionMultiItem2.viewType = 7
}else{
} else {
questionMultiItem2.viewType = 3
}
} else {
......@@ -899,7 +905,10 @@ class CmsExamQuestionPaperActivity : BaseActivity() {
override fun finish() {
super.finish()
overridePendingTransition(R.anim.platform_activity_anim_in,R.anim.platform_activity_anim_in)
overridePendingTransition(
R.anim.platform_activity_anim_in,
R.anim.platform_activity_anim_in
)
}
}
\ No newline at end of file
......@@ -99,7 +99,7 @@ public class QuestionAdapter extends BaseMultiItemQuickAdapter<QuestionMultiItem
break;
case 6:
convertType6(helper, item);
break;
case 7:
helper.setText(R.id.multiple_type7_title, item.questionsBean.name);
ImageView image = helper.getView(R.id.image);
......
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