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

callchat replace

Browse Source
This commit is contained in:
unknown
2020-11-15 14:22:18 +08:00
parent d9492f221b
commit 4172a965f9
21 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -342,8 +342,8 @@ dependencies {
debugImplementation rootProject.ext.dependencies.debugleakcanary
releaseImplementation rootProject.ext.dependencies.releaseleakcanary
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.carcall
implementation rootProject.ext.dependencies.callchatprovider
implementation rootProject.ext.dependencies.callchat
implementation rootProject.ext.dependencies.mogologlib
compileOnly rootProject.ext.dependencies.adasapi

3
config.gradle
View File

@@ -108,6 +108,9 @@ targetSdkVersion : 22,
moduleextensions : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
carcall : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
carcallprovider : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
callchat : "com.mogo.module.carchatout:module-carchatting:1.4.8",
callchatprovider : "com.mogo.module.carchatout:module-carchatting-provider:1.0.6",
guideshow : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
// V2X
moduleV2x : "com.mogo.module:module-v2x:${MOGO_MODULE_V2X_VERSION}",

2
modules/mogo-module-common/build.gradle
View File

@@ -33,7 +33,7 @@ dependencies {
implementation rootProject.ext.dependencies.androidxrecyclerview
implementation rootProject.ext.dependencies.androidxconstraintlayout
implementation rootProject.ext.dependencies.arouter
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.callchatprovider
if (Boolean.valueOf(RELEASE)) {
api rootProject.ext.dependencies.mogomap
api rootProject.ext.dependencies.mogomapapi

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/api/CallChatApi.java
View File

@@ -3,9 +3,9 @@ package com.mogo.module.common.api;
import android.content.Context;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.module.carchattingprovider.ICarsChattingProvider;
import com.mogo.module.common.entity.MarkerOnlineCar;
import com.mogo.utils.logger.Logger;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
import com.zhidao.carchattingprovider.MogoDriverInfo;
public

2
modules/mogo-module-media/build.gradle
View File

@@ -47,7 +47,7 @@ dependencies {
implementation "com.mogo.tencent.wecarflow:mogo-wecarflow:+@aar"
implementation "com.mogo.kwmusic:mogo-kwmusic:+"
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.callchatprovider
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.mogomap

2
modules/mogo-module-media/src/main/java/com/mogo/module/media/ServiceMediaHandler.java
View File

@@ -11,7 +11,6 @@ import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
import com.mogo.module.authorize.authprovider.module.IMogoAuthorizeModuleManager;
import com.mogo.module.carchattingprovider.ICarsChattingProvider;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.adas.IMogoADASController;
import com.mogo.service.analytics.IMogoAnalytics;
@@ -27,6 +26,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.network.IMogoNetwork;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
/**
* <p>

8
modules/mogo-module-media/src/main/java/com/mogo/module/media/listener/CallProviderResponseAdapter.java
View File

@@ -1,6 +1,7 @@
package com.mogo.module.media.listener;
import com.mogo.module.carchattingprovider.ICallProviderResponse;
import com.zhidao.carchattingprovider.ICallProviderResponse;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -24,11 +25,6 @@ abstract class CallProviderResponseAdapter implements ICallProviderResponse {
}
@Override
public void callStatus( int i ) {
}
@Override
public void canCall( boolean b ) {

2
modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
View File

@@ -12,7 +12,6 @@ import android.widget.TextView;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.voice.AIAssist;
import com.mogo.commons.voice.IMogoVoiceCmdCallBack;
import com.mogo.module.carchattingprovider.ICallProviderResponse;
import com.mogo.module.common.glide.SkinAbleBitmapTarget;
import com.mogo.module.media.MediaConstants;
import com.mogo.module.media.R;
@@ -33,6 +32,7 @@ import com.mogo.utils.WindowUtils;
import com.mogo.utils.glide.GlideApp;
import com.mogo.utils.logger.Logger;
import com.tencent.wecarflow.flowoutside.sdk.FlowPlayControl;
import com.zhidao.carchattingprovider.ICallProviderResponse;
/**
* 适配爱趣听和酷我的window，通过presenter区分

27
modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt
View File

@@ -52,14 +52,14 @@ class FloatView constructor(
abstract inner class PushView(context: Context) : FrameLayout(context),
PushViewController {
lateinit var appIcon: ImageView
lateinit var titleIconContainer: View
lateinit var pushTitle: TextView
lateinit var pushImage: RoundedImageView
lateinit var pushContent: TextView
lateinit var pushTimer: TextView
lateinit var pushButtonLeft: TextView
lateinit var pushButtonRight: TextView
private lateinit var appIcon: ImageView
private lateinit var titleIconContainer: View
private lateinit var pushTitle: TextView
private lateinit var pushImage: RoundedImageView
private lateinit var pushContent: TextView
private lateinit var pushTimer: TextView
private lateinit var pushButtonLeft: TextView
private lateinit var pushButtonRight: TextView
lateinit var pushButton: View
override fun inflateView(layoutId: Int) {
@@ -96,7 +96,7 @@ class FloatView constructor(
fun hasButtons(bean: PushBean?): Boolean {
bean?.buttons?.forEach {
if (!it.text?.isNullOrEmpty()) {
if (it.text.isNotEmpty()) {
return true
}
}
@@ -104,13 +104,13 @@ class FloatView constructor(
}
fun hasTextContent(bean: PushBean?): Boolean =
bean?.content?.isNullOrEmpty()?.not() ?: false
bean?.content?.isEmpty()?.not() ?: false
fun hasImgContent(bean: PushBean?): Boolean = bean?.QRCode?.isNullOrEmpty()?.not() ?: false
fun hasImgContent(bean: PushBean?): Boolean = bean?.QRCode?.isEmpty()?.not() ?: false
open fun setBean(bean: PushBean) {
// app icon
if (!bean.appIcon.isNullOrEmpty()) {
if (bean.appIcon.isNotEmpty()) {
appIcon.visible()
GlideApp.with(this).load(bean.appIcon).into(appIcon)
} else {
@@ -274,6 +274,7 @@ class FloatView constructor(
init {
@Suppress("DEPRECATION")
params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT
params.flags = (WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
or WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION
@@ -282,7 +283,7 @@ class FloatView constructor(
or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
params.width = WindowManager.LayoutParams.WRAP_CONTENT
params.height = WindowManager.LayoutParams.WRAP_CONTENT
params.gravity = Gravity.LEFT or Gravity.BOTTOM
params.gravity = Gravity.START or Gravity.BOTTOM
params.format = PixelFormat.TRANSLUCENT
params.x = context.resources.getDimensionPixelSize(R.dimen.module_push_window_x)
params.y = context.resources.getDimensionPixelSize(R.dimen.module_push_window_x)

8
modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt
View File

@@ -58,7 +58,7 @@ class PushViewModel(
if (isClick == "2") {
mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
}
if (!it.mainSchema.isNullOrEmpty()) {
if (it.mainSchema.isNotEmpty()) {
dealSchema(it.mainSchema, mContext)
}
}
@@ -74,7 +74,7 @@ class PushViewModel(
if (isClick == "2") {
mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
}
if (!it.buttons[0].action.isNullOrEmpty()) {
if (it.buttons[0].action.isNotEmpty()) {
dealSchema(it.buttons[0].action, mContext)
}
}
@@ -90,7 +90,7 @@ class PushViewModel(
if (isClick == "2") {
mVoiceClient.speakTTSVoice("好的", voiceCmdCallback)
}
if (!it.buttons[1].action.isNullOrEmpty()) {
if (it.buttons[1].action.isNotEmpty()) {
dealSchema(it.buttons[1].action, mContext)
}
}
@@ -162,7 +162,7 @@ class PushViewModel(
}
pushBean?.buttons?.forEach {
it?.voiceCmd?.apply {
it.voiceCmd?.apply {
mVoiceClient.registerUnWakeupCommand(
VOICE_ACTION_PUSH_RIGHT,
toTypedArray(),

4
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/ChoosePathFragment.kt
View File

@@ -192,7 +192,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
SearchApisHolder.getMarkerManager().removeMarkers()
DataConstants.sCmds.entries.filter {
it != null && !TextUtils.isEmpty(it.key) && (it.value?.isNotEmpty() ?: false)
!TextUtils.isEmpty(it.key) && (it.value?.isNotEmpty() ?: false)
}.forEach {
AIAssist.getInstance(mContext).registerUnWakeupCommand(it.key, it.value, this@ChoosePathFragment)
}
@@ -244,7 +244,7 @@ class ChoosePathFragment : BaseFragment(), IMogoNaviListener, IMogoVoiceCmdCallB
}
DataConstants.sCmds.entries.filter {
it != null && !TextUtils.isEmpty(it.key) && (it.value?.isNotEmpty() ?: false)
!TextUtils.isEmpty(it.key) && (it.value?.isNotEmpty() ?: false)
}.forEach {
AIAssist.getInstance(mContext).unregisterUnWakeupCommand(it.key)
}

13
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/NaviSettingFragment.kt
View File

@@ -121,14 +121,14 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
rb_navi_no_high_way.setOnCheckedChangeListener(this)
rb_navi_fee.setOnCheckedChangeListener(this)
sb_navi_volume_progress.max = VolumeManager.getInstance(context).getMaxVol()
sb_navi_volume_progress.max = VolumeManager.getInstance(context).maxVol
sb_navi_volume_progress.progress = VolumeManager.getInstance(context).sysVolume
sb_navi_volume_progress.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
if (fromUser) {
VolumeManager.getInstance(context).setSysVolume(progress)
VolumeManager.getInstance(context).sysVolume = progress
SettingManager.volume = sb_navi_volume_progress.progress
}
@@ -145,7 +145,7 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
})
rg_navi_day_night.setOnCheckedChangeListener { group, checkedId ->
rg_navi_day_night.setOnCheckedChangeListener { _, checkedId ->
SettingManager.mapType = checkedId
when (checkedId) {
R.id.rb_navi_day -> {
@@ -159,7 +159,7 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
}
}
}
rg_navi_sound_type.setOnCheckedChangeListener { group, checkedId ->
rg_navi_sound_type.setOnCheckedChangeListener { _, checkedId ->
when (checkedId) {
R.id.rb_navi_detail -> {
SearchApisHolder.getSettingManager().speakDetail()
@@ -172,7 +172,7 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
}
}
aimlessModeGroup.setOnCheckedChangeListener { group, checkedId ->
aimlessModeGroup.setOnCheckedChangeListener { _, checkedId ->
when (checkedId) {
R.id.aimlessModeClose -> {
SearchApisHolder.getSettingManager().closeAimlessMode()
@@ -272,14 +272,13 @@ class NaviSettingFragment : BaseFragment(), OnCheckedChangeListener {
/**
* 分享弹框
* @param event
*/
@Subscribe(threadMode = ThreadMode.MAIN)
fun onEventBus(searchPoi: SearchPoi?) {
if (searchPoi == null) {
return
}
if (searchPoi?.type == DataConstants.TYPE_COMPANY_ADDRESS) {
if (searchPoi.type == DataConstants.TYPE_COMPANY_ADDRESS) {
tv_navi_company_address.text = searchPoi.address
tv_navi_clear_company_address.visibility = View.VISIBLE
} else {

41
modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/setting/SettingAddressFragment.kt
View File

@@ -27,6 +27,7 @@ import com.mogo.module.navi.ui.base.BaseFragment
import com.mogo.utils.TipToast
import com.mogo.utils.UiThreadHandler
import kotlinx.android.synthetic.main.fragment_setting_address.*
import kotlin.math.sqrt
/**
* @author zyz
@@ -36,11 +37,11 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
override fun onRegeocodeSearched(regeocodeResult: MogoRegeocodeResult?) {
et_navi_search.setText(regeocodeResult?.regeocodeAddress?.formatAddress)
var formatAddress = regeocodeResult?.regeocodeAddress?.formatAddress
et_navi_search.text = regeocodeResult?.regeocodeAddress?.formatAddress
val formatAddress = regeocodeResult?.regeocodeAddress?.formatAddress
selectPoi?.address = formatAddress
var neighborhood = regeocodeResult?.regeocodeAddress?.neighborhood
val neighborhood = regeocodeResult?.regeocodeAddress?.neighborhood
if (!TextUtils.isEmpty(neighborhood)) {
selectPoi?.name = neighborhood
} else {
@@ -49,10 +50,9 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
}
override fun onGeocodeSearched(geocodeResult: MogoGeocodeResult?) {
//do nothing
}
private val TAG: String = "SettingAddressFragment"
private var type: Int = DataConstants.TYPE_HOME_ADDRESS
var addMarker: IMogoMarker? = null
@@ -66,8 +66,8 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
tilt: Float,
bearing: Float) {
super.onMapChanged(latLng, zoom, tilt, bearing)
selectPoi = EntityConvertUtils.geoToPoi(latLng?.lat ?: 0.0, latLng?.lng ?: 0.0, type)
var mogoRegeocodeQuery = MogoRegeocodeQuery()
selectPoi = EntityConvertUtils.geoToPoi(latLng?.lat ?: 0.0, latLng?.lon ?: 0.0, type)
val mogoRegeocodeQuery = MogoRegeocodeQuery()
mogoRegeocodeQuery.point = latLng
mGeoSearch.getFromLocationAsyn(mogoRegeocodeQuery)
addMarker?.startJumpAnimation(
@@ -77,7 +77,7 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
if (input <= 0.5) {
(0.5f - 2.0 * (0.5 - input) * (0.5 - input)).toFloat()
} else {
(0.5f - Math.sqrt(((input - 0.5f) * (1.5f - input)).toDouble())).toFloat()
(0.5f - sqrt(((input - 0.5f) * (1.5f - input)).toDouble())).toFloat()
}
}, null)
@@ -100,7 +100,7 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
return R.layout.fragment_setting_address
}
fun isHome(): Boolean {
private fun isHome(): Boolean {
return type == DataConstants.TYPE_HOME_ADDRESS
}
@@ -111,9 +111,9 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
if (isHome()) {
tv_set_as_home.text = resources.getString(R.string.set_as_home_navi)
tv_set_as_home.text = resources.getString(string.set_as_home_navi)
} else {
tv_set_as_home.text = resources.getString(R.string.set_as_compony_navi)
tv_set_as_home.text = resources.getString(string.set_as_compony_navi)
}
iv_navi_back.setOnClickListener {
@@ -129,28 +129,28 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
}
et_navi_search.isEnabled = false
et_navi_search.setText(getString(string.drag_map_to_choose))
var location = SearchApisHolder.getUiControllerApis().windowCenterLocation
et_navi_search.text = getString(string.drag_map_to_choose)
val location = SearchApisHolder.getUiControllerApis().windowCenterLocation
UiThreadHandler.postDelayed({
if (!isAdded) {
return@postDelayed
}
var decodeResource = BitmapFactory.decodeResource(resources, R.mipmap.icon_choose_position2)
val decodeResource = BitmapFactory.decodeResource(resources, R.mipmap.icon_choose_position2)
val options = MogoMarkerOptions()
.icon(decodeResource)
.latitude(location?.lat ?: 0.0)
.owner(TAG)
.anchor(0.5f, 1f)
.longitude(location?.lng ?: 0.0)
.longitude(location?.lon ?: 0.0)
addMarker = SearchApisHolder.getMarkerManager().addMarker(AMapConstants.PATH_FRAGMENT_SETTING_HOME, options)
var locationPointInScreen = SearchApisHolder.getUiControllerApis().getLocationPointInScreen(location)
val locationPointInScreen = SearchApisHolder.getUiControllerApis().getLocationPointInScreen(location)
addMarker?.setPositionByPixels(locationPointInScreen)
}, 500L)
}
fun insert(searchPoi: SearchPoi) {
private fun insert(searchPoi: SearchPoi) {
AddressManager.insert(searchPoi)
}
@@ -161,11 +161,14 @@ class SettingAddressFragment : BaseFragment(), IMogoGeoSearchListener {
}
companion object {
private const val TAG: String = "SettingAddressFragment"
fun newInstance(type: Int = DataConstants.TYPE_HOME_ADDRESS): Fragment {
var settingAddressFragment = SettingAddressFragment()
val settingAddressFragment = SettingAddressFragment()
val bundle = Bundle()
bundle.putInt(AMapConstants.KEY_SET_HOME_COMPONY, type)
settingAddressFragment.setArguments(bundle)
settingAddressFragment.arguments = bundle
return settingAddressFragment
}
}

2
modules/mogo-module-service/build.gradle
View File

@@ -50,7 +50,7 @@ dependencies {
annotationProcessor rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.rxjava
implementation rootProject.ext.dependencies.rxandroid
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.callchatprovider
implementation rootProject.ext.dependencies.androidxrecyclerview
if (Boolean.valueOf(RELEASE)) {

2
modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java
View File

@@ -8,7 +8,6 @@ import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.IMogoMarkerManager;
import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.carchattingprovider.ICarsChattingProvider;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.module.common.entity.MarkerResponse;
import com.mogo.module.common.entity.MarkerShowEntity;
@@ -29,6 +28,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
import com.mogo.service.statusmanager.IMogoStatusManager;
import com.mogo.utils.logger.Logger;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
/**
* author : donghongyu

12
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/CallProviderResponseImpl.java
View File

@@ -1,18 +1,19 @@
package com.mogo.module.service.marker;
import com.mogo.module.carchattingprovider.ICallProviderResponse;
import com.zhidao.carchattingprovider.ICallProviderResponse;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public
/**
* @author congtaowang
* @since 2020/9/28
*
* 描述
*/
abstract class CallProviderResponseImpl implements ICallProviderResponse {
public abstract class CallProviderResponseImpl implements ICallProviderResponse {
@Override
public void addFriend( boolean b ) {
@@ -24,11 +25,6 @@ abstract class CallProviderResponseImpl implements ICallProviderResponse {
}
@Override
public void callStatus( int i ) {
}
@Override
public void callWindowStatus( boolean b ) {

10
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java
View File

@@ -194,19 +194,13 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
params.put( CallChattingProviderConstant.CCPROVIDER_LON, location.getLon() + "" );
}
Logger.d( TAG, "call parameters: %s", params );
if ( MarkerServiceHandler.getApis().getStatusManagerApi().isV2XShow() ) {
MarkerServiceHandler.getCarChatting().callShowWindow( params );
} else {
MarkerServiceHandler.getCarChatting().call( params );
}
MarkerServiceHandler.getCarChatting().call( params );
}
protected void loadImageHeader( final MarkerShowEntity markerShowEntity ) {
if ( Looper.myLooper() != Looper.getMainLooper() ) {
UiThreadHandler.post( () -> {
runOnUiThread( markerShowEntity );
} );
UiThreadHandler.post( () -> runOnUiThread( markerShowEntity ));
} else {
runOnUiThread( markerShowEntity );
}

2
modules/mogo-module-v2x/build.gradle
View File

@@ -51,7 +51,7 @@ dependencies {
implementation rootProject.ext.dependencies.androidxappcompat
implementation rootProject.ext.dependencies.androidxconstraintlayout
implementation rootProject.ext.dependencies.arouter
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.callchatprovider
implementation rootProject.ext.dependencies.androidxccorektx
implementation rootProject.ext.dependencies.kotlinstdlibjdk7

5
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XServiceManager.java
View File

@@ -9,7 +9,6 @@ import com.mogo.map.navi.IMogoNavi;
import com.mogo.map.overlay.IMogoOverlayManager;
import com.mogo.map.search.geo.IMogoGeoSearch;
import com.mogo.map.uicontroller.IMogoMapUIController;
import com.mogo.module.carchattingprovider.ICarsChattingProvider;
import com.mogo.module.v2x.alarm.V2XCalculateServer;
import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager;
import com.mogo.module.v2x.manager.IMoGoV2XPolylineManager;
@@ -38,6 +37,7 @@ import com.mogo.service.share.IMogoTanluProvider;
import com.mogo.service.windowview.IMogoTopViewManager;
import com.mogo.service.windowview.IMogoWindowManager;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
/**
* author : donghongyu
@@ -96,8 +96,9 @@ public class V2XServiceManager {
private static IMoGoV2XPolylineManager moGoV2XPolylineManager;
private static IMoGoV2XStatusManager moGoV2XStatusManager;
private V2XServiceManager(){
}
public static void init(final Context context) {
if (!isInit) {

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

@@ -12,7 +12,6 @@ import com.mogo.map.MogoLatLng;
import com.mogo.map.navi.IMogoNaviListener;
import com.mogo.map.navi.MogoNaviInfo;
import com.mogo.map.navi.MogoTraffic;
import com.mogo.module.carchattingprovider.ICarsChattingProvider;
import com.mogo.module.common.entity.MarkerExploreWay;
import com.mogo.module.common.entity.MarkerLocation;
import com.mogo.module.common.entity.V2XEventZanData;
@@ -27,6 +26,7 @@ import com.mogo.module.v2x.utils.V2XUtils;
import com.mogo.utils.TipToast;
import com.mogo.utils.logger.Logger;
import com.zhidao.carchattingprovider.CallChattingProviderConstant;
import com.zhidao.carchattingprovider.ICarsChattingProvider;
import com.zhidao.carchattingprovider.MogoDriverInfo;
import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -99,7 +99,7 @@ public abstract class V2XBaseViewHolder<T>
int ageNumber = noveltyInfo.getUserInfo().getAgeNumber();
mogoDriverInfo.setAge(ageNumber);
String gender = noveltyInfo.getUserInfo().getGender();
mogoDriverInfo.setGender(gender != null ? gender : null);
mogoDriverInfo.setGender(gender);
String sn = noveltyInfo.getUserInfo().getSn();
mogoDriverInfo.setSn(sn != null ? sn : "");
String name = noveltyInfo.getUserInfo().getUserName();
@@ -238,7 +238,7 @@ public abstract class V2XBaseViewHolder<T>
@Override
public void onCalculateSuccess() {
Logger.w("V2XBaseViewHolder", "onCalculateSuccess");
Logger.w(TAG, "onCalculateSuccess");
V2XServiceManager.getNavi().startNavi(true);
V2XServiceManager.getMogoRegisterCenter().unregisterMogoNaviListener(MODULE_NAME);
}

2
modules/mogo-module-widgets/build.gradle
View File

@@ -46,7 +46,7 @@ dependencies {
annotationProcessor rootProject.ext.dependencies.aroutercompiler
implementation rootProject.ext.dependencies.rxjava
implementation rootProject.ext.dependencies.rxandroid
implementation rootProject.ext.dependencies.carcallprovider
implementation rootProject.ext.dependencies.callchatprovider
if (Boolean.valueOf(RELEASE)) {
api rootProject.ext.dependencies.mogomap