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

Merge remote-tracking branch 'origin/dev_robotaxi-d_230711_3.4.0' into dev_robotaxi-d_230711_3.4.0

Browse Source
This commit is contained in:
yangyakun
2023-07-26 21:16:34 +08:00
parent d3b527d3d7 f10ed237a5
commit c52d83596e
7 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
View File

@@ -18,17 +18,17 @@
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="@dimen/dp_27"
android:layout_height="@dimen/dp_27"
android:layout_marginStart="@dimen/dp_95"
android:layout_marginTop="@dimen/dp_35"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_89"
android:layout_marginTop="@dimen/dp_29"
android:src="@drawable/iv_light_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
<SeekBar
android:id="@+id/sb_light_bar"
android:layout_width="@dimen/dp_376"
android:layout_width="@dimen/dp_380"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_141"
android:layout_marginTop="@dimen/dp_24"
@@ -41,10 +41,10 @@
app:layout_constraintWidth_percent="0.253" />
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginStart="@dimen/dp_535"
android:layout_marginTop="@dimen/dp_32"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_531"
android:layout_marginTop="@dimen/dp_28"
android:src="@drawable/iv_light_increase_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
@@ -75,17 +75,17 @@
app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
<ImageView
android:layout_width="@dimen/dp_27"
android:layout_height="@dimen/dp_27"
android:layout_marginStart="@dimen/dp_95"
android:layout_marginTop="@dimen/dp_35"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_89"
android:layout_marginTop="@dimen/dp_29"
android:src="@drawable/iv_voice_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />
<SeekBar
android:id="@+id/sb_voice_bar"
android:layout_width="@dimen/dp_376"
android:layout_width="@dimen/dp_380"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_141"
android:layout_marginTop="@dimen/dp_24"
@@ -98,10 +98,10 @@
app:layout_constraintWidth_percent="0.253" />
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginStart="@dimen/dp_535"
android:layout_marginTop="@dimen/dp_32"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_531"
android:layout_marginTop="@dimen/dp_28"
android:src="@drawable/iv_voice_increase_set"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSettingSound" />

5
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.core
import android.content.Context
import android.os.Handler
import android.os.HandlerThread
import android.os.Looper
import com.mogo.eagle.core.data.biz.trafficlight.RoadIDResult
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightControl
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
@@ -49,10 +50,8 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
fun initServer(context: Context) {
mContext = context
CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
val thread = HandlerThread("v2x_traffic_light")
thread.start()
mThreadHandler =
TrafficLightThreadHandler(thread.looper, {
TrafficLightThreadHandler(Looper.getMainLooper(), {
//第一次查询路口时，如果红绿灯显示，则隐藏掉
if (firstLoopCrossRoad) {
CallerTrafficLightListenerManager.resetTrafficLightStatus()

2
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt
View File

@@ -192,7 +192,7 @@ internal class MoFangCommandExecutor {
handler.removeMessages(MSG_WHAT_KEY_CODE_AL)
handler.sendMessage(Message.obtain().also {
it.what = MSG_WHAT_KEY_CODE_A
it.obj = -1.0
it.obj = -1.2
})
linkedLog?.record(mapOf("发送[A]:${System.currentTimeMillis()}" to "${whatToString(MSG_WHAT_KEY_CODE_A)}"))
}

3
core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/RequestOptions.java
View File

@@ -2,6 +2,7 @@ package com.mogo.eagle.core.network;
import android.content.Context;
import android.view.KeyEvent;
import com.mogo.eagle.core.network.utils.Util;
@@ -96,7 +97,7 @@ public class RequestOptions {
}
public Object getCaller() {
return caller;
return caller == null ? null : caller;
}
public Context getContext() {

2
core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java
View File

@@ -28,7 +28,7 @@ public abstract class SubscribeImpl<T extends BaseData> implements Observer<T> {
}
private void onFinish() {
if (!Util.checkAlive(mRequestOptions.getCaller())) {
if (Util.checkAlive(mRequestOptions.getCaller())) {
}
}

37
core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
View File

@@ -15,30 +15,37 @@ import com.mogo.eagle.core.network.CallerNotAliveException;
public class Util {
public static boolean checkAlive( Object caller ) {
if ( caller instanceof Activity) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ? !( ( Activity ) caller ).isDestroyed() : !( ( Activity ) caller ).isFinishing();
} else if ( caller instanceof Fragment) {
return ( ( Fragment ) caller ).isAdded();
} else if ( caller instanceof androidx.fragment.app.Fragment ) {
return ( ( androidx.fragment.app.Fragment ) caller ).isAdded();
} else if ( caller instanceof View) {
return true;
} else if ( caller instanceof Dialog) {
return ( ( Dialog ) caller ).getWindow() != null;
} else if ( caller instanceof PopupWindow) {
return ( ( PopupWindow ) caller ).getContentView() != null;
public static boolean checkAlive(Object caller ) {
if ( caller == null){
return false;
}
if ( caller instanceof Activity) {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ? ((Activity) caller).isDestroyed() : ((Activity) caller).isFinishing();
} else if ( caller instanceof Fragment) {
return !((Fragment) caller).isAdded();
} else if ( caller instanceof androidx.fragment.app.Fragment ) {
return !((androidx.fragment.app.Fragment) caller).isAdded();
} else if ( caller instanceof View) {
return false;
} else if ( caller instanceof Dialog) {
return ((Dialog) caller).getWindow() == null;
} else if ( caller instanceof PopupWindow) {
return ((PopupWindow) caller).getContentView() == null;
} else {
return false;
}
return caller != null;
}
public static void assertCallerAlive( Object caller ) throws CallerNotAliveException {
if ( !checkAlive( caller ) ) {
if (checkAlive(caller)) {
throw new CallerNotAliveException( "Caller is not alive any more" );
}
}
public static Context getContext(Object object ) {
if( object == null){
return null;
}
if ( object instanceof Activity ) {
return ( Activity ) object;
} else if ( object instanceof Fragment ) {

2
gradle.properties
View File

@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.7.11
MOGO_TELEMATIC_VERSION=1.4.7.11
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.14.1.2
MAP_SDK_VERSION=2.14.1.5
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7