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

Merge branch 'lk' into dev

Browse Source
This commit is contained in:
liujing
2020-11-02 15:07:31 +08:00
parent ddbfd28b46 7776432519
commit bcb507fe11
6 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
View File

@@ -28,6 +28,7 @@ import com.mogo.module.v2x.scenario.scene.road.V2XRoadVideoWindow;
import com.mogo.module.v2x.utils.ChartingUtil;
import com.mogo.module.v2x.utils.EventTypeUtils;
import com.mogo.module.v2x.utils.SpanUtils;
import com.mogo.module.v2x.view.HeartLikeView;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceConstants;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -69,7 +70,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
private ImageView ivEventCallChart;
private ImageView ivEventReportTrue;
private ImageView ivEventReportErr;
private ImageView ivEventZan;
private HeartLikeView ivEventZan;
// 上传事件的用户信息
@@ -273,7 +274,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
ivEventCallChart.setVisibility(GONE);
triggerCallChart(mNoveltyInfo);
});
ivEventZan.setOnClickListener(v -> {
ivEventZan.setOnClickCallListener(v -> {
triggerZan(mNoveltyInfo);
});

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

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

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/v2x_event_icon_zan" android:state_pressed="true" />
<item android:drawable="@drawable/v2x_icon_zan1" android:state_pressed="false" /> />
</selector>

21
modules/mogo-module-v2x/src/main/res/drawable/v2xt_dw_common_corner_bkg_dark.xml
View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="false">
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="180"
android:endColor="#3F4057"
android:startColor="#3F4057" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
<corners android:radius="@dimen/dp_180" />
<gradient
android:angle="180"
android:endColor="#3F4057"
android:startColor="#3F4057" />
</shape>
</item>
</selector>

8
modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml
View File

@@ -192,17 +192,17 @@
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
<ImageView
<com.mogo.module.v2x.view.HeartLikeView
android:id="@+id/ivEventZan"
android:layout_width="@dimen/module_v2x_event_button_size_detail"
android:layout_height="@dimen/module_v2x_event_button_size_detail"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_15"
android:src="@drawable/v2x_event_icon_zan"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivEventLive"
app:layout_constraintStart_toEndOf="@id/ivEventEventNav"
app:layout_goneMarginLeft="@dimen/dp_10"
tools:visibility="visible" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>