Commit e4ed9b43 by 霍志良

Merge remote-tracking branch 'origin/4.2.60' into 4.2.60

parents 27252586 f76b4ad7
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
<activity <activity
android:name=".ui.activity.CmsExamQuestionPaperActivity" android:name=".ui.activity.CmsExamQuestionPaperActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:launchMode="singleTask"
android:theme="@style/platform_NoTitleTheme" /> android:theme="@style/platform_NoTitleTheme" />
<!-- 云信 集成配置 --> <!-- 云信 集成配置 -->
......
...@@ -87,6 +87,7 @@ object IMChatUtil { ...@@ -87,6 +87,7 @@ object IMChatUtil {
/** /**
* 跳转前置信息收集页 * 跳转前置信息收集页
* 悬浮导医进来的
* */ * */
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
fun startCms(context: Activity, location: Int, ffrom2: String?) { fun startCms(context: Activity, location: Int, ffrom2: String?) {
......
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