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

Merge branch 'dev_robobus-d_230413_3.1.0' into dev_robobus_gradle_och_230317

Browse Source
This commit is contained in:
yangyakun
2023-04-14 17:40:27 +08:00
parent 3869871bdc e59d32e7d1
commit 722ee12e2b
86 changed files with 523 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-bus-passenger/build.gradle
View File

@@ -30,6 +30,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

18
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
View File

@@ -6,6 +6,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -77,14 +78,23 @@ public class MogoOCHBusPassenger implements IMogoOCH {
}
private void showFragment() {
if (mPassengerFragment == null) {
FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
if(mPassengerFragment == null){
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
mPassengerFragment = new BusPassengerRouteFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mPassengerFragment).commitAllowingStateLoss();
Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG);
if (fragmentByTag instanceof BusPassengerRouteFragment){
mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag;
}else {
mPassengerFragment = new BusPassengerRouteFragment();
}
if (!mPassengerFragment.isAdded()){
supportFragmentManager.beginTransaction().add(mContainerId, mPassengerFragment,BusPassengerRouteFragment.TAG).commitAllowingStateLoss();
}
return;
}
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
}
private void hideFragment(){

2
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -40,7 +40,7 @@ public class BusPassengerRouteFragment extends
BusPassengerBaseFragment<BusPassengerRouteFragment, BaseBusPassengerPresenter>
implements IBusPassengerMapViewCallback {
private final String TAG = "BusPassengerRouteFragment";
public static final String TAG = "BusPassengerRouteFragment";
private final List<BusPassengerStation> mStationsList = new ArrayList<>();

4
OCH/mogo-och-bus/build.gradle
View File

@@ -28,6 +28,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

44
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
View File

@@ -1,10 +1,10 @@
package com.mogo.och.bus.fragment;
import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.TextView;
@@ -14,7 +14,9 @@ import androidx.constraintlayout.widget.Group;
import androidx.annotation.Nullable;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.data.map.CenterLine;
import com.mogo.eagle.core.data.temp.EventLogout;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -37,6 +39,8 @@ import com.mogo.och.common.module.biz.constant.OchCommonConst;
import com.mogo.och.common.module.biz.provider.LoginService;
import com.mogo.och.common.module.utils.BlinkAnimationUtil;
import com.mogo.och.common.module.utils.OCHThreadPoolManager;
import com.mogo.och.common.module.utils.QRUtilsKt;
import com.mogo.och.common.module.wigets.BindQRCodeDialog;
import com.mogo.och.common.module.wigets.MarqueeTextView;
import com.mogo.och.common.module.wigets.OCHCommitDialog;
@@ -46,6 +50,8 @@ import org.greenrobot.eventbus.ThreadMode;
import java.util.List;
import java.util.Objects;
import me.jessyan.autosize.utils.AutoSizeUtils;
/**
* 网约车小巴界面
@@ -125,6 +131,22 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
mPresenter.logout();
}else if (eventLogout.getMessgae() == EventLogout.SHOW_QR_TYPE){ //显示二维码
CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event qrcode");
String qrUrl = String.format(FunctionBuildConfig.urlJson.getBindDriverQRUrl(),
MoGoAiCloudClientConfig.getInstance().getSn());
Bitmap bmQr = QRUtilsKt.createQRCodeWithPicture(
BitmapFactory.decodeResource(getResources(), R.drawable.icon_qr_center_logo)
,qrUrl, AutoSizeUtils.dp2px(getContext(),340f),
AutoSizeUtils.dp2px(getContext(),340f),true);
if (bmQr != null){
BindQRCodeDialog.Builder builder = new BindQRCodeDialog.Builder();
builder.title(getString(R.string.bind_driver_qr_title))
.cancelStr(getString(R.string.qr_cancel))
.qrBm(bmQr).build(getContext()).show();
}else {
CallerLogger.INSTANCE.d(M_BUS + TAG,"bmQr = null ");
}
}
}
@@ -360,16 +382,16 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
}else {
firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color));
thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected));
if (isArrived){ //到终点
firstStationItem.setStationPointBg(0);
firstStationItem.setStationArrowBg(0);
thirdStationItem.setStationPointBg(1);
if (isArrived){ //到终点
firstStationItem.setStationPointBg(0);
firstStationItem.setStationArrowBg(0);
thirdStationItem.setStationPointBg(1);
}else { //到终点途中
firstStationItem.setStationPointBg(0);
firstStationItem.setStationArrowBg(1);
thirdStationItem.setStationPointBg(1);
}
}else { //到终点途中
firstStationItem.setStationPointBg(0);
firstStationItem.setStationArrowBg(1);
thirdStationItem.setStationPointBg(1);
}
}
}

14
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/adapter/SwitchLineAdapter.kt
View File

@@ -62,10 +62,16 @@ class SwitchLineAdapter(
line.taskList,
object : SwitchLineTaskAdapter.TaskItemClickListener {
override fun onItemClick(position: Int,isCheck:Boolean) {
if(isCheck) {
checkLineId = line.lineId
checkTaskId = line.taskList[position].id
}else{
try {
if (isCheck) {
checkLineId = line.lineId
checkTaskId = line.taskList[position].id
} else {
checkLineId = -1
checkTaskId = -1
}
}catch (e:Exception){
e.printStackTrace()
checkLineId=-1
checkTaskId=-1
}

4
OCH/mogo-och-charter-passenger/build.gradle
View File

@@ -30,6 +30,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

21
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.och.bus.passenger
import android.content.Context
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.FragmentManager
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager.getMapUIController
import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager.stepInDayMode
@@ -51,16 +52,26 @@ class MogoOCHBusPassenger : IMogoOCH {
}
private fun showFragment() {
val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager
if (mPassengerFragment == null) {
d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
mPassengerFragment = MainFragment()
mActivity!!.supportFragmentManager.beginTransaction()
.add(mContainerId, mPassengerFragment!!).commitAllowingStateLoss()
var fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(MainFragment.TAG)
mPassengerFragment = if (fragmentByTag is MainFragment){
fragmentByTag
}else{
MainFragment()
}
if (!mPassengerFragment?.isAdded!!){
supportFragmentManager?.beginTransaction()
?.add(mContainerId, mPassengerFragment!!, MainFragment.TAG)?.commitAllowingStateLoss()
}
return
}
d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
mActivity!!.supportFragmentManager.beginTransaction().show(mPassengerFragment!!)
.commitAllowingStateLoss()
supportFragmentManager?.beginTransaction()?.show(mPassengerFragment!!)
?.commitAllowingStateLoss()
}
private fun hideFragment() {

19
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -852,18 +852,19 @@ object CharterPassengerModel {
@Synchronized
fun arriveDest() {
orderInfo?.lineId?.let {
if(orderInfo!!.arriveStatus==OrderInfoResponse.ARRIVING) {
if (broadcastList.get("${it}$endKey")==null||broadcastList.get("${it}$endKey")==false) {
orderInfo?.siteId?.let { siteId ->
if (orderInfo!!.arriveStatus == OrderInfoResponse.ARRIVING) {
if (broadcastList.get("${siteId}$endKey") == null || broadcastList.get("${siteId}$endKey") == false) {
BusPassengerServiceManager.arriveDest(
mContext, lindId = it, object : OchCommonServiceCallback<BaseData> {
override fun onSuccess(data: BaseData?) {
if (null != data && 0 == data.code) {
VoiceManager.arrivedStation(
orderInfo!!.siteName!!,
orderInfo!!.siteNameKr!!,
orderInfo!!.siteNameKr ?: "",
VoiceFocusManager.getVoiceCmdCallBack()
)
broadcastList["${it}$endKey"] = true
broadcastList["${siteId}$endKey"] = true
// 到站结束自驾
CallerAutoPilotControlManager.cancelAutoPilot()
// 结束路距计算
@@ -878,16 +879,18 @@ object CharterPassengerModel {
}
})
}
}
}
}
}
fun cleanbroadcastListInfo(){
broadcastList.clear()
}
fun leaveStation() {
orderInfo?.siteName?.let {cn->
orderInfo?.siteNameKr?.let {kr->
VoiceManager.leaveStation(cn,kr, VoiceFocusManager.getVoiceCmdCallBack())
}
VoiceManager.leaveStation(cn,orderInfo?.siteNameKr?:"", VoiceFocusManager.getVoiceCmdCallBack())
}
}

2
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/MainFragment.kt
View File

@@ -255,6 +255,6 @@ class MainFragment :
}
companion object {
private const val TAG = "BusPassengerRouteFragment"
public const val TAG = "BusPassengerRouteFragment"
}
}

1
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt
View File

@@ -441,6 +441,7 @@ class LineSiteView @JvmOverloads constructor(
}
go2StartCar()
CharterPassengerModel.queryOrder()
CharterPassengerModel.cleanbroadcastListInfo()
} else {
tempCheckLineIsSubmit = true
ToastUtils.showShort("司机端拒绝请重新选择")

4
OCH/mogo-och-charter/build.gradle
View File

@@ -29,6 +29,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

3
OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/CharterProvider.kt
View File

@@ -41,12 +41,13 @@ class CharterProvider: ICharterOCH{
} else {
DriverM1Fragment()
}
if (!driverM1Fragment!!.isAdded) {
if (!driverM1Fragment?.isAdded!!) {
mContainerId?.let {
supportFragmentManager?.beginTransaction()
?.add(it, driverM1Fragment!!, DriverM1Fragment.TAG)?.commitAllowingStateLoss()
}
}
return
}
d(TAG, "准备show fragment")
supportFragmentManager?.beginTransaction()?.show(driverM1Fragment!!)?.commitAllowingStateLoss()

9
OCH/mogo-och-charter/src/main/java/com/magic/mogo/och/charter/base/CharterBaseFragment.kt
View File

@@ -326,16 +326,13 @@ abstract class CharterBaseFragment<V : IView?, P : Presenter<V>?>() :
}else{
ctvAutopilotStatusTv!!.setTextColor(resources.getColor(R.color.bus_autopilot_text_color_normal))
ctvAutopilotStatusIv!!.setImageResource(R.drawable.bus_ic_autopilot)
ctvAutopilotStatusTv!!.text =
resources.getString(R.string.bus_loading_autopilot_runnig_tv)
ctvAutopilotStatus!!.isClickable = true
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) { //1可用
// ctvAutopilotStatus!!.isSelected = false
ctvAutopilotStatus!!.isClickable = true
ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_0_1_status_bg)
} else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) {
ctvAutopilotStatusTv!!.text =
resources.getString(R.string.bus_loading_autopilot_runnig_tv)
ctvAutopilotStatus!!.isClickable = true
ctvAutopilotStatus!!.background = getDrawable(R.drawable.bus_autopilot_2_status_bg)
// ctvAutopilotStatus!!.isSelected = true
} else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING
== autopilotStatus){
ctvAutopilotStatusTv!!.text =

4
OCH/mogo-och-common-module/build.gradle
View File

@@ -30,6 +30,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = "1.8"
}

4
OCH/mogo-och-data/build.gradle
View File

@@ -24,6 +24,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '1.8'
}

4
OCH/mogo-och-noop/build.gradle
View File

@@ -32,6 +32,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

4
OCH/mogo-och-shuttle-passenger/build.gradle
View File

@@ -30,6 +30,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

19
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/MogoOCHBusPassenger.java
View File

@@ -6,6 +6,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
@@ -77,14 +78,24 @@ public class MogoOCHBusPassenger implements IMogoOCH {
}
private void showFragment() {
if (mPassengerFragment == null) {
FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
if(mPassengerFragment == null){
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
mPassengerFragment = new BusPassengerRouteFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, mPassengerFragment).commitAllowingStateLoss();
Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(BusPassengerRouteFragment.TAG);
if (fragmentByTag instanceof BusPassengerRouteFragment){
mPassengerFragment = (BusPassengerRouteFragment)fragmentByTag;
}else {
mPassengerFragment = new BusPassengerRouteFragment();
}
if (!mPassengerFragment.isAdded()){
supportFragmentManager.beginTransaction().add(mContainerId, mPassengerFragment
,BusPassengerRouteFragment.TAG).commitAllowingStateLoss();
}
return;
}
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
supportFragmentManager.beginTransaction().show(mPassengerFragment).commitAllowingStateLoss();
}
private void hideFragment(){

2
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java
View File

@@ -41,7 +41,7 @@ public class BusPassengerRouteFragment extends
BusPassengerBaseFragment<BusPassengerRouteFragment, BaseBusPassengerPresenter>
implements IBusPassengerMapViewCallback {
private final String TAG = "BusPassengerRouteFragment";
public static final String TAG = "BusPassengerRouteFragment";
private final List<BusStationBean> mStationsList = new ArrayList<>();

22
OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/BusPassengerM2.kt
View File

@@ -3,6 +3,7 @@ package com.mogo.och.bus.passenger
import android.content.Context
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.FragmentManager
import com.alibaba.android.arouter.facade.annotation.Route
import com.mogo.commons.module.status.IMogoStatusChangedListener
import com.mogo.commons.module.status.MogoStatusManager
@@ -58,14 +59,27 @@ class MogoOCHBusPassenger : IMogoOCH, IMogoStatusChangedListener {
}
private fun showFragment() {
val supportFragmentManager: FragmentManager? = mActivity?.supportFragmentManager
if (mPM2Fragment == null) {
d(SceneConstant.M_TAXI_P + TAG, "准备add fragment======")
mPM2Fragment = PM2BaseFragment()
mActivity?.supportFragmentManager?.beginTransaction()
?.add(mContainerId, mPM2Fragment!!)?.commitAllowingStateLoss()
var fragmentByTag: Fragment? = supportFragmentManager?.findFragmentByTag(PM2BaseFragment.TAG)
mPM2Fragment = if (fragmentByTag is PM2BaseFragment){
fragmentByTag
}else{
PM2BaseFragment()
}
if (!mPM2Fragment?.isAdded!!){
supportFragmentManager?.beginTransaction()
?.add(mContainerId, mPM2Fragment!!, PM2BaseFragment.TAG)?.commitAllowingStateLoss()
}
return
}
d(SceneConstant.M_TAXI_P + TAG, "准备show fragment")
mActivity?.supportFragmentManager?.beginTransaction()?.show(mPM2Fragment!!)
supportFragmentManager?.beginTransaction()?.show(mPM2Fragment!!)
?.commitAllowingStateLoss()
}

2
OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt
View File

@@ -67,6 +67,6 @@ class PM2BaseFragment :
}
companion object {
private val TAG = PM2BaseFragment::class.java.simpleName
public val TAG = PM2BaseFragment::class.java.simpleName
}
}

97
OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt
View File

@@ -30,10 +30,6 @@ class AdvanceVideoView @JvmOverloads constructor(
private var videoRelativeLayout: RelativeLayout? = null
private var cacheImage: ImageView? = null
private var connerTopLeft: ImageView? = null
private var connerTopRight: ImageView? = null
private var connerBottomLeft: ImageView? = null
private var connerBottomRight: ImageView? = null
private var videoViewPlayer: AdvanceGSYVideoPlayer? = null
private var gsyVideoOptionBuilder: GSYVideoOptionBuilder? = null
@@ -44,7 +40,7 @@ class AdvanceVideoView @JvmOverloads constructor(
private var mVideoDirPath: String? = ""
init {
mVideoDirPath = context.filesDir.absolutePath+ File.separator + "video" + File.separator
mVideoDirPath = context.filesDir.absolutePath + File.separator + "video" + File.separator
// mVideoDirPath = Config.downLoadPath
initView()
}
@@ -63,7 +59,7 @@ class AdvanceVideoView @JvmOverloads constructor(
private fun initVideoView() {
videoRelativeLayout = RelativeLayout(context)
val outLayout = LayoutParams(-1, -1)
addView(videoRelativeLayout,outLayout)
addView(videoRelativeLayout, outLayout)
if (videoViewPlayer === null) {
//视频播放控件
@@ -78,49 +74,15 @@ class AdvanceVideoView @JvmOverloads constructor(
layoutParams.addRule(ALIGN_PARENT_BOTTOM)
videoRelativeLayout?.addView(videoViewPlayer, layoutParams)
val imageSize = AutoSizeUtils.dp2px(context, 25f)
if(connerTopLeft==null){
connerTopLeft = ImageView(context)
connerTopLeft?.setImageResource(R.drawable.m2_video_top_left)
}
val layoutParentTopLeft = LayoutParams(imageSize, imageSize)
layoutParentTopLeft.addRule(ALIGN_PARENT_TOP)
layoutParentTopLeft.addRule(ALIGN_PARENT_LEFT)
videoRelativeLayout?.addView(connerTopLeft, layoutParentTopLeft)
if(connerTopRight==null){
connerTopRight = ImageView(context)
connerTopRight?.setImageResource(R.drawable.m2_video_top_right)
}
val layoutParentTopRight = LayoutParams(imageSize, imageSize)
layoutParentTopRight.addRule(ALIGN_PARENT_TOP)
layoutParentTopRight.addRule(ALIGN_PARENT_RIGHT)
videoRelativeLayout?.addView(connerTopRight, layoutParentTopRight)
if(connerBottomLeft==null){
connerBottomLeft = ImageView(context)
connerBottomLeft?.setImageResource(R.drawable.m2_video_bottom_left)
}
val layoutParentBottomLeft = LayoutParams(imageSize, imageSize)
layoutParentBottomLeft.addRule(ALIGN_PARENT_BOTTOM)
layoutParentBottomLeft.addRule(ALIGN_PARENT_LEFT)
videoRelativeLayout?.addView(connerBottomLeft, layoutParentBottomLeft)
if(connerBottomRight==null){
connerBottomRight = ImageView(context)
connerBottomRight?.setImageResource(R.drawable.m2_video_bottom_right)
}
val layoutParentBottomRight = LayoutParams(imageSize, imageSize)
layoutParentBottomRight.addRule(ALIGN_PARENT_RIGHT)
layoutParentBottomRight.addRule(ALIGN_PARENT_BOTTOM)
videoRelativeLayout?.addView(connerBottomRight, layoutParentBottomRight)
}
fun setVideoPath(path: String,cacheImageUrl: String) {
fun setVideoPath(path: String, cacheImageUrl: String) {
// https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v
// https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4
this.fileNetPath = path
this.cacheImageUrl = cacheImageUrl
val pathList = path.split("/")
if (pathList.isNotEmpty()){
if (pathList.isNotEmpty()) {
this.downloadVideoName = pathList[pathList.size - 1]
}
}
@@ -129,7 +91,7 @@ class AdvanceVideoView @JvmOverloads constructor(
// BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*
// OCHThreadPoolManager.getsInstance().execute {
// var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath)
Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
Logger.d(ImageAndVideoRotation.TAG, "setVideoPath")
// ThreadUtils.runOnUiThread {
// Logger.d(ImageAndVideoRotation.TAG, "bitmap加载")
cacheImage?.setImageResource(R.drawable.m2_p_video_holder)
@@ -150,9 +112,10 @@ class AdvanceVideoView @JvmOverloads constructor(
// }
}
fun clearLocalErrorVideo(){
fun clearLocalErrorVideo() {
if (downloadVideoName.isNotEmpty()
&& FileUtils.isFileExists(mVideoDirPath + downloadVideoName)){
&& FileUtils.isFileExists(mVideoDirPath + downloadVideoName)
) {
FileUtils.delete(mVideoDirPath + downloadVideoName)
}
}
@@ -178,28 +141,30 @@ class AdvanceVideoView @JvmOverloads constructor(
Logger.d(ImageAndVideoRotation.TAG, "setVideo")
mOnCompletionListener = onCompletionListener
//判断是否已经下载
if (downloadVideoName.isNotEmpty()){
Logger.d(ImageAndVideoRotation.TAG,
if (downloadVideoName.isNotEmpty()) {
Logger.d(
ImageAndVideoRotation.TAG,
"video local url = $mVideoDirPath$downloadVideoName"
)
if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) {
Logger.d(ImageAndVideoRotation.TAG, "have cache startPlay")
startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
return
}
startDownLoadVideo()
}
}
private fun startDownLoadVideo(){
private fun startDownLoadVideo() {
//下载视频， 下载成功后再播放
Logger.d(ImageAndVideoRotation.TAG, "startDownLoadVideo")
FileUtils.createFileDir(mVideoDirPath)
DownloadUtils.downLoad(context,fileNetPath,mVideoDirPath
,downloadVideoName,5,downListener)
DownloadUtils.downLoad(
context, fileNetPath, mVideoDirPath, downloadVideoName, 5, downListener
)
}
fun startPlay(localVideoPath: String?){
fun startPlay(localVideoPath: String?) {
if (localVideoPath === "") return
try {
Logger.d(ImageAndVideoRotation.TAG, "startPlay")
@@ -215,12 +180,12 @@ class AdvanceVideoView @JvmOverloads constructor(
videoViewPlayer?.isFocusableInTouchMode = false
videoViewPlayer?.setVideoAllCallBack(mOnCompletionListener)
videoViewPlayer?.startPlayLogic()
}catch (e: Exception){
} catch (e: Exception) {
Logger.d(ImageAndVideoRotation.TAG, "startPlay e = ${e.message}")
}
}
fun onVideoReset(){
fun onVideoReset() {
videoViewPlayer?.onVideoReset()
mOnCompletionListener = null
}
@@ -237,7 +202,7 @@ class AdvanceVideoView @JvmOverloads constructor(
}
}
private val downListener = object : IDownload{
private val downListener = object : IDownload {
override fun onStart(url: String?) {
setCacheImageViewVisible()
Logger.d(ImageAndVideoRotation.TAG, "download-onStart")
@@ -257,21 +222,23 @@ class AdvanceVideoView @JvmOverloads constructor(
override fun onFinished(url: String?, threadBean: ThreadBean?) {
Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = $url")
if (url.equals(fileNetPath)){ //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
if (url.equals(fileNetPath)) { //发现下载工具在断网又连网后，已完成的任务又都下载，跳转播放出现问题
//下载完成
ThreadUtils.runOnUiThread {
startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
}
}else{//如果当前文件不存在再次去下载当前的
Logger.d(ImageAndVideoRotation.TAG, "download-onFinished = not current" +
",currentUrl = $fileNetPath ")
if (FileUtils.isFileExists(mVideoDirPath+downloadVideoName)){
} else {//如果当前文件不存在再次去下载当前的
Logger.d(
ImageAndVideoRotation.TAG, "download-onFinished = not current" +
",currentUrl = $fileNetPath "
)
if (FileUtils.isFileExists(mVideoDirPath + downloadVideoName)) {
Logger.d(ImageAndVideoRotation.TAG, "have download startPlay")
ThreadUtils.runOnUiThread {
startPlay(Uri.fromFile(File(mVideoDirPath+downloadVideoName)).toString())
startPlay(Uri.fromFile(File(mVideoDirPath + downloadVideoName)).toString())
}
return
}else{
} else {
startDownLoadVideo()
}
}
@@ -281,7 +248,7 @@ class AdvanceVideoView @JvmOverloads constructor(
Logger.d(ImageAndVideoRotation.TAG, "download-onError-$errorMsg")
//出错再次下载
if (errorMsg != null) {
if (errorMsg.startsWith("initFailed")){
if (errorMsg.startsWith("initFailed")) {
startDownLoadVideo()
}
}

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/amap_custom_corner_m2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_status_bar_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 924 B

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_bottom_right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 522 B

After

Width:  |  Height:  |  Size: 920 B

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_left.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 925 B

BIN
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable-nodpi/m2_video_top_right.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 549 B

After

Width:  |  Height:  |  Size: 894 B

2
OCH/mogo-och-shuttle-passenger/src/m2/res/drawable/bg_driving_arrived_notice.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_24" />
<solid android:color="@color/shuttle_color_b9e7c0"/>
<solid android:color="@color/shuttle_color_aeedb8"/>
</shape>

23
OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
View File

@@ -45,7 +45,7 @@
<ImageView
android:id="@+id/iv_line_name_container"
android:layout_width="@dimen/dp_661"
android:layout_height="@dimen/dp_95"
android:layout_height="@dimen/dp_92"
android:src="@drawable/shuttle_p_line_name"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -223,7 +223,8 @@
android:background="@drawable/bg_driving_arrived_notice"
android:gravity="center"
android:text="@string/m2_p_arrived_station_title"
android:textColor="@color/shuttle_color_1f860d"
android:textColor="@color/shuttle_color_34A61F"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_22"
android:textSize="@dimen/dp_18"
android:visibility="gone"
@@ -285,15 +286,15 @@
app:layout_constraintBottom_toBottomOf="parent" />
<!-- 转向灯 IMoGoChassisLamplightListener-->
<com.mogo.och.bus.passenger.ui.widget.M2TurnLightView
android:id="@+id/turn_light_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_12"
app:day_light_mode="true"
app:layout_constraintLeft_toRightOf="@+id/auto_tv"
app:layout_constraintTop_toTopOf="@+id/auto_tv"
app:visible="false" />
<!-- <com.mogo.och.bus.passenger.ui.widget.M2TurnLightView-->
<!-- android:id="@+id/turn_light_view"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="@dimen/dp_12"-->
<!-- app:day_light_mode="true"-->
<!-- app:layout_constraintLeft_toRightOf="@+id/auto_tv"-->
<!-- app:layout_constraintTop_toTopOf="@+id/auto_tv"-->
<!-- app:visible="false" />-->
<!-- 红绿灯-->
<!-- <com.mogo.och.bus.passenger.ui.widget.M2PTrafficLightView-->

39
OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_fragment.xml
View File

@@ -85,6 +85,16 @@
<!-- 图片或视频广告-->
<FrameLayout
android:id="@+id/video_fragment_bottom"
android:layout_width="match_parent"
android:layout_height="572.5dp"
android:layout_marginBottom="@dimen/dp_35"
android:layout_marginEnd="@dimen/dp_35"
android:layout_marginStart="@dimen/dp_35"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"/>
<FrameLayout
android:id="@+id/video_fragment"
android:layout_width="match_parent"
@@ -94,6 +104,35 @@
android:layout_marginStart="@dimen/dp_40"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"/>
<ImageView
android:src="@drawable/m2_video_top_left"
app:layout_constraintTop_toTopOf="@+id/video_fragment_bottom"
app:layout_constraintStart_toStartOf="@+id/video_fragment_bottom"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>
<ImageView
android:src="@drawable/m2_video_top_right"
app:layout_constraintTop_toTopOf="@+id/video_fragment_bottom"
app:layout_constraintEnd_toEndOf="@+id/video_fragment_bottom"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>
<ImageView
android:src="@drawable/m2_video_bottom_left"
app:layout_constraintBottom_toBottomOf="@+id/video_fragment_bottom"
app:layout_constraintStart_toStartOf="@+id/video_fragment_bottom"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>
<ImageView
android:src="@drawable/m2_video_bottom_right"
app:layout_constraintBottom_toBottomOf="@+id/video_fragment_bottom"
app:layout_constraintEnd_toEndOf="@+id/video_fragment_bottom"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"/>
<!-- 16 9 -->
<!-- 1000 562.5 -->
</androidx.constraintlayout.widget.ConstraintLayout>

8
OCH/mogo-och-shuttle-passenger/src/m2/res/layout/p_m2_view_status_bar.xml
View File

@@ -16,7 +16,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_50" />
android:layout_marginStart="@dimen/dp_40" />
<!--魔方连接状态 蓝牙-->
<com.mogo.och.bus.passenger.ui.widget.M2BlueToothView
@@ -53,7 +53,7 @@
app:layout_constraintRight_toRightOf="parent"
android:textSize="@dimen/dp_18"
android:textColor="@color/m2_power_tv_color"
android:layout_marginRight="@dimen/dp_50"
android:layout_marginRight="@dimen/dp_40"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
@@ -64,8 +64,8 @@
app:layout_constraintEnd_toEndOf="parent"
android:src="@drawable/m2_status_bar_logo"
android:scaleType="fitXY"
android:layout_width="@dimen/dp_96"
android:layout_height="@dimen/dp_28"/>
android:layout_width="@dimen/dp_94"
android:layout_height="@dimen/dp_25"/>

4
OCH/mogo-och-shuttle-passenger/src/m2/res/values/colors.xml
View File

@@ -31,8 +31,8 @@
<color name="shuttle_color_6617417B">#6617417B</color>
<color name="shuttle_color_17417B">#17417B</color>
<color name="shuttle_color_2d3e5f">#2D3E5F</color>
<color name="shuttle_color_1f860d">#1F860D</color>
<color name="shuttle_color_b9e7c0">#B9E7C0</color>
<color name="shuttle_color_34A61F">#34A61F</color>
<color name="shuttle_color_aeedb8">#AEEDB8</color>
<color name="shuttle_color_43cefe">#43CEFE</color>
<color name="shuttle_color_1466fb">#1466FB</color>
<color name="shuttle_color_7094ad">#7094AD</color>

4
OCH/mogo-och-shuttle/build.gradle
View File

@@ -28,6 +28,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

6
OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java
View File

@@ -766,7 +766,8 @@ public class OrderModel {
// queryBusRoutes();
// isArrivedStation = true;
// isGoingToNextStation = false;
// arriveStationSuccess(arrivedStationIndex, departureStopName, arriveStation);
// arriveStationSuccess(arrivedStationIndex, departureStopName,
// arriveStation,arriveStationKr);
// }
//5s轮询核销乘客
// startOrStopQueryPassengerWriteOff(true);
@@ -899,7 +900,8 @@ public class OrderModel {
// //需要更改当前站和下一站的状态 然后渲染
// //startOrStopQueryPassengerWriteOff(false);
// queryBusRoutes();
// leaveStationSuccess(backgroundCurrentStationIndex, currentStationName, finalNextStationName);
// leaveStationSuccess(backgroundCurrentStationIndex, currentStationName,
// finalNextStationName,finalNextStationNameKr);
}

4
OCH/mogo-och-sweeper/build.gradle
View File

@@ -28,6 +28,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

18
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -33,14 +34,25 @@ public class SweeperProvider implements IMogoOCH {
}
private void showFragment() {
FragmentManager supportFragmentManager = activity.getSupportFragmentManager();
if (sweeperFragment == null) {
CallerLogger.INSTANCE.d(TAG, "准备add fragment======");
sweeperFragment = new SweeperFragment();
activity.getSupportFragmentManager().beginTransaction().add(containerId, sweeperFragment).commitAllowingStateLoss();
Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(SweeperFragment.TAG);
if (fragmentByTag instanceof SweeperFragment){
sweeperFragment = (SweeperFragment) fragmentByTag;
}else {
sweeperFragment = new SweeperFragment();
}
if (!sweeperFragment.isAdded()){
supportFragmentManager.beginTransaction().add(containerId, sweeperFragment
,SweeperFragment.TAG).commitAllowingStateLoss();
}
return;
}
CallerLogger.INSTANCE.d(TAG, "准备show fragment");
activity.getSupportFragmentManager().beginTransaction().show(sweeperFragment).commitAllowingStateLoss();
supportFragmentManager.beginTransaction().show(sweeperFragment).commitAllowingStateLoss();
}
private void hideFragment() {

2
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
View File

@@ -38,7 +38,7 @@ import java.util.Objects;
*/
public class SweeperFragment extends BaseSweeperTabFragment<SweeperFragment, SweeperPresenter>
implements SlidePanelView.OnSlidePanelMoveToEndListener, View.OnClickListener {
private static final String TAG = "SweeperFragment";
public static final String TAG = "SweeperFragment";
private TextView mCurrentStationName;
private TextView mNextStationName;

4
OCH/mogo-och-taxi-passenger/build.gradle
View File

@@ -28,6 +28,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

16
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/MogoOCHTaxiPassenger.java
View File

@@ -6,6 +6,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.commons.module.status.IMogoStatusChangedListener;
@@ -48,14 +49,23 @@ class MogoOCHTaxiPassenger implements IMogoOCH {
}
private void showFragment() {
FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
if (ochTaxiPassengerFragment == null) {
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备add fragment======");
ochTaxiPassengerFragment = new TaxiPassengerBaseFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiPassengerFragment).commitAllowingStateLoss();
Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiPassengerBaseFragment.TAG);
if (fragmentByTag instanceof TaxiPassengerBaseFragment){
ochTaxiPassengerFragment = (TaxiPassengerBaseFragment) fragmentByTag;
}else {
ochTaxiPassengerFragment = new TaxiPassengerBaseFragment();
}
if (!ochTaxiPassengerFragment.isAdded()){
supportFragmentManager.beginTransaction().add(mContainerId, ochTaxiPassengerFragment
,TaxiPassengerBaseFragment.TAG).commitAllowingStateLoss();
}
return;
}
CallerLogger.INSTANCE.d(M_TAXI_P + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss();
supportFragmentManager.beginTransaction().show(ochTaxiPassengerFragment).commitAllowingStateLoss();
}
private void hideFragment() {

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
View File

@@ -54,7 +54,7 @@ import java.util.Objects;
public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFragment, BaseTaxiPassengerPresenter>
implements IMogoMapListener, TaxiPassengerTaxiView, ITPClickStartAutopilotCallback{
static final String TAG = "TaxiPassengerBaseFragment";
public static final String TAG = "TaxiPassengerBaseFragment";
private MapBizView mapBizView;
private ImageView mAutopilotImage;

4
OCH/mogo-och-taxi/build.gradle
View File

@@ -28,6 +28,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

17
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/TaxiProvider.java
View File

@@ -6,6 +6,7 @@ import android.content.Context;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.mogo.eagle.core.function.call.setting.CallerMoGoUiSettingManager;
@@ -44,14 +45,24 @@ class TaxiProvider implements IMogoOCH {
}
private void showFragment() {
FragmentManager supportFragmentManager = mActivity.getSupportFragmentManager();
if (ochTaxiFragment == null) {
CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备add fragment======");
ochTaxiFragment = new TaxiFragment();
mActivity.getSupportFragmentManager().beginTransaction().add(mContainerId, ochTaxiFragment).commitAllowingStateLoss();
Fragment fragmentByTag = supportFragmentManager.findFragmentByTag(TaxiFragment.TAG);
if (fragmentByTag instanceof TaxiFragment){
ochTaxiFragment = (TaxiFragment) fragmentByTag;
}else {
ochTaxiFragment = new TaxiFragment();
}
if (!ochTaxiFragment.isAdded()){
supportFragmentManager.beginTransaction().add(mContainerId, ochTaxiFragment
,TaxiFragment.TAG).commitAllowingStateLoss();
}
return;
}
CallerLogger.INSTANCE.d(M_TAXI + TAG, "准备show fragment");
mActivity.getSupportFragmentManager().beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss();
supportFragmentManager.beginTransaction().show(ochTaxiFragment).commitAllowingStateLoss();
}
private void hideFragment(){

4
app/build.gradle
View File

@@ -202,6 +202,10 @@ android {
targetCompatibility 1.8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '1.8'
}

6
app/config/tempConfig.json
View File

@@ -159,6 +159,12 @@
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "1"
},
{
"path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4",
"type": 1,
"cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg",
"title": "2"
}
]
},

6
app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
View File

@@ -167,6 +167,12 @@ object ConfigStartUp {
if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
mapParams.setShadowEnable(false)
}
if(AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
// shuttle m2 车需要偏移
if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
mapParams.setCarPosition(-0.5f)
}
}
MapAutoApi.init(context, mapParams)

4
core/function-impl/mogo-core-function-biz/build.gradle
View File

@@ -42,6 +42,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '1.8'
}

