Commit 23623b40 authored by 周文华's avatar 周文华

【新增】新增天气数据显示逻辑

parent 7bbae4c8
...@@ -21,6 +21,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI ...@@ -21,6 +21,7 @@ import com.base.scanqrclear.bean.FunctionUIBean.Companion.KEY_WIFI
import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean import com.base.scanqrclear.bean.config.AdConfigBean.Companion.adsConfigBean
import com.base.scanqrclear.databinding.FragmentCreateBinding import com.base.scanqrclear.databinding.FragmentCreateBinding
import com.base.scanqrclear.luma.WeatherInterface import com.base.scanqrclear.luma.WeatherInterface
import com.base.scanqrclear.luma.WeatherUtils
import com.base.scanqrclear.ui.contact.ContractActivity import com.base.scanqrclear.ui.contact.ContractActivity
import com.base.scanqrclear.ui.email.EmailActivity import com.base.scanqrclear.ui.email.EmailActivity
import com.base.scanqrclear.ui.event.EventActivity import com.base.scanqrclear.ui.event.EventActivity
...@@ -33,6 +34,7 @@ import com.base.scanqrclear.ui.wifi.WifiActivity ...@@ -33,6 +34,7 @@ import com.base.scanqrclear.ui.wifi.WifiActivity
import com.base.scanqrclear.utils.AppPreferences import com.base.scanqrclear.utils.AppPreferences
import com.base.scanqrclear.utils.BarUtils import com.base.scanqrclear.utils.BarUtils
import com.gyf.immersionbar.ktx.immersionBar import com.gyf.immersionbar.ktx.immersionBar
import kotlin.random.Random
class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding::inflate) { class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding::inflate) {
...@@ -58,13 +60,6 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -58,13 +60,6 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
override fun initView() { override fun initView() {
super.initView() super.initView()
binding.tvWeather.setCompoundDrawablesWithIntrinsicBounds(
ContextCompat.getDrawable(requireContext(), R.mipmap.x_qing),
null,
null,
null
)
binding.tvWeather.text = "40℃"
binding.space.layoutParams.height = BarUtils.getStatusBarHeight() binding.space.layoutParams.height = BarUtils.getStatusBarHeight()
// binding.ivVip.updatePadding(top = BarUtils.getStatusBarHeight()) // binding.ivVip.updatePadding(top = BarUtils.getStatusBarHeight())
adapter = FunctionAdapter() adapter = FunctionAdapter()
...@@ -96,6 +91,40 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -96,6 +91,40 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
} }
} }
@SuppressLint("SetTextI18n")
private fun setWeather(){
val weatherEntity = WeatherUtils.getWeatherEntity()
var icon:Int
var value = 22
weatherEntity?.let {
val subBean = weatherEntity.list[0]
val min = subBean.tempMin.toInt()
val max = subBean.tempMax.toInt()
if (min == max) {
value = max
}
if (min < max) {
value = Random.nextInt(min, max)
}
icon = when (WeatherUtils.getWeatherType(subBean.iconDay.toInt())) {
"Sunny day" -> R.mipmap.x_qing
"Cloudy day" -> R.mipmap.x_yin
"Rainy day" -> R.mipmap.x_dayu
"Snowy day" -> R.mipmap.x_xiaxue
"Greasy day" -> R.mipmap.x_wumaishachengbao
"Unknown" -> R.mipmap.x_qing
else -> R.mipmap.x_qing
}
binding.tvWeather.setCompoundDrawablesWithIntrinsicBounds(
ContextCompat.getDrawable(requireContext(), icon),
null,
null,
null
)
binding.tvWeather.text = "${value}℃"
}
}
@SuppressLint("NotifyDataSetChanged") @SuppressLint("NotifyDataSetChanged")
private fun itemKeyClick(key: String) { private fun itemKeyClick(key: String) {
val bean = functions.find { it.key == key } val bean = functions.find { it.key == key }
...@@ -142,6 +171,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding ...@@ -142,6 +171,7 @@ class CreateFragment : BaseFragment<FragmentCreateBinding>(FragmentCreateBinding
override fun onResumeOneShoot() { override fun onResumeOneShoot() {
super.onResumeOneShoot() super.onResumeOneShoot()
adapter?.changeGuide() adapter?.changeGuide()
setWeather()
} }
override fun onResume() { override fun onResume() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment