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

Merge branch 'ui' into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source
This commit is contained in:
liujing
2022-05-25 16:35:49 +08:00
parent 388fad0c7a 64da728f9f
commit 9c1f775569
3 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.java
View File

@@ -67,6 +67,7 @@ public class SteeringWheelView extends ConstraintLayout {
initView();
CallerAutoPilotStatusListenerManager.INSTANCE.addListener(TAG, mGoAutopilotStatusListener);
CallerAutopilotVehicleStateListenerManager.INSTANCE.addListener(TAG, mIMoGoAutopilotVehicleStateListener);
tapPositionView.updateWithGear(Chassis.GearPosition.GEAR_R);
}
private void initView() {
@@ -180,7 +181,7 @@ public class SteeringWheelView extends ConstraintLayout {
} else if (steeringTVR != null && steering <= 0) {
steeringTVL.setVisibility(View.INVISIBLE);
steeringTVR.setVisibility(View.VISIBLE);
steeringTVR.setText(String.valueOf((int) steering) + "°");
steeringTVR.setText(String.valueOf((int) -steering) + "°");
} else {
Log.d(TAG, "onAutopilotSteeringData error");
}

114
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TapPositionView.java
View File

@@ -11,7 +11,9 @@ import android.widget.TextView;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.function.hmi.R;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import org.jetbrains.annotations.NotNull;
@@ -41,40 +43,86 @@ public class TapPositionView extends ConstraintLayout {
public void updateWithGear(@NotNull Chassis.GearPosition gear) {
if (tabP != null && tabR != null && tabN != null && tabD != null) {
switch (gear) {
case GEAR_NONE:
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_P:
tabP.setTextColor(Color.parseColor("#FFFFFFFF"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_R:
tabR.setTextColor(Color.parseColor("#FFFFFFFF"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_N:
tabN.setTextColor(Color.parseColor("#FFFFFFFF"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_D:
tabD.setTextColor(Color.parseColor("#FFFFFFFF"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
default:
break;
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
taxiGear(gear);
} else {
busGear(gear);
}
}
}
private void busGear(@NotNull Chassis.GearPosition gear) {
switch (gear) {
case GEAR_NONE:
tabP.setTextColor(Color.parseColor("#6E8EC9"));
tabR.setTextColor(Color.parseColor("#6E8EC9"));
tabN.setTextColor(Color.parseColor("#6E8EC9"));
tabD.setTextColor(Color.parseColor("#6E8EC9"));
break;
case GEAR_P:
tabP.setTextColor(Color.parseColor("#0043FF"));
tabR.setTextColor(Color.parseColor("#6E8EC9"));
tabN.setTextColor(Color.parseColor("#6E8EC9"));
tabD.setTextColor(Color.parseColor("#6E8EC9"));
break;
case GEAR_R:
tabR.setTextColor(Color.parseColor("#0043FF"));
tabP.setTextColor(Color.parseColor("#6E8EC9"));
tabN.setTextColor(Color.parseColor("#6E8EC9"));
tabD.setTextColor(Color.parseColor("#6E8EC9"));
break;
case GEAR_N:
tabN.setTextColor(Color.parseColor("#0043FF"));
tabR.setTextColor(Color.parseColor("#6E8EC9"));
tabP.setTextColor(Color.parseColor("#6E8EC9"));
tabD.setTextColor(Color.parseColor("#6E8EC9"));
break;
case GEAR_D:
tabD.setTextColor(Color.parseColor("#0043FF"));
tabN.setTextColor(Color.parseColor("#6E8EC9"));
tabR.setTextColor(Color.parseColor("#6E8EC9"));
tabP.setTextColor(Color.parseColor("#6E8EC9"));
break;
default:
break;
}
}
private void taxiGear(@NotNull Chassis.GearPosition gear) {
switch (gear) {
case GEAR_NONE:
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_P:
tabP.setTextColor(Color.parseColor("#FFFFFFFF"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_R:
tabR.setTextColor(Color.parseColor("#FFFFFFFF"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_N:
tabN.setTextColor(Color.parseColor("#FFFFFFFF"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
tabD.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
case GEAR_D:
tabD.setTextColor(Color.parseColor("#FFFFFFFF"));
tabN.setTextColor(Color.parseColor("#FF6E8EC9"));
tabR.setTextColor(Color.parseColor("#FF6E8EC9"));
tabP.setTextColor(Color.parseColor("#FF6E8EC9"));
break;
default:
break;
}
}
}

8
core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_tap_position.xml
View File

@@ -12,7 +12,7 @@
android:gravity="center"
android:text="P"
android:textAlignment="center"
android:textColor="#738FC4"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -27,7 +27,7 @@
android:gravity="center"
android:text="R"
android:textAlignment="center"
android:textColor="#738FC4"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -42,7 +42,7 @@
android:gravity="center"
android:text="N"
android:textAlignment="center"
android:textColor="#738FC4"
android:textColor="#6E8EC9"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -57,7 +57,7 @@
android:gravity="center"
android:text="D"
android:textAlignment="center"
android:textColor="#738FC4"
android:textColor="#0043FF"
android:textSize="@dimen/dp_32"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"