feat(Resource):Replace/remove resources: logo,car,bg...

clusterApp/Makefile_RK

@@ -0,0 +1,126 @@
+APPNAME	=	clusterApp
+DESTDIR	=	bin
+CD		=	make --no-print-directory
+BIN		=	$(DESTDIR)/$(APPNAME)
+
+#readonly APP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+CURR_DIR = /home/huaxu/develop/cluster/clusterApp/
+PKG_DIR = /home/huaxu/develop/cluster/packages/
+ROOTFS = /home/huaxu/develop/cluster/packages/install/usr/
+#ROOTFS = ${APP_DIR}/../packages/install/
+TARGET_PATH_LIB = $(ROOTFS)/lib
+TARGET_PATH_INCLUDE = $(ROOTFS)/include
+#TFPT_DIR = /home/lst/workspace/rootfs/root/app/
+
+CFLAGS = -fPIC -fno-strict-aliasing -fno-optimize-sibling-calls -Wall
+
+ifdef DEBUG
+CFLAGS += -g -DDEBUG -DINST_DEBUG
+else
+CFLAGS += -O3 -fexpensive-optimizations
+endif
+
+DEPS = -lpthread -lGLESv2 -lEGL -ldrm -lgbm -lfreetype -lm -ldl -Wl,--library-path=$(TARGET_PATH_LIB),-rpath-link=$(TARGET_PATH_LIB) 
+## DEPS += /home/lst/workspace/jpeg/jpeg-9c/install/lib/libjpeg.a
+DEPS += $(ROOTFS)/lib/libjpeg.a
+DEPS += $(ROOTFS)/lib/libcjson.a
+DEPS += -lz -lpng -lcjson
+
+#Make command to use for dependencies
+CROSS_COMPILE = /opt/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-
+CC = $(CROSS_COMPILE)gcc 
+AR = $(CROSS_COMPILE)ar
+
+SUBDIR	= ./src
+
+CFLAGS += -DLINUX \
+	-DEGL_API_FB \
+	-DCOMPILE_IN_UBUNTU \
+	-DGLEW_NO_GLU
+	##\
+	##-DCOMPILE_IN_WINDOWS
+
+CFLAGS += -Iinclude \
+	-I$(TARGET_PATH_INCLUDE) \
+	-I$(TARGET_PATH_INCLUDE)/freetype2 \
+	-I$(TARGET_PATH_INCLUDE)/GL \
+	-I$(TARGET_PATH_INCLUDE)/cjson \
+	-I$(TARGET_PATH_INCLUDE)/libdrm \
+	-I$(ROOTFS)/local/include \
+	-I$(CURR_DIR)/3psw/freetype-2.9_MinGW/include/freetype2/ \
+	-I$(CURR_DIR)/3psw/lpng1634/ \
+#  	-I/usr/include/ \
+# 	-I/usr/include/GL/ \
+# 	-I/usr/include/drm/
+# 	-I/home/lst/workspace/jpeg/jpeg-9c/install/include \
+# 	-I/home/lst/workspace/zlib/zlib_build/ \
+# 	-I/home/lst/workspace/libpng/libpng_build/ \
+# 	-I$(ROOTFS)/usr/src/linux/include
+
+CFLAGS += -L$(ROOTFS)/lib \
+	-L/$(ROOTFS)/lib/libcjson.a
+
+SOURCES	=	$(shell find $(SUBDIR) -name "*.c")
+
+BIN_SOURCE	=	./main.c
+BIN_SOURCES	=	$(SOURCES) $(BIN_SOURCE)
+BIN_OBJECTS	=	$(BIN_SOURCES:.c=.o)
+
+$(APPNAME): compile_tips install finish_tips
+
+
+compile_tips:
+	@echo "************************"
+	@echo "Compile Tools"
+	@echo "***************"
+	@echo gcc
+	@echo "***************"
+
+
+finish_tips:
+	@echo "************************"
+	@echo -e "make end!\n"
+
+%.o : %.c
+	@echo " CC " $@
+	@$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MD -c $< -o $@
+
+
+%.o : %.cpp
+	@echo " CXX " $@
+	@$(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -MMD -c $< -o $@
+
+
+$(BIN) : $(BIN_OBJECTS)
+	@echo " LD " $@
+	@echo " LD depen " $<
+	@$(QUIET)$(CC) -o $(BIN) $(BIN_OBJECTS) $(DEPS)
+	@echo -e " BD  $(BIN) Build Success!\n"
+
+install: $(BIN)
+	##@echo " CP " $(BIN) $(TFPT_DIR)
+	##@cp $(BIN) $(TFPT_DIR)
+	@echo " SYNC "
+	@sync
+
+help:
+	@echo ''
+	@echo '----------------'
+	@echo 'make [option]'
+	@echo 'Options:'
+	@echo 'DEBUG=1'
+	@echo '		disable print debug info'
+	@echo '----------------'
+	@echo ''
+
+clean:
+	@rm -f $(SOURCES:.c=.d)
+	@rm -f $(SOURCES:.c=.o)
+	@rm -f $(BIN_SOURCE:.c=.d) $(BIN_SOURCE:.c=.o) $(BIN)
+	@clear
+	@echo ''
+	@echo 'Make Clean,OK!'
+	@echo ''
+
+
+-include $(BIN_OBJECTS:.o=.d)

clusterApp/include/InsCfg.h

@@ -2,10 +2,10 @@
 #define INSCFG_H_INCLUDED
 
 #define VERSION_MAJOR 0
-#define VERSION_MINOR 3
+#define VERSION_MINOR 1
-#define VERSION_FIX   7
+#define VERSION_FIX   0
 #define VERSION_REV   1
-#define VERSION_HW    3
+#define VERSION_HW    1
 
 enum
 {
@@ -106,10 +106,10 @@ enum
 
 #define MAX_FT_FACE_NUM 10
 
-#define MAX_LOAD_THREAD_NUM 5   /* 资源加载任务最大子线程数量 */
+#define MAX_LOAD_THREAD_NUM 5   /* <EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
-#define MAX_LOAD_TASK_NUM 100   /* 资源加载任务瞬时最大任务数量 */
+#define MAX_LOAD_TASK_NUM 100   /* <EFBFBD><EFBFBD>Դ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲ʱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
 #define MAX_LOAD_TASK_WAIT_NUM (MAX_LOAD_THREAD_NUM*10)
-#define MAX_FILE_NAME_LEN 100   /* 资源文件名字符串的最大长度 */
+#define MAX_FILE_NAME_LEN 100   /* <EFBFBD><EFBFBD>Դ<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>󳤶<EFBFBD> */
 
 #define RENDER_DISPLAY_WIDTH    1920
 #define RENDER_DISPLAY_HEIGHT   720

clusterApp/include/InsDbg.h

@@ -15,8 +15,16 @@
 #define DBG_TAG " "
 #endif // DBG_TAG
 
+#include <time.h>
+inline unsigned long get_startup_ms(void) {
+    return (unsigned long)(clock() * 10000 / CLOCKS_PER_SEC);
+}
 //#define DBG_Log(level, fmt, v...)
-#define DBG_Log(level, fmt, v...) if(level >= DBG_LEVEL)printf("[ %15s ] "fmt, DBG_TAG, ##v)
+#define DBG_Log(level, fmt, v...) \
+    do { \
+        if (level >= DBG_LEVEL) \
+            printf("[%lu][ %15s ] " fmt, get_startup_ms(), DBG_TAG, ##v); \
+    } while(0)
 
 #endif // NODEBUG
 

clusterApp/include/Protocol/MainBoard_IIC_Sys.h

@@ -7,7 +7,7 @@
 MbIicApi Un08 srcDataBuf[ID_FRAME_R_NUM][I2C_FRAMELEN-1];
 MbIicApi Un08 dstDataBuf[ID_FRAME_W_NUM][I2C_FRAMELEN-1];
 
-#define DATA_SPEED           100// srcDataBuf[ID_FRAME_R_0x00][0].value        /*车速*/
+#define DATA_SPEED           srcDataBuf[ID_FRAME_R_0x00][0].value        /*车速*/
 #define DATA_BATTERY         srcDataBuf[ID_FRAME_R_0x00][1].sbit07.b06   /*电量*/
 #define DATA_IND_MUTE        srcDataBuf[ID_FRAME_R_0x00][1].sbit07.b7    /*静音*/
 #define DATA_SPEED_WARN      srcDataBuf[ID_FRAME_R_0x00][2].value        /*报警车速*/
@@ -197,7 +197,7 @@ MbIicApi Un08 dstDataBuf[ID_FRAME_W_NUM][I2C_FRAMELEN-1];
 //#define DATA_LANE_RR_LENGTH           srcDataBuf[ID_FRAME_R_0x0B][5].sbit26.b27       /*右右车道线长度*/
 #define DATA_BAT_LACK                 srcDataBuf[ID_FRAME_R_0x0B][2].sbit.b6           /* 续航里程灯 */
 #define DATA_RADAR_DISTANCE           srcDataBuf[ID_FRAME_R_0x0B][5].value           /*雷达距离*/
-#define DATA_VEHICLE_COLOR_CFG        srcDataBuf[ID_FRAME_R_0x0B][6].value              /*车身颜色配置*/
+#define DATA_VEHICLE_COLOR_CFG        VehicleColor_Red // srcDataBuf[ID_FRAME_R_0x0B][6].value              /*车身颜色配置*/
 #define DATA_ENGCOST_P100M            srcDataBuf[ID_FRAME_R_0x0B][7].value              /*最近100m能耗*/
 
 #define DATA_TRAFFIC_LANE_PARAM_0_LL  srcDataBuf[ID_FRAME_R_0x0D][0].value         /*左左车道 常数参数 L0*/

clusterApp/src/InsRender/Render.c

@@ -158,6 +158,261 @@ static Int32 GetAssicIdx(char ch)
     return str_invalid_char_idx[0];
 }
 
+
+/**
+ * 显示时间,
+ * @mintutes 一天当中的分钟数 [0, 24*60-1]
+ * @fmt 时间格式 0:24时制, 1:12时制
+ */
+static void ShowTime(UInt16 minutes, UInt08 fmt);
+/**
+ * 显示温度,
+ * @temperature 温度数值
+ */
+static void ShowTemprature(Int16 temperature);
+
+/**
+ * 显示车速,
+ * 车速无效为0xff时不显示,
+ * 车速变化时平滑过渡
+ * @speed 车速数值
+ */
+static void ShowSpeed(UInt08 speed);
+
+/**
+ * 显示续航里程
+ * @range 续航里程数值
+ */
+static void ShowTripRange(UInt16 range);
+/**
+ * 显示用户名
+ */
+static void ShowGreeting();
+
+/**
+ * 在左上角显示帧率, 右上角显示版本信息,编译日期
+ */
+static void ShowFPS();
+/**
+ * 显示左模块列表
+ * @cursor 光标值
+ * @moduleId 当前左模块ID
+ */
+static Bool ShowLeftModuleList(UInt08 cursor, UInt08 moduleId);
+
+/**
+ * 显示右模块列表
+ * @cursor 光标值
+ * @moduleId 当前右模块ID
+ */
+static Bool ShowRightModuleList(UInt08 cursor, UInt08 moduleId);
+
+/**
+ * 显示能耗模块
+ * 包含功率表盘,能耗曲线图,平均能耗数值
+ */
+static void ShowModuleEngCost(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示短里程模块
+ */
+static void ShowModuleTrip(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示时钟模块
+ */
+static void ShowModuleClock(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示车况模块
+ * 包含胎压数值,胎温数值,四门门开状态
+ */
+static void ShowModuleVehicleStatus(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示媒体模块
+ * 包含音乐,有声读物,本地电台,网络电台
+ */
+static void ShowModuleMedia(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示天气模块
+ */
+static void ShowModuleWeather(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示导航模块
+ */
+static void ShowModuleNav(UInt08 type, UInt08 moduleId);
+
+/**
+ * 显示电话模块
+ * 蓝牙未连接,通话列表,来电,拨出,通话等界面
+ */
+static Int08 ShowModulePhone(UInt08 phoneStatus, UInt08 moduleId);
+
+/**
+ * 显示智能语音助手(小P形象)
+ * 入场,聆听,识别中,播报,退场等交互动画
+ */
+static Bool ShowVoiceAssistant(UInt08 state);
+
+/**
+ * 显示人脸识别
+ * 静态、正、左、右、上、下扫描
+ */
+static Bool ShowFaceRecognition(UInt08 state);
+
+/**
+ * 显示右侧上次访问的菜单(小图标)
+ */
+static void ShowMenuNull(UInt08 menuId);
+
+/**
+ * 显示右侧菜单列表
+ */
+static Bool ShowMenuList(UInt08 menuId);
+
+/**
+ * 显示右侧二级菜单(数值设置类)
+ */
+static void ShowMenuValueSetting(Int08 menuId);
+
+/**
+ * 显示右侧二级菜单(媒体源设置)
+ */
+static void ShowMenuMediaSrcSelecting(UInt08 menuId);
+
+/**
+ * 显示左侧菜单
+ * 媒体音量设置,语音助手播报音量设置,电话声音音量设置,ACC跟车距离等级
+ */
+static Bool ShowMenuLeft(UInt08 menuID);
+
+/**
+ * 显示右侧二级菜单(版本信息)
+ */
+static void ShowMenuVersion(UInt08 menuId);
+
+/**
+ * 显示智能泊车
+ * 可泊区域,可泊车位,不可用车位,曾用车位
+ */
+static void ShowAiParking();
+
+/**
+ * 显示限速图标
+ */
+static void ShowSpeedLimit(UInt08 type, UInt08 limit);
+
+/**
+ * 显示提示信息
+ * @hintID 信息ID
+ */
+static Bool ShowHintInfo(UInt08 hintID);
+
+/**
+ * 显示报警信息
+ * @alarmID 信息ID
+ */
+static Bool ShowAlarmInfo(UInt08 alarmID);
+
+/**
+ * 显示前方路况
+ * 车道线,前方车辆,自动变道图标
+ */
+static void ShowTrafficLines();
+
+/**
+ * 显示充电界面
+ * 充电准备,充电,快速充电,充电中止/完成等动效
+ */
+static void ShowChargineUI(Bool visible, UInt08 battery, UInt16 range);
+
+/**
+ * 显示驻车界面
+ * ON档驻车界面,OFF档驻车界面
+ */
+static void ShowParkingCar(Bool visible, Bool isOffMode);
+
+/**
+ * 显示倒车界面 车图
+ * @fl  (front left)左前雷达相对距离 [0, 60]
+ * @fcl (front center left)左中前雷达相对距离 [0, 120]
+ * @fcr (front center right)右中前雷达相对距离 [0, 120]
+ * @fr  (front right)右前雷达相对距离 [0, 60]
+ * @bl  (back left)左后雷达相对距离 [0, 60]
+ * @bcl (back center left)左中后雷达相对距离 [0, 140]
+ * @bcr (back center right)右中后雷达相对距离 [0, 140]
+ * @br  (back right)右后雷达相对距离 [0, 60]
+ */
+static void ShowBackingCar(Bool visible, UInt08 backType, UInt08 priority);
+
+/**
+ * 显示行驶界面 车图
+ */
+static void ShowDrivingCar(Bool visible);
+
+/**
+ * 显示巡航车速图标
+ */
+static void ShowXccSpeed(UInt08 state, UInt08 speed);
+
+/**
+ * 显示固定位置指示灯
+ */
+static void ShowFixLeds();
+
+/**
+ * 显示位置不固定的指示灯等
+ * 根据指示灯信号的先来后到显示在有序的位置
+ */
+static void ShowDynamicLeds();
+
+/**
+ * 显示电量表
+ * 电量进度条颜色与续航里程(rangeTrip)相关
+ */
+static void ShowBattery(UInt08 battery, UInt16 rangeTrip);
+
+/**
+ * 显示档位信息
+ * 档位切换弹窗提示
+ */
+static void ShowGear(UInt08 gear);
+
+/**
+ * 显示驾驶模式
+ * ECO, SPORT, Standard
+ */
+static void ShowDrivingMode(UInt08 nightMode);
+
+/**
+ * 显示上电自检动画(车体扫描动画)
+ */
+static void ShowSelfTest(Int32 duration);
+
+/**
+ * 升级界面:
+ *      升级包md5签名校验,数据传输,解压信息显示
+ */
+static void ShowUpgradeUI();
+
+/**
+ * Xmart OS升级界面
+ **/
+static void ShowXmartUpgrade();
+
+/*---------------------------------------------------------------------------*/
+
+static Bool Render_PwrOnBmpPlaying();
+static void Render_PwrOnState();
+static Bool Render_PwrOffBmpPlaying();
+static void Render_PwrOffState();
+
+/*---------------------------------------------------------------------------*/
+
+
 /**
  * 显示时间,
  * @mintutes 一天当中的分钟数 [0, 24*60-1]
@@ -9198,7 +9453,7 @@ static Bool ShowHintInfo(UInt08 hintID)
 
     if(preHintID == 0xff)
     {
-        if(hintID == 0xff)
+        if((hintID == 0xff) || (hintID >= ID_HINT_RESERVE) || (hintID == ID_ALARM_NONE))
             return INS_FALSE;      
 
         Int32 id;
@@ -12233,6 +12488,9 @@ static void ShowChargineUI(Bool visible, UInt08 battery, UInt16 range)
  */
 static void ShowParkingCar(Bool visible, Bool isOffMode)
 {
+#ifndef SHOW_PARKINGCAR
+    visible = INS_FALSE;
+#endif
     static Bool preVisible = INS_FALSE;
     static Flt32 scale = 1.0f;
     static Flt32 scaleDst = 1.0f;
@@ -12558,6 +12816,9 @@ enum
  */
 static void ShowBackingCar(Bool visible, UInt08 backType, UInt08 priority)
 {
+#ifndef SHOW_BACKINGCAR
+    visible = INS_FALSE;
+#endif
     static Bool preVisible = INS_FALSE;
     static Bool localInit = INS_FALSE;
     static UInt08 preBackType = 0xFF;
@@ -13986,7 +14247,7 @@ static void ShowDrivingCar(Bool visible)
 //    }
 
 //    glUniform1f(Prgm_Simple_Texture_UNFM_Alp, durationRoad/500.0f);
-
+#ifdef USE_ALL_CAR_ELEMENT
     if(durationCar < 500/2)
     {
         if(IND_HIGH_BEAM)
@@ -14002,6 +14263,7 @@ static void ShowDrivingCar(Bool visible)
             DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_driving_low_beam].tex);
         }
     }
+#endif
 
     glUniform1f(Prgm_Simple_Texture_UNFM_Alp, durationCar/500.0f);
 
@@ -14009,6 +14271,7 @@ static void ShowDrivingCar(Bool visible)
     GetImageRect(rect, pngImg[baseIdx+Driving_Idx_base]);rect.y += yOffset;
     DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[baseIdx+Driving_Idx_base].tex);
 
+#ifdef USE_ALL_CAR_ELEMENT
     if(IND_TOPCAMERA_CFG)
     {
         GetImageRect(rect, pngImg[baseIdx+Driving_Idx_camera]);rect.y += yOffset;
@@ -14053,7 +14316,7 @@ static void ShowDrivingCar(Bool visible)
             DrawGlPicRect(-150.0f, &rect, Prgm_Simple_Texture_ATTR_Vtx, Prgm_Simple_Texture_ATTR_Txc, QuadTexCoords, pngImg[PNG_driving_car_tail_lamp_fog].tex);
         }
     }
-
+#endif
 //    Once_LoadPngData(PNG_test);
 //    Once_GenPngTexture(PNG_test, pngImg[PNG_test].fmt, pngImg[PNG_test].fmt);
 //    glUniform1f(Prgm_Simple_Texture_UNFM_Alp, 0.5);
@@ -15821,8 +16084,14 @@ static void Render_PwrOnState()
 
     if(selfTestDuration <= SelfTest_Total_Duration)
     {
+    /*TODO: here to Move slef-check */
+#ifdef USE_SELF_CHEKCK
         HmiDspState = HMI_DSP_LAUNCHING;
         chargingUI = INS_FALSE; /*自检动画中,暂时屏蔽充电界面信号*/
+#else
+
+        selfTestDuration = SelfTest_Total_Duration;
+#endif
     }
     else
     {
@@ -15975,8 +16244,10 @@ static void Render_PwrOnState()
     {
 //        if(pageType == GEAR_N)
         {
+#ifdef SHOW_TRAFFICLINES
             ShowTrafficLines();
             ShowAiParking();
+#endif
             ShowDrivingCar(INS_TRUE);
         }
         /*雷达数据有效时才显示倒车界面,否则立即取消显示*/
@@ -15992,8 +16263,10 @@ static void Render_PwrOnState()
     }
     else if(pageType == GEAR_D) //  || pageType == GEAR_N
     {
+#ifdef SHOW_TRAFFICLINES
         ShowTrafficLines();
         ShowAiParking();
+#endif
         ShowDrivingCar(INS_TRUE);
         if((RadarAlarm == 1)|| (RadarAlarm == 2))
         {
@@ -16074,7 +16347,7 @@ static void Render_PwrOnState()
     {
         selfTestDuration += mFrameTimeMs;
         ShowSelfTest(selfTestDuration);
-        printf("selfTestDuration %d, mFrameTimeMs %d\r\n", selfTestDuration, mFrameTimeMs);
+        //printf("selfTestDuration %d, mFrameTimeMs %d\r\n", selfTestDuration, mFrameTimeMs);
 
         goto _End_Render_PwrOnState_0;
     }
@@ -16238,11 +16511,13 @@ static void Render_PwrOnState()
         rightModuleID = 0xFF;
         ShowFaceRecognition(0xFF);
     }
+#ifdef SHOW_FACE_
     else if(ShowFaceRecognition(FaceRecognitionstate) == INS_TRUE)
     {
         menuID = 0xFF;
         rightModuleID = 0xFF;
     }
+#endif
 
     if(menuID != 0)
     {
@@ -16318,7 +16593,9 @@ _End_Render_PwrOnState_2:
     }
 
     ShowHintInfo(HintID);
+#ifdef SHOW_ALARM
     ShowAlarmInfo(AlarmID);
+#endif
 
 //_End_Render_PwrOnState_1:
 
@@ -16427,8 +16704,9 @@ static void Render_PwrOffState()
     glDisableVertexAttribArray(Prgm_Simple_Font_ATTR_Txc);
 
     ShowHintInfo(HintID);
+#ifdef SHOW_ALARM
     ShowAlarmInfo(AlarmID);
-
+#endif
     ShowFixLeds();
     ShowDynamicLeds();
 
@@ -16439,7 +16717,7 @@ static void Render_PwrOffState()
  * 升级界面:
  *      升级包md5签名校验,数据传输,解压信息显示
  */
-void ShowUpgradeUI()
+static void ShowUpgradeUI()
 {
     static Bool init = INS_FALSE;
     static UInt08 state = 0xFF;
@@ -16659,7 +16937,7 @@ void ShowUpgradeUI()
 /**
  * Xmart OS升级界面
  **/
-void ShowXmartUpgrade()
+static void ShowXmartUpgrade()
 {
     static Bool init = INS_FALSE;
     Int08 invAlpha = 0; //是否可见

clusterApp/src/InsRender/Res_Png.h

@@ -2129,7 +2129,7 @@ static const Vec2i pngLtp[] =
     {801,459},//PNG_Xmart_logo,
     {856,631},//PNG_Xmart_symbol,
 
-    {531,312},//PNG_logo
+    {0,0},//PNG_logo
 
 //    {0,0},    //PNG_test,
 };

clusterApp/src/InsRender/Res_Tga.h

@@ -243,7 +243,7 @@ static const char *tgaFilePath[] =
 
 static const Vec2i tgaLtp[] =
 {
-    {531,312},//logo
+    {0,0},//logo
     {630,397},//AI_parking_available_leftarea
     {773,401},//AI_parking_available_leftslot1
     {740,474},//AI_parking_available_leftslot2

clusterApp/src/Protocol/MainBoard_IIC.c

@@ -840,7 +840,7 @@ static inline void Decode_0x0B()
 
     RadarDistance = DATA_RADAR_DISTANCE;
 
-    VehicleColorCfg = DATA_VEHICLE_COLOR_CFG;
+    VehicleColorCfg = 0;
 
 	tmp08 = DATA_ENGCOST_P100M;
 	if(tmp08 != 0xFF && preCost == 0xFF)