merge branch

2021-01-07 19:33:30 +08:00
parent a4b693062a 93afe6629b
commit 8acdfbbe2e
77 changed files with 1349 additions and 495 deletions
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XObuManager.java
@@ -13,6 +13,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;

 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.location.MogoLocation;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XObuEventEntity;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
@@ -178,6 +179,10 @@ public class V2XObuManager implements IObuCallback, Handler.Callback {
    @Override
    public void onEventInfoCallback(MogoObuEventInfo info) {
        Logger.d("V2X_OBU_EVENT", "carEventInfo==" + info);
+        if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+            Logger.d("V2X_OBU_EVENT","vr模式下不展示obu事件");
+            return;
+        }
        Long last = intervalMap.get(info.getTypeCode());
        if (last == null) {
            last = 0L;
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
@@ -3,6 +3,7 @@ package com.mogo.module.v2x.adapter.holder;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -10,11 +11,13 @@ import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.TextView;

 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.animation.BezierAnimationView;
 import com.mogo.module.common.entity.MarkerExploreWay;
@@ -23,6 +26,7 @@ import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XLiveCarInfoEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
+import com.mogo.module.common.wm.WindowManagerView;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XUserInfoRes;
@@ -81,7 +85,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
    private HeartLikeView ivEventZan;

    private ViewGroup mViewGroup;
-
+    private WindowManagerView mWindowManagerView;

    // 上传事件的用户信息
    private MarkerUserInfo mUserInfo;
@@ -312,7 +316,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
            e.printStackTrace();
        }
    }
-    
+
    /*
     * 展示事件的图片/视频资源
     * */
@@ -364,6 +368,53 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
        }
    }

+    private void bezierAnimation(int[] loc) {
+        if (mWindowManagerView == null) {
+            Log.d(TAG, "bezierAnimation:null");
+            mWindowManagerView = new WindowManagerView.Builder(mContext.getApplicationContext())
+                    .contentView(R.layout.module_common_bezier_layout)
+                    .size(WindowManager.LayoutParams.WRAP_CONTENT,
+                            WindowManager.LayoutParams.WRAP_CONTENT)
+                    .position(loc[0], loc[1])
+                    .gravity(Gravity.TOP | Gravity.LEFT)
+                    .showInWindowManager();
+        }
+        try {
+            if (mWindowManagerView.isShowing()) {
+                return;
+            }
+            mWindowManagerView.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        BezierAnimationView bezierAnimationView = mWindowManagerView.findViewById(R.id.bezier_view);
+        bezierAnimationView.bezierAnimationStart();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+//                mWindowManagerView.dismiss();
+            }
+        }, 2000);
+
+    }
+
+    public int[] getLocation(View v) {
+        int[] loc = new int[4];
+        int[] location = new int[2];
+        v.getLocationOnScreen(location);
+        loc[0] = location[0];
+        loc[1] = location[1];
+        int w = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+        int h = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+        v.measure(w, h);
+
+        loc[2] = v.getMeasuredWidth();
+        loc[3] = v.getMeasuredHeight();
+
+        //base = computeWH();
+        return loc;
+    }
+
    /**
     * 为了给车聊聊更多的信息需要重新查询一次
     *
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -1,6 +1,7 @@
 package com.mogo.module.v2x.scenario.impl;

 import android.content.Intent;
+import android.util.Log;

 import androidx.localbroadcastmanager.content.LocalBroadcastManager;

@@ -91,7 +92,7 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                                mV2XScenario = new V2XIllegalParkScenario();
                                break;
                            case V2XMessageEntity.V2XTypeEnum.ALERT_EVENT_UGC_WARNING:
-                                mV2XScenario = new V2XEventUgcScenario();
+                                mV2XScenario = V2XServiceManager.getMoGoStatusManager().isVrMode() ? null : new V2XEventUgcScenario();
                                break;
                            case V2XMessageEntity.V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW:
                                mV2XScenario = new V2XVoiceCallLiveScenario();
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java
@@ -59,7 +59,7 @@ public class V2XRoadVideoCarScenario extends AbsV2XScenario<V2XEventShowEntity>
                    new ViewGroup.LayoutParams(
                            ViewGroup.LayoutParams.MATCH_PARENT,
                            (int) V2XUtils.getApp().getResources()
-                                    .getDimension(R.dimen.v2x_video_window_height));
+                                    .getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode()? R.dimen.dp_394:R.dimen.v2x_video_window_height));
            V2XServiceManager
                    .getMogoTopViewManager()
                    .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this);
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -36,7 +36,7 @@
    <TextView
        android:id="@+id/tvEventTypeTitle"
        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_40"
+        android:layout_height="@dimen/dp_35"
        android:layout_marginStart="@dimen/dp_31"
        android:layout_marginBottom="@dimen/dp_42"
        android:background="@drawable/bg_v2x_event_type_red_vr"
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
@@ -37,7 +37,7 @@
        <TextView
            android:id="@+id/tvImgTextContent"
            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_40"
+            android:layout_height="@dimen/dp_35"
            android:layout_marginTop="15dp"
            android:background="@drawable/bg_v2x_event_type_orange_vr"
            android:gravity="center"
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -140,20 +140,6 @@
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintStart_toStartOf="parent" />

-            <Button
-                android:id="@+id/test"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#2651A6"
-                android:padding="@dimen/dp_10"
-                android:text="折行显示文案测试数据"
-                android:textColor="#FFFFFF"
-                android:textSize="@dimen/dp_22"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
            <Button
                android:id="@+id/btnTriggerParkEvent"
                android:layout_width="wrap_content"
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -120,5 +120,4 @@
    <dimen name="v2x_driving_heigt">46px</dimen>
    <dimen name="v2x_recommond_route_size">26px</dimen>

-
 </resources>