From a7ad1f77c860b7f0696400093db18e13ef74552c Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Mon, 21 Feb 2022 20:16:45 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E7=9A=84=E5=8F=B8=E6=9C=BA=E7=AB=AF=E8=BF=9E=E6=8E=A5IP=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8=E8=BA=AB=E4=BB=BD=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E6=9A=82=E6=9C=AA=E5=90=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .../autopilot/MoGoAutopilotProvider.kt        |  2 +-
 .../main/res/layout/view_debug_setting.xml    |  5 +-
 .../core/data/config/FunctionBuildConfig.kt   |  8 +++-
 .../utilcode/mogo/AppIdentityModeUtils.java   | 48 +++++++++++++++++++
 4 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.java

diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
index 9332a1c9ef..d5daff1c71 100644
--- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
+++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt
@@ -51,7 +51,7 @@ class MoGoAutopilotProvider :
             0x00 -> // 司机
             {
                 CallerMapDataCollectorManager.registerOnMapCollectTaskListener(this)
-                AdasManager.getInstance().create(context, "192.168.1.141")
+                AdasManager.getInstance().create(context, "192.168.1.102")
             }
             0x01 -> // 乘客
             {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 6fcc804aac..5b5182de1b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_800"
-    android:layout_height="match_parent"
+    android:layout_height="@dimen/dp_999"
     android:background="#FFFFFF">
 
     <ScrollView
@@ -180,6 +180,7 @@
                     android:textOff="关闭「刹车控制」"
                     android:textOn="打开「刹车控制」"
                     android:textSize="@dimen/dp_24" />
+
                 <Button
                     android:id="@+id/changesight_top_btn"
                     android:layout_width="wrap_content"
@@ -444,7 +445,7 @@
                         android:gravity="center"
                         android:minHeight="48dp"
                         android:padding="@dimen/dp_5"
-                        android:text="192.168.1.102"
+                        android:text="192.168.8.102"
                         android:textSize="@dimen/dp_24" />
 
                     <Button
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index a4265da15f..1c2480f200 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -20,8 +20,12 @@ object FunctionBuildConfig {
 
     /**
      * 当前APP的身份模式
-     * 0x00 = 司机模式（默认）
-     * 0x01 = 乘客模式（部分功能受到影响）
+     *
+     * 0x00 = 出租车-司机模式（默认）
+     * 0x01 = 出租车-乘客模式（部分功能受到限制）
+     *
+     * 0xA0 = 小巴车-司机模式（默认）
+     * 0xA1 = 小巴车-乘客模式（部分功能受到限制）
      */
     @Volatile
     @JvmField
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.java
new file mode 100644
index 0000000000..d30ff8fd8c
--- /dev/null
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.java
@@ -0,0 +1,48 @@
+package com.mogo.eagle.core.utilcode.mogo;
+
+/**
+ * 根据
+ *
+ * @see com.mogo.eagle.core.data.config.FunctionBuildConfig#appIdentityMode 判断身份
+ */
+public class AppIdentityModeUtils {
+    /**
+     * 是否是 司机端（这里不细分具体是：小巴、出租车等类型）
+     *
+     * @param appIdentityMode productFlavors 配置的类型
+     * @return true - 是司机端 false - 不是司机端
+     */
+    public static boolean isDriver(int appIdentityMode) {
+        return (appIdentityMode & 0x01) != 0x01;
+    }
+
+    /**
+     * 是否是 乘客端（这里不细分具体是：小巴、出租车等类型）
+     *
+     * @param appIdentityMode productFlavors 配置的类型
+     * @return true - 是乘客端 false - 不是乘客端
+     */
+    public static boolean isPassenger(int appIdentityMode) {
+        return (appIdentityMode & 0x01) == 0x01;
+    }
+
+    /**
+     * 是否是 小巴车端（这里不细分具体是：司机、乘客等类型）
+     *
+     * @param appIdentityMode productFlavors 配置的类型
+     * @return true - 是小巴车端 false - 不是小巴车端
+     */
+    public static boolean isBus(int appIdentityMode) {
+        return (appIdentityMode & 0xA0) == 0xA0;
+    }
+
+    /**
+     * 是否是 出租车端（这里不细分具体是：司机、乘客等类型）
+     *
+     * @param appIdentityMode productFlavors 配置的类型
+     * @return true - 是出租车端 false - 不是出租车端
+     */
+    public static boolean isTaxi(int appIdentityMode) {
+        return (appIdentityMode & 0xA0) != 0xA0;
+    }
+}