diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt index 205574766b..d7db18d27f 100644 --- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt +++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/MainService.kt @@ -315,7 +315,7 @@ class MainService : Service() { isCustom: Boolean = false, id: Long = 0 ) { - Log.d("MainService", "takeVideo --------1----> fromType = $fromType") + Log.d("MainService", "takeVideo --------1----> fromType = $fromType --isCustom = $isCustom") // if (isAuthorization(BaseApplication.getAppContext())) { CarCorderController.takeVideo(1, duration, isCustom, id, shareType, mainInfoId, fromType, mLongitude, mLatitude, speed) // } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java index b93f3bedce..e78d6601cc 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java @@ -13,6 +13,7 @@ import android.os.Message; import android.text.TextUtils; import android.util.Log; import android.view.MotionEvent; +import android.view.View; import androidx.annotation.NonNull; @@ -77,9 +78,12 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.network.RequestOptions; import com.mogo.utils.network.utils.GsonUtil; import com.zhidao.carchattingprovider.CallChattingProviderConstant; +import com.zhidao.carchattingprovider.ICallProviderResponse; import com.zhidao.carchattingprovider.ICarsChattingProvider; import com.zhidao.smartv2x.common.utils.LoggerUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import java.util.List; @@ -172,6 +176,8 @@ public class MogoServices implements IMogoMapListener, private IMogoNavi mNavi; private IMogoRegisterCenter mRegisterCenter; + private ICallProviderResponse mCallProviderResponse; + /** * 地图视图初始化 */ @@ -397,12 +403,104 @@ public class MogoServices implements IMogoMapListener, */ private void closeAllPanel() { LoggerUtils.log("zy=======stop"); + // TODO @钟超 需要修改下kotlin的校验 + mCallProviderResponse = new ICallProviderResponse(){ + @Override + public void mute(boolean b) { + + } + + @Override + public void matchInvokeResult(boolean b, @NotNull String s) { + + } + + @Override + public void match(@NotNull String s) { + + } + + @Override + public void invokeCallData(@NotNull String s) { + + } + + @Override + public void hangUp(boolean b) { + + } + + @Override + public void error(@NotNull String s) { + + } + + @Override + public void cancelMatch(boolean b) { + + } + + @Override + public void call(@NotNull String s) { + + } + + @Override + public void userWindowStatus(boolean b) { + + } + + @Override + public void userInfoCallBack(@Nullable String s, @Nullable String s1) { + + } + + @Override + public void isOnLine(boolean b, @Nullable String s) { + + } + + @Override + public void isFriend(boolean b) { + + } + + @Override + public void invisibleUser(boolean b) { + + } + + @Override + public void hideUserWindowError(@NotNull String s) { + + } + + @Override + public void canCall(boolean b) { + + } + + @Override + public void callInvokeError(@NotNull String s) { + + } + + @Override + public void addFriend(boolean b) { + + } + + @Override + public void callWindowStatus( boolean b ) { + + } + }; MogoApisHandler.getInstance().getApis().getShareManager().dismissShareDialog(); MogoApisHandler.getInstance().getApis().getOnlineCarPanelApi().hidePanel(); MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSettingStatus(false); MogoApisHandler.getInstance().getApis().getEventPanelManager().hidePanel(); carsChattingProvider = (ICarsChattingProvider) ARouter.getInstance().build(CallChattingProviderConstant.CAR_CALL_PROVIDER).navigation(); - carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, null); + carsChattingProvider.hideUserWindow("MOGO_COMMON_SERVICE", mContext, mCallProviderResponse); } public void init(Context context) { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java index 62431f4d62..b7a6665727 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingDetailAdapter.java @@ -6,15 +6,21 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.v2x.R; +import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.adapter.holder.V2XSurroundingDetailVH; import com.mogo.module.v2x.entity.panel.SurroundingConstruction; +import com.mogo.module.v2x.utils.RoadConditionUtils; +import com.mogo.module.v2x.view.HeartLikeView; +import com.mogo.module.v2x.view.HeartUnLikeView; import com.mogo.utils.DateTimeUtils; +import com.mogo.utils.logger.Logger; import java.util.List; @@ -26,10 +32,12 @@ import java.util.List; public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { private List markerExploreWays; private Context mContext; - private ImageView mTypeImageView; private TextView mTypeTv; private TextView mAddressTv; + private TextView mUserNameTv; private TextView mTimeTv; + private HeartLikeView mHeartLikeView; + private HeartUnLikeView mUnHeartLikeView; public V2XSurroundingDetailAdapter(Context context, List list) { @@ -57,18 +65,52 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { + Logger.d(V2XConst.MODULE_NAME, "反馈有用"); + roadReportTrue(exploreWay); + }); + + mUnHeartLikeView.setOnClickCallListener(v -> { + Logger.d(V2XConst.MODULE_NAME, "反馈无用"); + roadReportErr(exploreWay); + }); } + /** + * 反馈路况正确 + */ + private void roadReportTrue(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 2); + } + } + + /** + * 反馈路况错误 + */ + private void roadReportErr(MarkerExploreWay exploreWay) { + if (exploreWay != null) { + RoadConditionUtils.sendShareReceiverInfo( + exploreWay.getInfoId(), + exploreWay.getPoiType(), + 3); + } + } @Override public int getItemCount() { @@ -113,4 +155,6 @@ public class V2XSurroundingDetailAdapter extends RecyclerView.Adapter { mAddressTv = itemView.findViewById(R.id.tvAddress); mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum); mIlIllegalParkingLike = itemView.findViewById(R.id.llIllegalParkingLike); + Drawable drawable = ContextCompat.getDrawable(viewGroup.getContext(), R.drawable.icon_heart_like_bg); + mIlIllegalParkingLike.setBackground(drawable); mIIllegalParkingUnLike = itemView.findViewById(R.id.llIllegalParkingUnLike); // 设置视图状态监听 diff --git 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 index 85c7effcc5..ba73a92fc6 100644 --- 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 @@ -1,6 +1,7 @@ package com.mogo.module.v2x.adapter.holder; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -9,6 +10,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.content.ContextCompat; + import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerUserInfo; @@ -133,6 +136,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventLive = itemView.findViewById(R.id.ivEventLive); ivEventCallChart = itemView.findViewById(R.id.ivEventCallChart); ivEventZan = itemView.findViewById(R.id.ivEventZan); + Drawable drawable = ContextCompat.getDrawable(itemView.getContext(), R.drawable.icon_heart_like_bg); + ivEventZan.setBackground(drawable); ivEventReportTrue = itemView.findViewById(R.id.ivEventReportTrue); ivEventReportErr = itemView.findViewById(R.id.ivEventReportErr); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index e32d6aef52..3998c9a69a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -1,11 +1,14 @@ package com.mogo.module.v2x.adapter.holder; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XHistoryScenarioData; @@ -47,6 +50,8 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml index 59251e78da..8d055540e7 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_scennario_history_other_help.xml @@ -97,7 +97,7 @@ android:id="@+id/tvFaultHelpDistance" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_33" + android:layout_marginStart="@dimen/dp_33" android:layout_marginTop="@dimen/dp_5" android:layout_marginEnd="@dimen/dp_30" android:textColor="@color/v2x_FFF_333" @@ -113,6 +113,7 @@ android:layout_height="@dimen/module_v2x_event_button_size" android:layout_marginEnd="@dimen/dp_40" android:src="@drawable/selector_call_btn" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index b3ecc8754a..dca25c89b9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -167,33 +167,35 @@ + android:layout_width="43px" + android:layout_height="43px"/> + android:textSize="18px" /> - diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml index 075ce59f72..3753401c25 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_surrounding_detail_item.xml @@ -1,53 +1,89 @@ - + android:layout_marginTop="@dimen/dp_24" + android:layout_marginRight="@dimen/dp_30" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/v2x_FFF_333" + android:textSize="18px" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/surrounding_road_like" + app:layout_constraintStart_toStartOf="@id/surrounding_road_type" + app:layout_constraintTop_toTopOf="parent" + tools:text="小黄庄北街与北三环辅路交叉口小黄庄北街与北三环辅路交叉口" /> + android:alpha="0.6" + android:textColor="@color/v2x_FFF_666" + android:textSize="16px" + android:layout_marginStart="@dimen/dp_36" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="赵云" /> - \ No newline at end of file + android:textSize="16px" + android:layout_marginStart="@dimen/dp_80" + app:layout_constraintStart_toStartOf="@+id/surrounding_username" + app:layout_constraintTop_toBottomOf="@+id/surrounding_road_type_address" + tools:text="2020-1-12" /> + + + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml index 8080b8a457..9abaf966f6 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_like.xml @@ -3,7 +3,6 @@ android:id="@+id/llIllegalParkingLike" android:layout_width="@dimen/module_v2x_event_button_size" android:layout_height="@dimen/module_v2x_event_button_size" - android:background="@drawable/icon_heart_like_bg" android:gravity="center"> @dimen/dp_40 + + + + + \ No newline at end of file