yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_robotaxi-d-app-module_265_220329_2.6.5' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_265_220329_2.6.5

Browse Source
This commit is contained in:
wangmingjun
2022-04-01 18:20:33 +08:00
parent 3f456f6aa4 1fc3c0a0e9
commit 552febaab8
4 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/media/MedialControlFacade.kt
View File

@@ -55,6 +55,8 @@ internal object MedialControlFacade : IMoGoMediaFacade {
}
} catch (t: Throwable) {
log(ChatConsts.TAG, "释放MediaPlay异常: $t")
} finally {
player.set(null)
}
}

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
View File

@@ -13,7 +13,7 @@ import android.transition.Slide
import android.util.TypedValue
import android.view.*
import android.view.WindowManager.LayoutParams
import android.view.animation.OvershootInterpolator
import android.view.animation.AccelerateDecelerateInterpolator
import android.widget.PopupWindow
import android.widget.PopupWindow.INPUT_METHOD_NEEDED
import android.widget.TextView
@@ -116,8 +116,8 @@ internal fun Context.pop(content: View, width: Int, height: Int, key: String, on
}
if (VERSION.SDK_INT >= VERSION_CODES.M) {
val transition = Slide(Gravity.START).also {
it.interpolator = OvershootInterpolator()
it.duration = 300
it.interpolator = AccelerateDecelerateInterpolator()
it.duration = 200
}
pop.enterTransition = transition
pop.exitTransition = transition

11
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -492,8 +492,6 @@ class DebugSettingView @JvmOverloads constructor(
}
}
//TODO 选中背景
// 演示模式,上一次勾选的数据
tbIsDemoMode.isChecked = FunctionBuildConfig.isDemoMode
@@ -597,11 +595,14 @@ class DebugSettingView @JvmOverloads constructor(
}catch (e: Exception){
ToastUtils.showShort("判定刹车加速度阈值格式设置不正确")
}
}
}
//设置连接司机屏IP
btnConnectServerIp.setOnClickListener {
//TODO 连接设置 输入框：etConnectServerIp
}
}
/**

45
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -458,8 +458,8 @@
android:background="@drawable/setting_toggle_button_background"
android:drawableEnd="@drawable/icon_right"
android:padding="@dimen/dp_20"
android:textOff="鹰眼参数配置"
android:textOn="鹰眼参数配置" />
android:textOff="鹰眼本地配置"
android:textOn="鹰眼本地配置" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/eagleEyeControllerLayout"
@@ -517,6 +517,47 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:id="@+id/brakeThresholdDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F0F0F0"
app:layout_constraintTop_toBottomOf="@id/btnBrakeThreshold"
/>
<Button
android:id="@+id/btnConnectServerIp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="@dimen/dp_5"
android:text="连接司机屏IP"
android:textSize="@dimen/dp_24"
android:paddingStart="@dimen/dp_20"
android:paddingEnd="@dimen/dp_20"
app:layout_constraintTop_toBottomOf="@id/brakeThresholdDivider"
app:layout_constraintLeft_toLeftOf="parent"
/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/etConnectServerIp"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_20"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/debug_setting_edit_bg"
android:gravity="center"
android:hint="请输入司机屏IP"
android:textColor="#1A1A1A"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="@id/btnConnectServerIp"
app:layout_constraintTop_toTopOf="@id/btnConnectServerIp"
app:layout_constraintLeft_toRightOf="@id/btnConnectServerIp"
app:layout_constraintRight_toRightOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<ToggleButton