5
core/function-impl/mogo-core-function-chat/build.gradle
View File

@@ -45,6 +45,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/function-impl/mogo-core-function-datacenter/build.gradle
View File

@@ -41,6 +41,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

1
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt
View File

@@ -12,7 +12,6 @@ class AiCloudSocketBizProvider : IMoGoFunctionServerProvider {
get() = "AiCloudSocketBizProvider"
override fun init(context: Context?) {
//todo bus加载
context?.let {
SocketManager.getInstance().init(it, 0.0, 0.0)
SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012())

8
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt
View File

@@ -569,7 +569,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.BLACK,
-1,
DataSourceType.TELEMATIC
DataSourceType.OBU
)
}
// 红灯
@@ -578,7 +578,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.RED,
red,
DataSourceType.TELEMATIC
DataSourceType.OBU
)
}
// 绿灯
@@ -587,7 +587,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.GREEN,
green,
DataSourceType.TELEMATIC
DataSourceType.OBU
)
}
// 黄灯
@@ -596,7 +596,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener
CallerTrafficLightListenerManager.invokeTrafficLightPlusSource(
TrafficLightEnum.YELLOW,
yellow,
DataSourceType.TELEMATIC
DataSourceType.OBU
)
}
}

4
core/function-impl/mogo-core-function-devatools/build.gradle
View File

