优化语言
This commit is contained in:
@@ -6,6 +6,7 @@ import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.amap.api.maps2d.MapView
|
||||
import com.juhabi.birds.R
|
||||
import com.juhabi.birds.base.BaseFragment
|
||||
import com.juhabi.birds.custom.AddDevicePopupWindow
|
||||
@@ -30,6 +31,8 @@ class DeviceFragment : BaseFragment<FragmentHomeBinding, DevicePresenter>(),
|
||||
private var currentPage = FIRST_PAGE
|
||||
private var pendingUnbindPosition: Int? = null
|
||||
|
||||
|
||||
|
||||
override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentHomeBinding {
|
||||
return FragmentHomeBinding.inflate(inflater, container, false)
|
||||
}
|
||||
@@ -95,13 +98,17 @@ class DeviceFragment : BaseFragment<FragmentHomeBinding, DevicePresenter>(),
|
||||
)
|
||||
}
|
||||
R.id.tv_show_map -> {
|
||||
val device = deviceAdapter.data[position]
|
||||
// 没有经纬度时只展示空态,不要把空坐标传给地图
|
||||
if (device.lat.isNullOrBlank() || device.lng.isNullOrBlank()) {
|
||||
showMessage(mContext.getString(R.string.i18n_080)) //暂无定位
|
||||
return@setOnItemChildClickListener
|
||||
}
|
||||
// 地图页后续接入,这里先预留点击入口
|
||||
//Todo 1.先查询定位权限,参考之前动态权限获取方式。2.跳转到MapViewActivity中,中心点则随便展示就行,可以默认北京天安门
|
||||
|
||||
|
||||
//代码不要删
|
||||
// val device = deviceAdapter.data[position]
|
||||
// // 没有经纬度时只展示空态,不要把空坐标传给地图
|
||||
// if (device.lat.isNullOrBlank() || device.lng.isNullOrBlank()) {
|
||||
// showMessage(mContext.getString(R.string.i18n_080)) //暂无定位
|
||||
// return@setOnItemChildClickListener
|
||||
// }
|
||||
// // 地图页后续接入,这里先预留点击入口
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
41
app/src/main/java/com/juhabi/birds/device/MapViewActivity.kt
Normal file
41
app/src/main/java/com/juhabi/birds/device/MapViewActivity.kt
Normal file
@@ -0,0 +1,41 @@
|
||||
package com.juhabi.birds.device
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import com.juhabi.birds.base.BaseActivity
|
||||
import com.juhabi.birds.databinding.DeviceDetailLayoutBinding
|
||||
import com.juhabi.birds.databinding.MapviewLayoutBinding
|
||||
import com.juhabi.birds.device.entity.DeviceEntity
|
||||
import com.juhabi.birds.device.mvp.DeviceContract
|
||||
import com.juhabi.birds.device.mvp.DeviceImpl
|
||||
import com.juhabi.birds.device.mvp.DevicePresenter
|
||||
|
||||
/**
|
||||
* 地图显示
|
||||
*/
|
||||
class MapViewActivity :BaseActivity<MapviewLayoutBinding, DevicePresenter>(), DeviceContract.DeviceView,
|
||||
View.OnClickListener {
|
||||
override fun createBinding(inflater: LayoutInflater): MapviewLayoutBinding {
|
||||
return MapviewLayoutBinding.inflate(inflater)
|
||||
}
|
||||
|
||||
override fun createPresenter(): DevicePresenter? {
|
||||
return DevicePresenter(DeviceImpl(mContext), mContext)
|
||||
}
|
||||
|
||||
override fun initView(savedInstanceState: Bundle?) {
|
||||
}
|
||||
|
||||
override fun showError(message: String) {
|
||||
}
|
||||
|
||||
override fun getBindDeviceListSuccess(devices: List<DeviceEntity>) {
|
||||
}
|
||||
|
||||
override fun bindDeviceSuccess(message: String) {
|
||||
}
|
||||
|
||||
override fun onClick(p0: View?) {
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ class DeviceAdapter : BaseQuickAdapter<DeviceEntity, BaseViewHolder>(R.layout.de
|
||||
|
||||
init {
|
||||
addChildClickViewIds(R.id.img_more)
|
||||
addChildClickViewIds(R.id.tv_show_map)
|
||||
}
|
||||
|
||||
override fun convert(holder: BaseViewHolder, item: DeviceEntity) {
|
||||
|
||||
Reference in New Issue
Block a user