yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'vr' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
liujing
2020-12-09 16:04:50 +08:00
parent 89100d75fc cf02246aab
commit 24dab9f31e
9 changed files with 49 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
View File

@@ -24,6 +24,7 @@ import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.utils.GsonUtil;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
import static com.mogo.module.v2x.V2XConst.VR_MODE;
/**
* e-mail : 1358506549@qq.com
@@ -47,7 +48,7 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder<V2XEventShowEntity> {
public V2XIllegalParkVH(ViewGroup viewGroup) {
super(LayoutInflater.from(viewGroup.getContext())
.inflate(R.layout.item_v2x_illegal_parking, viewGroup, false));
.inflate(VR_MODE ? R.layout.item_v2x_illegal_parking_vr : R.layout.item_v2x_illegal_parking, viewGroup, false));
mAddressTv = itemView.findViewById(R.id.tvAddress);
mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum);
@@ -105,7 +106,7 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder<V2XEventShowEntity> {
*/
@Override
public void delayedCloseWindow() {
V2XHistoryScenarioData v2XHistoryScenarioData =new V2XHistoryScenarioData();
V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData();
v2XHistoryScenarioData.setScenarioType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING);
v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(mExploreWay));
v2XHistoryScenarioData.setEventJsonDataHashCode(mExploreWay.hashCode());

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
View File

@@ -13,6 +13,8 @@ import androidx.annotation.Nullable;
import com.mogo.module.v2x.R;
import static com.mogo.module.v2x.V2XConst.VR_MODE;
/**
* 不喜欢按钮控件
*
@@ -35,7 +37,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi
public HeartUnLikeView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
inflate(context, R.layout.view_heart_unlike, this);
inflate(context, VR_MODE ? R.layout.view_heart_unlike_vr : R.layout.view_heart_unlike, this);
mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike);
setOnClickListener(v -> {

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_like.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_unlike.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

8
modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_red_two_round_vr.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:angle="45"
android:endColor="#FF4B46"
android:startColor="#E82923"/>
<corners android:bottomLeftRadius="@dimen/dp_20" android:topLeftRadius="@dimen/dp_20"/>
</shape>

31
modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml
View File

@@ -4,21 +4,28 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rlContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_120"
android:background="@drawable/v2x_bg_pop_up"
android:paddingStart="@dimen/dp_62"
android:paddingTop="@dimen/dp_42"
android:paddingEnd="@dimen/dp_62"
android:paddingBottom="@dimen/dp_42">
android:paddingEnd="@dimen/dp_62">
<ImageView
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:id="@+id/leftImageView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@drawable/bg_v2x_red_two_round_vr"/>
<ImageView
android:id="@+id/ivIconP"
android:layout_width="@dimen/module_v2x_event_icon_size"
android:layout_height="@dimen/module_v2x_event_icon_size"
android:layout_width="@dimen/module_v2x_event_icon_size_vr"
android:layout_height="@dimen/module_v2x_event_icon_size_vr"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="@+id/leftImageView"
app:layout_constraintStart_toStartOf="@+id/leftImageView"
app:layout_constraintTop_toTopOf="@+id/leftImageView"
app:layout_constraintEnd_toEndOf="@+id/leftImageView"/>
<TextView
android:id="@+id/tagEventType"
@@ -35,8 +42,8 @@
android:textSize="@dimen/dp_40"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/ivIconP"
app:layout_constraintTop_toTopOf="@+id/ivIconP" />
app:layout_constraintStart_toEndOf="@+id/leftImageView"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvAddress"

3
modules/mogo-module-v2x/src/main/res/layout/view_heart_like_vr.xml
View File

@@ -3,12 +3,11 @@
android:id="@+id/llIllegalParkingLike"
android:layout_width="@dimen/module_v2x_event_button_size_vr"
android:layout_height="@dimen/module_v2x_event_button_size_vr"
android:background="@drawable/icon_heart_like_bg"
android:gravity="center">
<ImageView
android:id="@+id/ivIllegalParkingLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_heart_like_vr" />
android:src="@drawable/v2x_event_icon_no_parking_like" />
</LinearLayout>

14
modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike_vr.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/llIllegalParkingUnLike"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
android:gravity="center">
<ImageView
android:id="@+id/ivIllegalParkingUnLike"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/v2x_event_icon_no_parking_unlike" />
</LinearLayout>

5
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -9,10 +9,7 @@
<dimen name="module_v2x_push_img_container_height">410px</dimen>
<dimen name="module_v2x_event_see_live_window_height">670px</dimen>
<dimen name="module_v2x_event_icon_size">147px</dimen>
<dimen name="module_v2x_event_distance_text">60px</dimen>
<dimen name="module_v2x_event_distance_title">40px</dimen>
@@ -92,6 +89,7 @@
<dimen name="module_v2x_event_button_size_detail_vr">80px</dimen>
<dimen name="module_v2x_event_window_height_vr">120px</dimen>
<dimen name="module_v2x_event_button_size_vr">64px</dimen>
<dimen name="module_v2x_event_icon_size_vr">60px</dimen>
<!--道路事件 高的弹窗-->
<dimen name="module_v2x_event_window_height">330px</dimen>
@@ -112,7 +110,6 @@
<dimen name="module_v2x_event_panel_btn_x">940px</dimen>
<dimen name="module_v2x_event_panel_in_launcher_btn_x">940px</dimen>
<dimen name="module_v2x_event_panel_btn_y">701px</dimen>
<dimen name="module_v2x_event_distance_title_vr">32px</dimen>
<!--适配直播框-->