@@ -46,6 +46,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = "1.8"
freeCompilerArgs += [

4
core/function-impl/mogo-core-function-hmi/build.gradle
View File

@@ -43,6 +43,10 @@ android {
jvmTarget = "1.8"
}
lintOptions {
abortOnError false
}
}
dependencies {

10
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
View File

@@ -2061,11 +2061,11 @@ internal class DebugSettingView @JvmOverloads constructor(
}
override fun onLogCatch(lineLog: String) {
logInfoView?.let {
if (logViewAttach) {
it.onLogCatch(lineLog)
}
}
// logInfoView?.let {
// if (logViewAttach) {
// it.onLogCatch(lineLog)
// }
// }
}
private fun restartApp() {

4
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
View File

@@ -165,6 +165,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
return@setOnTouchListener true
}
etInputSpeed.isFocusableInTouchMode = true
etInputSpeed.setSelection(speedLimit.toString().length)
if (keyBoardUtil == null) {
keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed)
}
@@ -191,6 +192,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
} else{
ToastUtils.showShort("车速不能再减了")
}
etInputSpeed.setSelection(speedLimit.toString().length)
}
ivSpeedAdd.setOnClickListener {
@@ -203,6 +205,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
} else{
ToastUtils.showShort("车速不能再加了")
}
etInputSpeed.setSelection(speedLimit.toString().length)
}
//速度确认
@@ -223,6 +226,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor(
ToastUtils.showShort("设置车速失败，请启动域控制器")
}
}
etInputSpeed.setSelection(speedLimit.toString().length)
}
initOchView()

