Merge remote-tracking branch 'origin/dev_robotaxi-d_231031_6.2.0' into dev_robotaxi-d_231031_6.2.0

app/build.gradle

@@ -224,7 +224,7 @@ dependencies {
     implementation rootProject.ext.dependencies.android_start_up
     implementation rootProject.ext.dependencies.lancetx_runtime
 
-    if (!rootProject.isReleaseBuild()) {
+    if (!rootProject.isJunkDetectEnable()) {
 
         implementation rootProject.ext.dependencies.lancetx_compiler_lib
         implementation rootProject.ext.dependencies.handler_proxy_runtime
@@ -236,6 +236,8 @@ dependencies {
         kapt rootProject.ext.dependencies.google_auto_service
 
         compileOnly rootProject.ext.dependencies.google_auto_service
+
+        compileOnly rootProject.ext.dependencies.apm_insight
     }
 
 //    implementation rootProject.ext.dependencies.mogocustommap

app/src/debug/java/com/mogo/launcher/lancet/jank/spi/HookInvokerImpl.java

@@ -2,7 +2,7 @@ package com.mogo.launcher.lancet.jank.spi;
 import android.app.Activity;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.util.Log;
+import com.apm.insight.log.VLog;
 import com.google.auto.service.AutoService;
 import com.mogo.core.lancetx.compiler.lib.generator.Type;
 import com.mogo.core.lancetx.compiler.lib.hook.IHookInvoker;
@@ -167,7 +167,7 @@ public class HookInvokerImpl implements IHookInvoker {
                 }
                 builder.setLength(builder.length() - 1);
             }
-            Log.w("HookHandler", "Junk Detected:" + builder);
+            VLog.w("HookHandler", "Junk Detected:" + builder);
             linkedLog(type, builder.toString());
             if (flag) {
                 extra.setLength(0);

build.gradle

@@ -171,3 +171,7 @@ boolean isReleaseBuild() {
     }
     return false
 }
+
+boolean isJunkDetectEnable() {
+    return isReleaseBuild()
+}

config.gradle

@@ -228,7 +228,7 @@ ext {
             passport_secret              : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT",
 
             // 主线程卡顿监测
-            block_detector               : "com.mogo.eagle.core.block:runtime:10.90.10",
+            block_detector               : "com.mogo.eagle.core.block:runtime:10.90.20",
 
             //======================== google auto-service ===============
             google_auto_service          : "com.google.auto.service:auto-service:1.0-rc7",

core/function-impl/mogo-core-function-devatools/build.gradle

@@ -102,6 +102,10 @@ dependencies {
     implementation project(':core:mogo-core-utils')
     implementation project(':core:mogo-core-function-call')
     implementation project(':core:mogo-core-res')
+
+    if (!rootProject.isJunkDetectEnable()) {
+        compileOnly rootProject.ext.dependencies.apm_insight
+    }
 }
 
 apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/block/MoGoBlockProviderImpl.kt

@@ -4,6 +4,7 @@ import android.content.*
 import android.util.*
 import android.view.*
 import androidx.metrics.performance.*
+import com.apm.insight.log.VLog
 import com.mogo.eagle.core.block.runtime.*
 import com.mogo.eagle.core.block.runtime.config.*
 import com.mogo.eagle.core.block.runtime.config.recorder.*
@@ -17,6 +18,10 @@ import java.util.concurrent.TimeUnit.SECONDS
 
 internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
 
+    companion object {
+        private const val TAG = "BLOCK_REPORT"
+    }
+
     @Volatile
     private var hasInit = false
 
@@ -28,7 +33,7 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
             .multiplier(2.0f)
             .isDebug(false)
             .period(5, SECONDS)
-            .junkRateThreshold(0.2f)
+            .junkRateThreshold(0.6f)
             .recorder(null, 500, 500)
             .build())
         hasInit = true
@@ -64,7 +69,13 @@ internal class MoGoBlockProviderImpl: IMoGoBlockProvider, IBlockListener {
                         }
                     }
                 }
-                linkedLog.record(GsonUtils.toJson(map))
+                val msg = GsonUtils.toJson(map)
+                try {
+                    VLog.w(TAG, msg)
+                } catch (t: Throwable) {
+                    Log.e(TAG, "onDumped error", t)
+                }
+                linkedLog.record(msg)
             }
         })
     }

gradle.properties

@@ -81,8 +81,8 @@ MOGO_LOCATION_VERSION=1.4.7.19
 MOGO_TELEMATIC_VERSION=1.4.7.19
 ######## MogoAiCloudSDK Version ########
 # 自研地图
-MAP_SDK_VERSION=3.2.1.4
-MAP_SDK_DATA_VERSION=1.0.0.3
+MAP_SDK_VERSION=3.3.0.10
+MAP_SDK_DATA_VERSION=1.0.0.7
 MAP_SDK_OPERATION_VERSION=1.1.4.1
 # websocket
 WEBSOCKET_VERSION=1.1.7

gradle/bytex/bytex_handler_proxy.gradle

@@ -1,6 +1,6 @@
 apply plugin: 'bytex.handler_proxy'
 handler_proxy {
-    enable !rootProject.isReleaseBuild()
-    enableInDebug !rootProject.isReleaseBuild()
+    enable !rootProject.isJunkDetectEnable()
+    enableInDebug !rootProject.isJunkDetectEnable()
 }
 

