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
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
}
}