1
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
View File

@@ -1968,6 +1968,7 @@
android:layout_margin="2dp"
android:padding="@dimen/dp_20"
android:gravity="center"
android:visibility="gone"
android:textOff="展示日志过滤面板"
android:textOn="关闭日志过滤面板"
android:textSize="@dimen/dp_24" />

5
core/function-impl/mogo-core-function-map/build.gradle
View File

@@ -41,6 +41,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt
View File

@@ -65,10 +65,10 @@ object TrackerSourceColorHelper {
//僵尸车
if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
color = "#AD7488FF"
color = "#7A8499FF"
CallerMapUIServiceManager.getMapUIController()?.let {
if(it.isDayMode){
color = "#AE7887FF"
color = "#9BA8BCFF"
}
}
}

4
core/function-impl/mogo-core-function-startup/build.gradle
View File

@@ -35,6 +35,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/mogo-core-data/build.gradle
View File

@@ -47,6 +47,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
protobuf {
protoc {
artifact = rootProject.ext.dependencies.protoc

5
core/mogo-core-function-api/build.gradle
View File

@@ -38,6 +38,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/mogo-core-function-call/build.gradle
View File

@@ -37,6 +37,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/mogo-core-network/build.gradle
View File

@@ -38,6 +38,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
core/mogo-core-res/build.gradle
View File

@@ -38,6 +38,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
sourceSets {
main {
res.srcDirs = [

BIN
core/mogo-core-res/src/main/res/raw/chuzuche.nt3d
View File

Binary file not shown.

BIN
core/mogo-core-res/src/main/res/raw/cuzuche.nt3d Normal file
View File

Binary file not shown.

4
core/mogo-core-utils/build.gradle
View File

@@ -46,6 +46,10 @@ android {
kapt.includeCompileClasspath = false
lintOptions {
abortOnError false
}
}
dependencies {

10
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
View File

@@ -117,6 +117,16 @@ object AppIdentityModeUtils {
}
return false
}
/**
* 是否是 接驳车（这里不细分具体是：司机、乘客等类型）
*
* @param appIdentityMode productFlavors 配置的类型
* @return true - 是小巴车端 false - 不是小巴车端
*/
@JvmStatic
fun isShuttlePassenger(appIdentityMode: String): Boolean {
return isShuttle(appIdentityMode) && isPassenger(appIdentityMode)
}
@JvmStatic
fun isM2(appIdentityMode: String): Boolean {
val (_, _, model) = getInfo(appIdentityMode)

5
foudations/mogo-aicloud-services-sdk/build.gradle
View File

@@ -31,6 +31,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
foudations/mogo-commons/build.gradle
View File

@@ -38,6 +38,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

8
gradle.properties
View File

@@ -63,7 +63,7 @@ BIZCONFIG_VERSION=1.3.2
SERVICE_BIZ_VERSION=1.2.4
################ 外部依赖引用 ################
# loglib
LOGLIB_VERSION=1.5.25
LOGLIB_VERSION=1.5.26
######## MogoAiCloudSDK Version ########
# 网络请求LOGLIB_VERSION
MOGO_NETWORK_VERSION=1.4.6.6
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.6.6
MOGO_TELEMATIC_VERSION=1.4.6.6
######## MogoAiCloudSDK Version ########
# 自研地图
MAP_SDK_VERSION=2.11.0.12
MAP_SDK_VERSION=2.12.0.11
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7
@@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7
applicationId=com.mogo.launcer
applicationName=IntelligentPilot
# RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0
versionCode=3000000
versionName=3.0.0
versionCode=3010000
versionName=3.1.0
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10

4
libraries/mogo-adas-data/build.gradle
View File

@@ -56,6 +56,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

5
libraries/mogo-adas/build.gradle
View File

@@ -62,6 +62,11 @@ android {
// }
// }
lintOptions {
abortOnError false
}
}
dependencies {

8
libraries/mogo-map-api/build.gradle
View File

@@ -34,8 +34,12 @@ android {
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}

9
libraries/mogo-map/build.gradle
View File

@@ -35,9 +35,14 @@ android {
}
compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

43
libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java
View File

File diff suppressed because one or more lines are too long

21
libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java
View File

@@ -23,6 +23,7 @@ import com.mogo.map.utils.ObjectUtils;
import com.zhidaoauto.map.sdk.open.MapAutoApi;
import com.zhidaoauto.map.sdk.open.data.MapDataApi;
import com.zhidaoauto.map.sdk.open.data.SinglePointRoadInfo;
import com.zhidaoauto.map.sdk.open.marker.BatchMarkerOptions;
import com.zhidaoauto.map.sdk.open.marker.Marker;
import com.zhidaoauto.map.sdk.open.marker.MarkerHelper;
import com.zhidaoauto.map.sdk.open.marker.MarkerOptions;
@@ -114,6 +115,8 @@ public class AMapWrapper implements IMogoMap {
}
}
BatchMarkerOptions batchMarkerOptions = new BatchMarkerOptions();
@SuppressLint("NewApi")
@Override
public void updateBatchMarkerPosition(HashMap<String, MessagePad.TrackedObject> optionsArrayList) {
@@ -134,9 +137,17 @@ public class AMapWrapper implements IMogoMap {
return;
}
long time = markerOptionsArrayList.get(0).getTime();
MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
batchMarkerOptions.list = markerOptionsArrayList;
batchMarkerOptions.delayStrategy = false;
batchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
batchMarkerOptions.controlIcon = 1;
batchMarkerOptions.duration = (int) time;
batchMarkerOptions.deleteRule = 1;
MarkerHelper.INSTANCE.updateBatchMarkerPositon(batchMarkerOptions);
}
BatchMarkerOptions aiBatchMarkerOptions = new BatchMarkerOptions();
@SuppressLint("NewApi")
@Override
public void updateBatchAiMarkerPosition(HashMap<String, SocketDownData.CloudRoadDataProto> optionsArrayList) {
@@ -158,7 +169,13 @@ public class AMapWrapper implements IMogoMap {
}
long time = markerOptionsArrayList.get(0).getTime();
// 最后一个参数，是否管理锚点的删除
MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
aiBatchMarkerOptions.list = markerOptionsArrayList;
aiBatchMarkerOptions.delayStrategy = false;
aiBatchMarkerOptions.ruleAngle = FunctionBuildConfig.isBeautyMode ? 8.0f : 0f;
aiBatchMarkerOptions.controlIcon = 1;
aiBatchMarkerOptions.duration = (int) time;
aiBatchMarkerOptions.deleteRule = 1;
MarkerHelper.INSTANCE.updateBatchMarkerPositon(aiBatchMarkerOptions);
}
@Override

5
libraries/mogo-obu/build.gradle
View File

@@ -25,6 +25,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
test/crashreport-apmbyte/build.gradle
View File

@@ -43,6 +43,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

9
test/crashreport-noop/build.gradle
View File

@@ -39,6 +39,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

9
test/crashreport/build.gradle
View File

@@ -34,6 +34,15 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

4
tts/tts-base/build.gradle
View File

@@ -33,6 +33,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
buildTypes {
release {
minifyEnabled false

4
tts/tts-iflytek/build.gradle
View File

@@ -38,6 +38,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {

1
tts/tts-iflytek/src/main/java/com/mogo/tts/iflytek/IFlyTekTts.kt
View File

@@ -53,6 +53,7 @@ class IFlyTekTts : IMogoTTS, InitListener {
// 注意： appid 必须和下载的SDK保持一致，否则会出现10407错误
SpeechUtility.createUtility(context, "appid=0c498b42")
ttsEngine = SpeechSynthesizer.createSynthesizer(context, this)
updateTtsParam()
voicerEntries = context.resources?.getStringArray(R.array.voicer_cloud_values)
}

4
tts/tts-pad/build.gradle
View File

@@ -38,6 +38,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
lintOptions {
abortOnError false
}
}
dependencies {