gradle/bytex/bytex_lancetx.gradle

@@ -8,7 +8,7 @@ LancetX {
             "com.zhjt.mogo_core_function_devatools.perf"
     ]
     synchronizedLock {
-        enabled !rootProject.isReleaseBuild()
+        enabled !rootProject.isJunkDetectEnable()
         blackList = [
                 "okio.AsyncTimeout\$Watchdog"
         ]
@@ -28,7 +28,7 @@ LancetX {
             enable true
         }
         main_block_check {
-            enable !rootProject.isReleaseBuild()
+            enable !rootProject.isJunkDetectEnable()
         }
     }
 }

libraries/mapmodule/src/main/assets/shaders/fMogo_Shader.glsl

@@ -155,8 +155,8 @@ void setSignalLine(){
     }
     fragColor = texture(texId,_uv);
 //    fragColor *= 1.0-0.5*smoothstep(0.0,signalLineCnt,signalLineTexY);
-    if(signalLineObj==1)
-        fragColor *= clamp(smoothstep(0.0,signalLineCnt,signalLineTexY)+0.5,0.0,1.0);
+//    if(signalLineObj==1)
+//        fragColor *= clamp(smoothstep(0.0,signalLineCnt,signalLineTexY)+0.5,0.0,1.0);
 }
 void setText(){
     fragColor = vec4(vec3(textColor),texture(texId,_uv).a);

libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl

@@ -8,6 +8,8 @@ uniform vec4 specularColor; //高光颜色
 uniform float specularPow; //高光光泽度
 uniform vec4 replacedColor; //把元素替换为另外一种颜色
 uniform bool isReplaceColor; //是否把元素替换为另外一种颜色
+uniform int isMixColor;//是否混合颜色
+
 in vec2 fragTexCoord;
 in vec3 fragEyeNormal;
 in vec3 fragEyePos;
@@ -37,9 +39,13 @@ layout(location = 0) out vec4 fragColor;
 vec4 changeColorMethod(vec4 texColor){
     vec4 retColor = vec4(0.0);
     if(_changeColorCmd==0.0){
-            if(isReplaceColor)
-                retColor = mix(texColor,replacedColor,1.0); //s1
-            else
+            if(isReplaceColor){
+                if(isMixColor == 0){
+                   retColor = mix(texColor,replacedColor,1.0); //s1
+                }else{
+                   retColor = mix(texColor,replacedColor,0.5); //s1
+                }
+            }else
                 retColor = texColor; //s0
         }else if(_changeColorRatio==0.0){
             if(_changeColorCmd==1.0)

libraries/mapmodule/src/main/assets/shaders/vMogo_Shader.glsl

@@ -20,6 +20,7 @@ uniform bool isRenderSignalLine; //信号线
 uniform float signalLineTime; //信号线时间
 uniform int signalLineStep; //信号线阶段
 uniform int signalLineObj; //信号线对象
+uniform float signalScale; //信号线x方向缩放
 uniform bool isWater; //水系
 uniform float waterTime; //水系滚动时间
 uniform bool isRenderDivider;
@@ -44,17 +45,17 @@ void setZebra(){
     float d = distance(pos0.xy/pos0.w,pos1.xy/pos1.w); //求出斑马线长边的长度
     int cnt = 0; //根据长边的长度决定画几根斑马线
     if(d<0.03)
-    cnt = 1;
+        cnt = 1;
     else if(d<0.1)
-    cnt = 3;
+        cnt = 3;
     else if(d<0.3)
-    cnt = 5;
+        cnt = 5;
     else if(d<0.5)
-    cnt = 15;
+        cnt = 15;
     else if(d < 1.4)
-    cnt = 30;
+        cnt = 30;
     else
-    cnt = 30;
+        cnt = 30;
     _uv = uv*float(cnt);
 }
 void setColor(){
@@ -77,11 +78,11 @@ void setWater(){
     _uv.x = _uv.x + waterTime;
 }
 void setWave(){
-    waveOff   = pos.y / 1000.0;
+    waveOff   = pos.y / 1000.0 /2.0;
 }
 void setSignalLine(){
     if(signalLineObj==1 && signalLineStep>0){
-        _uv.x = (uv.x - 0.5)*3.0 + 0.5; //x方向缩放
+        _uv.x = (uv.x - 0.5)*signalScale + 0.5; //x方向缩放
         _uv.y = uv.y;
         signalLineTexY = _uv.y;
         _uv = _uv + vec2(0.0,1.0)*signalLineTime;
@@ -112,18 +113,18 @@ void main()
         setPosInEye();
     }
     if(isTex)
-    setTex();
+        setTex();
     else
-    setColor();
+        setColor();
     if(isRenderZebra)
-    setZebra();
+        setZebra();
     if(isWave)
-    setWave();
+        setWave();
     if(isWater)
-    setWater();
+        setWater();
     if(isRenderSignalLine)
-    setSignalLine();
+        setSignalLine();
     if(isGuideLine)
-    setGuideLine();
+        setGuideLine();
     gl_Position =  projMat*viewMat*modelMat * pos;
 }