From c5244379015e0c220f9c71e697eff8af5d33884c Mon Sep 17 00:00:00 2001 From: wujifei Date: Tue, 13 Apr 2021 15:31:58 +0800 Subject: [PATCH 01/11] =?UTF-8?q?fix#=E3=80=90#517=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=BF=85=E7=8E=B0=E3=80=91=E6=97=A5=E5=A4=9C=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=BA=E7=99=BD=E5=A4=A9=E6=A8=A1=E5=BC=8F=EF=BC=8C=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E9=B9=B0=E7=9C=BC=EF=BC=8C=E5=87=BA=E5=8F=91=E9=81=93?= =?UTF-8?q?=E8=B7=AF=E4=BA=8B=E4=BB=B6=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=BA=E7=81=B0=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_v2x_event_detail_vr.xml | 10 ++++++---- modules/mogo-module-v2x/src/main/res/values/colors.xml | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git 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 index 2d0db2ebb2..79f8efeac3 100644 --- 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 @@ -255,7 +255,7 @@ android:maxWidth="@dimen/dp_480" android:paddingLeft="@dimen/dp_40" android:paddingRight="@dimen/dp_40" - android:textColor="@color/v2x_white" + android:textColor="@color/v2x_white_color" android:textSize="@dimen/dp_32" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index b3a90791e3..c52d9652c2 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -21,4 +21,7 @@ #FF3036 #F63A35 + + #D6D7D9 + #FFFFFF \ No newline at end of file From 52bba1a3782f955ddac67fd29d991e0d6c917e91 Mon Sep 17 00:00:00 2001 From: wujifei Date: Tue, 13 Apr 2021 19:33:21 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix#=E3=80=90#521=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=BF=85=E7=8E=B0=E3=80=91=E9=B9=B0=E7=9C=BC=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=94=B6=E5=88=B0=E6=95=85=E9=9A=9C=E6=B1=82?= =?UTF-8?q?=E5=8A=A9=EF=BC=8C=E6=97=A0=E5=AF=BC=E8=88=AA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/holder/V2XOtherSeekHelpVH.java | 8 ++-- .../v2x_event_icon_daohang_vr.png | Bin 0 -> 2624 bytes .../drawable-xhdpi/v2x_event_icon_tel_vr.png | Bin 0 -> 2737 bytes .../src/main/res/drawable/bg_v2x_event_bg.xml | 2 +- .../drawable/bg_v2x_event_type_orange_vr.xml | 4 +- .../res/layout/item_v2x_fault_help_vr.xml | 39 ++++++++---------- 6 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_daohang_vr.png create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_tel_vr.png diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 37c49f4e49..509e7d6bad 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -199,18 +199,18 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { if (mV2XPushMessageEntity.getDistance() > 1000) { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance() / 1000) - .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) + .setFontSize((int) itemView.getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.dimen.dp_42 : R.dimen.module_v2x_event_distance_text)) .append("公里") - .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) + .setFontSize((int) itemView.getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.dimen.dp_42 : R.dimen.module_v2x_event_distance_title)) .create(); } else { SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) - .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) + .setFontSize((int) itemView.getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.dimen.dp_42 : R.dimen.module_v2x_event_distance_text)) .append("米") .setFontSize((int) itemView.getResources().getDimension( V2XServiceManager.getMoGoStatusManager().isVrMode() ? - R.dimen.module_v2x_event_distance_title_vr : R.dimen.module_v2x_event_distance_title)) + R.dimen.dp_42 : R.dimen.module_v2x_event_distance_title)) .create(); } SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA); diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_daohang_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_daohang_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..8344ac641c046618a863fc3adec42d5e41017e59 GIT binary patch literal 2624 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_tel_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_tel_vr.png new file mode 100644 index 0000000000000000000000000000000000000000..3b65e46367dbc92a6b01f28205cfdcefef6b8a24 GIT binary patch literal 2737 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 literal 0 HcmV?d00001 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml index 82d3c3395f..73892b5ac9 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml index 0c99dfb607..86fe790833 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml @@ -2,8 +2,8 @@ + android:endColor="#FFBF29" + android:startColor="#FFBF29" /> \ No newline at end of file diff --git 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 index 76ddb7d31a..b69404b002 100644 --- 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 @@ -35,13 +35,11 @@ android:layout_marginTop="15dp" android:background="@drawable/bg_v2x_event_type_orange_vr" android:gravity="center" - android:paddingTop="@dimen/dp_2" - android:paddingBottom="@dimen/dp_5" android:text="求助" android:textColor="@android:color/white" - android:textSize="@dimen/module_v2x_event_type_title_text_size" + android:textSize="@dimen/sp_20" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@id/ivFaultHelpHead" @@ -51,8 +49,8 @@ android:id="@+id/tvFaultHelpName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginTop="@dimen/dp_15" + android:layout_marginStart="@dimen/dp_24" + android:layout_marginTop="@dimen/dp_27" android:textColor="#FFFFFF" android:textSize="@dimen/dp_40" android:textStyle="bold" @@ -66,11 +64,13 @@ android:id="@+id/tvFaultHelpEventTime" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_24" + android:layout_marginBottom="@dimen/dp_27" android:alpha="0.59" android:textColor="#FFFFFF" android:textSize="@dimen/dp_24" - app:layout_constraintStart_toStartOf="@id/tvFaultHelpName" - app:layout_constraintTop_toBottomOf="@id/tvFaultHelpName" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@id/ivFaultHelpHead" tools:text="15:30发布求助信息" /> @@ -83,36 +83,33 @@ android:layout_marginRight="@dimen/dp_42" android:gravity="center_vertical" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_70" - android:textStyle="bold" + android:textSize="@dimen/dp_42" app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall" app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall" app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall" - app:layout_constraintVertical_bias="0.466" tools:text="300M" /> + app:layout_constraintTop_toTopOf="parent" + tools:visibility="visible" /> \ No newline at end of file From bcbf035e5e928a38f6335f2f5c716ba08ad678db Mon Sep 17 00:00:00 2001 From: wujifei Date: Tue, 13 Apr 2021 19:33:42 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix#=E3=80=90#521=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=BF=85=E7=8E=B0=E3=80=91=E9=B9=B0=E7=9C=BC=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=94=B6=E5=88=B0=E6=95=85=E9=9A=9C=E6=B1=82?= =?UTF-8?q?=E5=8A=A9=EF=BC=8C=E6=97=A0=E5=AF=BC=E8=88=AA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/extensions/view/ArcView.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java index 7c22a7c303..9dc23e7587 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java @@ -8,6 +8,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.Typeface; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.view.View; @@ -69,10 +70,12 @@ public class ArcView extends View { private void drawText(Canvas canvas) { Rect mRect = new Rect(); String mValue = String.valueOf(currentValue); + mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); //绘制中心的数值 mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect); - canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2, mTextPaint); + canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2-10, mTextPaint); + mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); //绘制中心文字描述 mTextPaint.setTextSize(28); mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect); From 58c8b134c0a8db477ad484e0044ef7fa385bac03 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 15 Apr 2021 11:04:14 +0800 Subject: [PATCH 04/11] opt --- .../java/com/zhidao/roadcondition/service/CarCorderController.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt index faee34d0e5..ac1a0a8a49 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt @@ -499,6 +499,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback { info.type = type //0为图片， 1为视频 info.fromType = fromType info.mainInfoId = mainInfoId + info.infoType = 1 return info } From 1993e98b322821867fbd8fc2ac10345c31bd3a49 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 11:16:19 +0800 Subject: [PATCH 05/11] code style --- .../common/drawer/SnapshotSetDataDrawer.java | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 26f50e85c4..ba8ba13c89 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -179,7 +179,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic // 需要新增的 marker 数量 int newDiffSetSize = newDiffSet.size(); // 能复用的数量 - int size = cachedMarkerSize >= newDiffSetSize ? newDiffSetSize : cachedMarkerSize; + int size = Math.min(cachedMarkerSize, newDiffSetSize); // 复用过期 marker if ( newDiffSetSize > 0 ) { @@ -197,7 +197,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic // 更新资源内容 if ( old == null || old.getType() != cloudRoadData.getType() ) { - String resIdVal = null; + String resIdVal; int resId = getModelRes( cloudRoadData.getType() ); resIdVal = resId + ""; String resName = mMarkerCachesResMd5Values.get( resIdVal ); @@ -238,8 +238,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic /** * 判断类型、uuid 等 * - * @param cloudRoadData - * @return + * @param cloudRoadData {@link CloudRoadData} + * @return isUselessValue */ private boolean isUselessValue( CloudRoadData cloudRoadData ) { if ( cloudRoadData == null ) { @@ -250,17 +250,14 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } String uniqueKey = cloudRoadData.getUniqueKey(); - if ( TextUtils.isEmpty( uniqueKey ) ) { - return true; - } - return false; + return TextUtils.isEmpty(uniqueKey); } /** * 绘制某个物体的一个数据 * - * @param cloudRoadData - * @param newSnapshotCaches + * @param cloudRoadData {@link CloudRoadData} + * @param newSnapshotCaches 缓存数据 */ private void renderSnapshotOneFrame( IMogoMarker marker, String uniqueKey, final CloudRoadData cloudRoadData, Map< String, IMogoMarker > newSnapshotCaches ) { @@ -288,9 +285,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic long cost = System.currentTimeMillis() - start; final long intervalRef = interval - cost; - SimpleHandlerThreadPool.getInstance().postRender( () -> { - marker.addDynamicAnchorPosition( point, ( float ) cloudRoadData.getHeading(), intervalRef ); - } ); + SimpleHandlerThreadPool.getInstance().postRender( () -> marker.addDynamicAnchorPosition( point, ( float ) cloudRoadData.getHeading(), intervalRef )); } else { marker.setRotateAngle( ( ( float ) cloudRoadData.getHeading() ) ); marker.setPosition( cloudRoadData.getWgslat(), cloudRoadData.getWgslon() ); @@ -373,7 +368,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic .gps( true ) .controlAngle( true ) .position( new MogoLatLng( data.getWgslat(), data.getWgslon() ) ); - String resIdVal = null; + String resIdVal; if ( MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ) { options.set3DMode( true ); options.anchorColor( getModelRenderColor( data.getType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading() ) ); From 180e36acdb509b3054c7b07344489f1b25b45a73 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 15:11:58 +0800 Subject: [PATCH 06/11] fix bug --- .../scenario/scene/livecar/V2XPushLiveCarWindow.java | 12 +++++++++--- .../scene/livecar/V2XVoiceCallLiveCarWindow.java | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java index 9549efdb15..f9ec08b008 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java @@ -113,9 +113,15 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow Date: Thu, 15 Apr 2021 15:21:39 +0800 Subject: [PATCH 07/11] fix bug of clear OnlineCarData --- .../module/common/drawer/OnlineCarDrawer.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java index 8418f23054..58f16cadd5 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/OnlineCarDrawer.java @@ -13,6 +13,8 @@ import com.mogo.module.common.entity.MarkerCarPois; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerShowEntity; +import com.mogo.service.statusmanager.IMogoStatusChangedListener; +import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; import java.util.ArrayList; @@ -26,7 +28,7 @@ public * * 描述 */ -class OnlineCarDrawer { +class OnlineCarDrawer implements IMogoStatusChangedListener { private static final String TAG = "OnlineCarDrawer"; @@ -36,6 +38,9 @@ class OnlineCarDrawer { private static volatile OnlineCarDrawer sInstance; private OnlineCarDrawer() { + MogoApisHandler.getInstance().getApis() + .getStatusManagerApi() + .registerStatusChangedListener( TAG, StatusDescriptor.VR_MODE, this ); } public static OnlineCarDrawer getInstance() { @@ -53,11 +58,6 @@ class OnlineCarDrawer { sInstance = null; } - private Object readResolve() { - // 阻止反序列化，必须实现 Serializable 接口 - return sInstance; - } - public void clearMarkers(){ MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager( AbsMogoApplication.getApp() ).removeMarkers( ModuleNames.CARD_TYPE_USER_DATA ); } @@ -196,5 +196,8 @@ class OnlineCarDrawer { return false; } - + @Override + public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) { + clearMarkers(); + } } From 66600c848925d223f20b767d309fc13d2fd0be20 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 15:40:36 +0800 Subject: [PATCH 08/11] fix bug --- .../scene/livecar/V2XPushLiveCarWindow.java | 36 +++++++++---------- .../livecar/V2XVoiceCallLiveCarWindow.java | 24 +++++++------ 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java index f9ec08b008..ad3810f2ee 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java @@ -112,16 +112,7 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow { - //Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。"); - //移出Window详细信息 - //移除窗体 - V2XServiceManager - .getMogoTopViewManager() - .removeViewNoLinkage(this); - }; + //Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。"); + //移出Window详细信息 + runnableV2XEvent = this::close; } else { handlerV2XEvent.removeCallbacks(runnableV2XEvent); } @@ -155,4 +141,18 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow Date: Thu, 15 Apr 2021 17:48:35 +0800 Subject: [PATCH 09/11] update version --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1d9227fd21..38d6182a4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -155,19 +155,19 @@ LOGLIB_VERSION = 1.0.4 ######## MogoAiCloudSDK Version # 网络请求 -MOGO_NETWORK_VERSION=1.0.69 +MOGO_NETWORK_VERSION=1.0.70 # 鉴权 -MOGO_PASSPORT_VERSION=1.0.69 +MOGO_PASSPORT_VERSION=1.0.70 # 常链接 -MOGO_SOCKET_VERSION=1.0.69 +MOGO_SOCKET_VERSION=1.0.70 # 数据采集 -MOGO_REALTIME_VERSION=1.0.69 +MOGO_REALTIME_VERSION=1.0.70 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.0.69 +MOGO_TANLU_VERSION=1.0.70 # 直播推流 -MOGO_LIVE_VERSION=1.0.69 +MOGO_LIVE_VERSION=1.0.70 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.69 +MOGO_TRAFFICLIVE_VERSION=1.0.70 ######## Foundation MogoAiCloud Module # mogoAiCloud apk services From 33f18b385a5bbe6f1a52e6b984d3f30a4a257710 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 15 Apr 2021 18:18:35 +0800 Subject: [PATCH 10/11] close v2x front v2xlive ivClose --- .../v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java | 4 ++-- .../src/main/res/layout/window_see_carlive_video.xml | 1 + .../src/main/res/layout/window_see_carlive_video_vr.xml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java index 1db6ae4d66..2a7acd3c2a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveCarWindow.java @@ -55,7 +55,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow : R.layout.window_see_carlive_video, this); CarZegoLiveVideoView mV2XCarLiveVideoView = findViewById(R.id.videoPlayer); tvCountDown = findViewById(R.id.tvCountDown); - ImageView ivLiveVideoClose = findViewById(R.id.liveVideoClose); +// ImageView ivLiveVideoClose = findViewById(R.id.liveVideoClose); ivVideoPlayingSign = findViewById(R.id.ivVideoPlayingSign); mV2XCarLiveVideoView.addOnVideoStatusChangeListener(videoPlaying -> { isVideoPlay = videoPlaying; @@ -65,7 +65,7 @@ public class V2XVoiceCallLiveCarWindow extends V2XBasWindow stopCountDown(); } }); - ivLiveVideoClose.setOnClickListener(v -> close()); +// ivLiveVideoClose.setOnClickListener(v -> close()); } @Override diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml index 335bf86fc1..2b73411810 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video.xml @@ -20,5 +20,6 @@ android:layout_marginTop="@dimen/dp_20" android:clickable="true" android:focusable="true" + android:visibility="gone" android:src="@drawable/module_v2x_vr_close" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml index b27461dcef..02c4174e76 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_see_carlive_video_vr.xml @@ -20,6 +20,7 @@ android:layout_marginTop="@dimen/dp_20" android:clickable="true" android:focusable="true" + android:visibility="gone" android:src="@drawable/module_v2x_vr_close" /> \ No newline at end of file From 9c87517b0e5790aeeeb10f926ea5eb1eb2b40e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 16 Apr 2021 10:13:08 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9C=B0=E5=9B=BESDK?= =?UTF-8?q?=EF=BC=9A1.0.0-vr-8.5.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/map-custom/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 28941cfea3..aebc219be0 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.6' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.7' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' }