From d4a66fc7e388f7e8376119aa4bf67a72bd361e23 Mon Sep 17 00:00:00 2001 From: wenfei Date: Fri, 19 Sep 2025 16:57:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E5=AE=9E=E6=97=B6=E6=A6=82?= =?UTF-8?q?=E5=86=B5=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rehome/zhdcoa/Contans.java | 10 +- .../zhdcoa/bean/WeatherRealDataBean.java | 196 ++++ .../zhdcoa/bean/WorkRiskLevelListBean.java | 2 +- .../zhdcoa/ui/activity/WeatherActivity.kt | 339 ++----- .../rehome/zhdcoa/ui/fragment/HomeFragment.kt | 8 +- .../drawable-xhdpi/arrow_right_weather.png | Bin 0 -> 3017 bytes .../main/res/drawable-xhdpi/icon_refresh.png | Bin 0 -> 6146 bytes .../main/res/drawable-xhdpi/icon_weather.png | Bin 0 -> 28738 bytes .../res/drawable/lv_border_all_weather.xml | 16 + app/src/main/res/layout/activity_weather.xml | 927 +++++++++++------- .../res/layout/activity_work_risk_list.xml | 1 + 11 files changed, 891 insertions(+), 608 deletions(-) create mode 100644 app/src/main/java/com/rehome/zhdcoa/bean/WeatherRealDataBean.java create mode 100644 app/src/main/res/drawable-xhdpi/arrow_right_weather.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_refresh.png create mode 100644 app/src/main/res/drawable-xhdpi/icon_weather.png create mode 100644 app/src/main/res/drawable/lv_border_all_weather.xml diff --git a/app/src/main/java/com/rehome/zhdcoa/Contans.java b/app/src/main/java/com/rehome/zhdcoa/Contans.java index 2146cb6..ae717ae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/Contans.java +++ b/app/src/main/java/com/rehome/zhdcoa/Contans.java @@ -584,10 +584,18 @@ public class Contans { //通讯录 public static String GETCONTACTLIST_URL="PubFile/Data/GetAddressbookRsa.ashx"; - //修改手机号或者密码 public static String UPLOAD_PHONE_OR_PWD_URL="PubFile/Data/aboutme/UpdateUserPwd.ashx"; + //气象获取实时数据 + public final static String GET_WEATHER_NOW_DATA = "PubFile/Data/QXZ/GetCurrentData.ashx"; + + //气象获取历史数据 + public final static String GET_WEATHER_HISTORY_DATA = "PubFile/Data/QXZ/GetHistoryData.ashx"; + + //http://localhost:28105/PubFile/Data/QXZ/GetHistoryData.ashx?times=2025-09-07 00:00:00&timee=2025-09-19 23:00:00&page=2&pageSize=20&dataType=E1 + //http://localhost:28105/PubFile/Data/QXZ/GetCurrentData.ashx + /** * 获取关于我的数据，总数量。 * 提到我的 diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WeatherRealDataBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WeatherRealDataBean.java new file mode 100644 index 0000000..b810144 --- /dev/null +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WeatherRealDataBean.java @@ -0,0 +1,196 @@ +package com.rehome.zhdcoa.bean; + +public class WeatherRealDataBean extends AIBaseBean{ + private DataBean data; + + public DataBean getData() { + return data; + } + + public void setData(DataBean data) { + this.data = data; + } + + public static class DataBean { + private String IDM; + private String IDFAC; + private String TIME; + private String E1; + private String E2; + private String E3; + private String E4; + private String E5; + private String E6; + private String E7; + private String E8; + private String E9; + private String E10; + private String E11; + private String E12; + private String E13; + private String E14; + private String E15; + private String E16; + private String TBSJ; + + public String getIDM() { + return IDM; + } + + public void setIDM(String IDM) { + this.IDM = IDM; + } + + public String getIDFAC() { + return IDFAC; + } + + public void setIDFAC(String IDFAC) { + this.IDFAC = IDFAC; + } + + public String getTIME() { + return TIME; + } + + public void setTIME(String TIME) { + this.TIME = TIME; + } + + public String getE1() { + return E1; + } + + public void setE1(String e1) { + E1 = e1; + } + + public String getE2() { + return E2; + } + + public void setE2(String e2) { + E2 = e2; + } + + public String getE3() { + return E3; + } + + public void setE3(String e3) { + E3 = e3; + } + + public String getE4() { + return E4; + } + + public void setE4(String e4) { + E4 = e4; + } + + public String getE5() { + return E5; + } + + public void setE5(String e5) { + E5 = e5; + } + + public String getE6() { + return E6; + } + + public void setE6(String e6) { + E6 = e6; + } + + public String getE7() { + return E7; + } + + public void setE7(String e7) { + E7 = e7; + } + + public String getE8() { + return E8; + } + + public void setE8(String e8) { + E8 = e8; + } + + public String getE9() { + return E9; + } + + public void setE9(String e9) { + E9 = e9; + } + + public String getE10() { + return E10; + } + + public void setE10(String e10) { + E10 = e10; + } + + public String getE11() { + return E11; + } + + public void setE11(String e11) { + E11 = e11; + } + + public String getE12() { + return E12; + } + + public void setE12(String e12) { + E12 = e12; + } + + public String getE13() { + return E13; + } + + public void setE13(String e13) { + E13 = e13; + } + + public String getE14() { + return E14; + } + + public void setE14(String e14) { + E14 = e14; + } + + public String getE15() { + return E15; + } + + public void setE15(String e15) { + E15 = e15; + } + + public String getE16() { + return E16; + } + + public void setE16(String e16) { + E16 = e16; + } + + public String getTBSJ() { + return TBSJ; + } + + public void setTBSJ(String TBSJ) { + this.TBSJ = TBSJ; + } + } +} diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java index 51579d2..f6fe171 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/WorkRiskLevelListBean.java @@ -6,7 +6,7 @@ import java.util.List; /** * 每日作业风险清单 */ -public class WorkRiskLevelListBean extends AIBaseBean{ +public class WorkRiskLevelListBean extends AIBaseBean{ //每日作业风险清单 private List data; diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt index a5bd657..e5cc500 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/WeatherActivity.kt @@ -12,9 +12,11 @@ import com.rehome.zhdcoa.R import com.rehome.zhdcoa.adapter.WorkRiskLevelListAdapter import com.rehome.zhdcoa.base.BaseActivityOaToolbarTwoViewBinding import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding +import com.rehome.zhdcoa.bean.WeatherRealDataBean import com.rehome.zhdcoa.bean.WorkRiskLevelListBean import com.rehome.zhdcoa.completionUtil.ReplaceSpan import com.rehome.zhdcoa.completionUtil.ReplaceSpan.OnClickListener +import com.rehome.zhdcoa.databinding.ActivityWeatherBinding import com.rehome.zhdcoa.databinding.ActivityWorkRiskListBinding import com.rehome.zhdcoa.utils.AuthenticationLoginAIUtils import com.rehome.zhdcoa.utils.GsonUtils @@ -33,7 +35,7 @@ import javax.net.ssl.HostnameVerifier * 创建日期：2025-09-18 15:19 * 描述：气象数据 实时概况 */ -class WeatherActivity : BaseActivityOaToolbarViewBinding() { +class WeatherActivity : BaseActivityOaToolbarViewBinding() { private lateinit var headView: View @@ -55,183 +57,88 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding = mutableListOf() private var dataC3: MutableList = mutableListOf() private var dataLowRisk: MutableList = mutableListOf() - private var isNetworkNormal = false - private lateinit var launcherResultQRCode: ActivityResultLauncher - override fun getViewBinding() = ActivityWorkRiskListBinding.inflate(layoutInflater) + + + override fun getViewBinding() = ActivityWeatherBinding.inflate(layoutInflater) override fun getToolbar() = binding.toolbarView.toolbar override fun initView() { - initToolbar("气象数据实时概况", "",{ + initToolbar("气象实时概况", "",{ }) - launcherResultQRCode = createQRCodeActivityResultLauncher() - - binding.lv.emptyView = binding.tvNodata - headView = View.inflate(this, R.layout.item_work_risk_list, null) - - mAdapter = WorkRiskLevelListAdapter(this,datas, - { position -> - val item = datas[position] - if(item.hazardList!=null&&item.hazardList.size>0){ - //进入风险提示页面 - val intent = Intent(context, WorkRiskListTipActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("hazardList", GsonUtils.GsonString(item.hazardList)) - startActivity(intent) - } - }, - { position -> - val item = datas[position] - if(item.hazardList!=null&&item.hazardList.size>0){ - //进入修改风险等级 - val intent = Intent(context, CustomDialogChangeLevelActivity::class.java) - intent.putExtra("id",item.id) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("level", item.level) - intent.putExtra("type", item.type) - launcherResultQRCode.launch(intent) - } - }, - { position -> - val item = datas[position] - showLog("---------") - showLog(GsonUtils.GsonString(item)) - //工作情况汇报 - val intent = Intent(context, WorkRiskListHuiBaoActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("level",item.level) - intent.putExtra("type",item.type) - intent.putExtra("id",item.id) - startActivity(intent) - } - ) - //binding.lv.addHeaderView(headView, null, false) - binding.lv.adapter = mAdapter - - binding.llRefresh.setOnClickListener { authenticationLoginAI() } - - binding.llWorkTicket.setOnClickListener { - if(isNetworkNormal){ - //进入风险提示页面 WorkTickerSelectListActivity - val intent = Intent(context, WorkTickerSelectListActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("selectList", GsonUtils.GsonString(selectList)) - intent.putExtra("jobNoList", GsonUtils.GsonString(jobNoList)) - startActivity(intent) - }else{ - //WorkTickerAssistantSelectListActivity - showToast("列表数据加载失败，请检查网络环境或重新加载列表数据") - } - } - - binding.llAssiting.setOnClickListener { - if(isNetworkNormal){ - //进入风险提示页面 WorkTickerAssistantSelectListActivity - val intent = Intent(context, WorkTickerAssistantSelectListActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("selectList", GsonUtils.GsonString(selectListAssistant)) - intent.putExtra("jobNoList", GsonUtils.GsonString(jobNoListAssistant)) - startActivity(intent) - }else{ - showToast("列表数据加载失败，请检查网络环境或重新加载列表数据") - } - } - - binding.llCustomAdd.setOnClickListener { - if(isNetworkNormal){ - //进入风险提示页面 WorkTickerAssistantSelectListActivity - val intent = Intent(context, WorkTickerCustomListActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - intent.putExtra("selectList", GsonUtils.GsonString(selectListCustom)) - intent.putExtra("jobNoList", GsonUtils.GsonString(jobNoListCustom)) - startActivity(intent) - }else{ - showToast("列表数据加载失败，请检查网络环境或重新加载列表数据") - } - } //格式化日期的对象(转化成习惯的时间格式) - val sdFormat = SimpleDateFormat("yyyy.MM.dd") + val sdFormat = SimpleDateFormat("yyyy.MM.dd HH:mm:ss") //静态方法getInstance()使用默认时区和语言环境获得一个日历。 val calendar = Calendar.getInstance() //输出当前系统时间; - binding.tvTime.text = sdFormat.format(calendar.time) - bindViewClick() - } + //binding.tvTime.text = sdFormat.format(calendar.time) + binding.tvRefresh1.setOnClickListener { + refreshData() + } + binding.tvRefresh2.setOnClickListener { + refreshData() + } + binding.tvRefresh3.setOnClickListener { + refreshData() + } + binding.tvRefresh4.setOnClickListener { + refreshData() + } + binding.tvRefresh5.setOnClickListener { + refreshData() + } + binding.tvRefresh6.setOnClickListener { + refreshData() + } - override fun initData() { - authenticationLoginAI() + binding.rlWendu.setOnClickListener { + showHistoryPage("大气温度") + } + binding.rlShidu.setOnClickListener { + showHistoryPage("大气湿度") + } + binding.rlQiya.setOnClickListener { + showHistoryPage("大气气压") + } + binding.rlFengqiang.setOnClickListener { + showHistoryPage("实时风速") + } + binding.rlYuliang.setOnClickListener { + showHistoryPage("实时风向") + } + binding.rlFengshu.setOnClickListener { + showHistoryPage("日雨量累计") + } } - override fun onRestart() { - super.onRestart() - authenticationLoginAI() + private fun refreshData() { + requestData() } - //创建一个ActivityResultLauncher - private fun createQRCodeActivityResultLauncher(): ActivityResultLauncher { - //kotlin写法 - return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { - val data = it.data - val resultCode = it.resultCode - if (resultCode == RESULT_OK) { - if (data != null) { - val qrCodeStr = data.getStringExtra("code") ?: "" - showLog(qrCodeStr) - if(!TextUtils.isEmpty(qrCodeStr)){ - //刷新列表数据 - authenticationLoginAI() - } - } - } - } + private fun showHistoryPage(type: String) { + val intent = Intent(context, WorkTickerAssistantSelectListActivity::class.java) + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) + intent.putExtra("selectList", GsonUtils.GsonString(selectListAssistant)) + intent.putExtra("jobNoList", GsonUtils.GsonString(jobNoListAssistant)) + startActivity(intent) } - private fun authenticationLoginAI() { - try { - //AI三维登录接口 - val userName = Contans.SP.AI_ACCOUNT - //String strPrivateEncode=RSAAndroid.encryptByPrivateKeyForSpiltStr(Contans.SP.AI_PWD,RSAAndroid.privateRsaKeyLocal); - val strPublicDecode = RSAAndroid.decryptByPublicKeyForSpiltStr( - Contans.SP.AI_PWD_ENCODE, - RSAAndroid.publicRsaKeyLocal - ) - AuthenticationLoginAIUtils.authenticationAILoginShowProgress( - this, userName, strPublicDecode - ) { _, token -> - if (token != null && token == "") { - showToast("AI三维平台登录失败") - isNetworkNormal = false - } else { - getWorkRiskListData() - } - } - } catch (e: Exception) { - e.printStackTrace() - } + override fun initData() { + requestData() } - private fun getWorkRiskListData() { + private fun requestData() { val request = NoHttp.createStringRequest( - Contans.BASE_URL_AI_3D_SERVER + Contans.DAYLY_RISK_LIST_NEW, + Contans.BASE_URL + Contans.GET_WEATHER_NOW_DATA, RequestMethod.GET ) - request.add("filter",true); - - if (Contans.BASE_URL_AI_3D_SERVER == Contans.BASE_URL_AI_3D_SERVER_EXTRANET) { - val socketFactory = NohttpUtils.getSSLSocketFactory(context) - if (socketFactory != null) { - request.sslSocketFactory = socketFactory - request.hostnameVerifier = HostnameVerifier { _, _ -> true } - } - } - NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { override fun onSucceed(what: Int, response: Response?) { @@ -240,128 +147,34 @@ class WeatherActivity : BaseActivityOaToolbarViewBinding 0) { - binding.tvNodata.visibility = View.GONE - headView.visibility = View.VISIBLE - datas.clear() - datas.addAll(workRiskLevelLists) - mAdapter.notifyDataSetChanged() - - dataA.clear() - dataB.clear() - dataC1.clear() - dataC2.clear() - dataC3.clear() - dataLowRisk.clear() - - - selectList.clear() - jobNoList.clear() - - selectListAssistant.clear() - jobNoListAssistant.clear() - - selectListCustom.clear() - jobNoListCustom.clear() - - for(item in datas){ - if("ticket" == item.type){ - selectList.add(item.id) - jobNoList.add(item.jobNo) - } - if("assisting" == item.type){ - selectListAssistant.add(item.id) - jobNoListAssistant.add(item.jobNo) - } - if("custom" == item.type){ - selectListCustom.add(item.id) - jobNoListCustom.add(item.jobNo) - } - - - showLog(GsonUtils.GsonString(item)) - if(item.level!=null&&item.level=="A"){ - dataA.add(item) - } - if(item.level!=null&&item.level=="B"){ - dataB.add(item) - } - if(item.level!=null&&item.level=="C1"){ - dataC1.add(item) - } - if(item.level!=null&&item.level=="C2"){ - dataC2.add(item) - } - if(item.level!=null&&item.level=="C3"){ - dataC3.add(item) - } - if(item.level!=null&&item.level=="低风险"){ - dataLowRisk.add(item) - } - } - binding.tvA.text = dataA.size.toString() - binding.tvB.text = dataB.size.toString() - binding.tvC1.text = dataC1.size.toString() - binding.tvC2.text = dataC2.size.toString() - binding.tvC3.text = dataC3.size.toString() - binding.tvLowLisk.text = dataLowRisk.size.toString() - - } else { - binding.tvNodata.visibility = View.VISIBLE - } - }else{ - isNetworkNormal = false + if (bean != null && bean.code==1 && bean.data != null) { + val data = bean.data + binding.timeQiya.text=data.tbsj + binding.timeShidu.text=data.tbsj + binding.timeWendu.text=data.tbsj + binding.timeFengsu.text=data.tbsj + binding.timeYuliang.text=data.tbsj + binding.timeFengxiang.text=data.tbsj + + binding.tvWendu.text=data.e16 + binding.tvShidu.text=data.e14 + binding.tvQiya.text=data.e15 + binding.tvFengsu.text=data.e1 + binding.tvFengxiang.text=data.e12 + binding.tvYuliang.text=data.e4 + } } override fun onFailed(what: Int, response: Response?) { - isNetworkNormal = false + } }) } - private fun bindViewClick() { - binding.tvA.setOnClickListener { - datas.clear() - datas.addAll(dataA) - mAdapter.notifyDataSetChanged() - } - binding.tvB.setOnClickListener { - datas.clear() - datas.addAll(dataB) - mAdapter.notifyDataSetChanged() - } - binding.tvC1.setOnClickListener { - datas.clear() - datas.addAll(dataC1) - mAdapter.notifyDataSetChanged() - } - binding.tvC2.setOnClickListener { - datas.clear() - datas.addAll(dataC2) - mAdapter.notifyDataSetChanged() - } - binding.tvC3.setOnClickListener { - datas.clear() - datas.addAll(dataC3) - mAdapter.notifyDataSetChanged() - } - binding.tvLowLisk.setOnClickListener { - datas.clear() - datas.addAll(dataLowRisk) - mAdapter.notifyDataSetChanged() - } - binding.tvReport.setOnClickListener { - val intent = Intent(context, WorkRiskListReportActivity::class.java) - intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) - startActivity(intent) - } - } + private fun toWorkRiskListHuiBaoActivity(type:String){ //工作情况汇报 diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt index 1d38adb..76382a7 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.kt @@ -209,8 +209,8 @@ class HomeFragment : BaseViewBindingFragment() { "党建", // "工会培训问卷", "生产过程监督", - "安防" - //"气象数据" + "安防", + "气象数据" ) val imgIds = intArrayOf( // R.drawable.icon_visit, @@ -225,8 +225,8 @@ class HomeFragment : BaseViewBindingFragment() { R.drawable.icon_dj, // R.drawable.gh_icon, R.drawable.icon_gcjd, - R.drawable.icon1 - //R.drawable.real_weather + R.drawable.icon1, + R.drawable.icon_weather ) for (i in titles.indices) { val item = GridItem(titles[i], imgIds[i]) diff --git a/app/src/main/res/drawable-xhdpi/arrow_right_weather.png b/app/src/main/res/drawable-xhdpi/arrow_right_weather.png new file mode 100644 index 0000000000000000000000000000000000000000..ea04cc0b56f57c3e0e5645172c19f7bc61e16b7a GIT binary patch literal 3017 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 LNkvXXu0mjf0NA}7 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/icon_refresh.png b/app/src/main/res/drawable-xhdpi/icon_refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..fb7e67dc593d284c7bfc9a8926b2b1b2a8d8327b GIT binary patch literal 6146 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
jCYyk~NL zylt?|dGgZ;%IVWR7$?o6Xnk;HKG~~!G-h}6<{5={wYNkwIaW(j%czb0!=iAHJ5|wa&X}=3oPTMjCQBQQ6LrTii^3C zyQ*Y%qjzTx8`+s>(CkHb!w7;qbKbJ7`NCZ-T5z3~rL+?LWclfWlFKv4fUlT6!?Uz} z5y1c~wV{Gyrxxnt6U#upB5(zR06`Mgi9=qJ~>cF`U#K|H~^Td{$6vHJW}3X#|+y^ET92Q{3nnr>o6d0Gq%lZ2^z&5Exq z6=UF%^hpt6ocWdRO?${6s1c3oyFOWZqv*DidGSnJEv8TJ zNYwn?znpdJShlL~!0}xci~U^WQ~TNJ(Dg$K0+F4~M@8G@*nOXza9P?ci{7KKUDhgy zb>cj^^rXZzgO@>a*Ax6pvB5?(#><7D(=#e?P86v_QU^1RtP<9Z(sMi7#Y{f(gah@9(Euw9fUCbHI!rGKPIY@(5pa^Ps*QJ(&IfS9F8SJw)!ea`cwR) zH!Fp452<4noPh6Q)nTVd1laOR7o`q9DHhq1@~xQcyz9AeJ4R)#7%oAwftj<=%cYPJuo9I12N$tcEJHZH$O7EWevpID88A~h<~1uoiP7-hl=2R~d6x=lzN^&lG^GL4SoKEw?YUKSF6 z&VA|J3rJ~wgQ@$RBIUN`D7Gfl>gy1TJ4INn0SMaJXMCr=xzJ@IXh-Rqyot69&D(eb z6dm_QcXvid3+zZ?<0^&Aw<1LaFtvx#Z5927k!|~`NcCD|5+6wwEm=yXt(nfH#CsI(PG zV^;x%X8Ud@lPczYy|%L^Ed>vXnI0vWEROqwx0l9iK?anSeyH>D`w-d&5uO(p652={ zS#2oEhX^8JXkg32DD`w+uSILZ5K1XDl>iVgIO20+Ez(!4qTl&e-uphT*JfTaD|SBRg$GcVC!HTp#A{tJ@6Zq01t5_h%D% z4vEPf6QPw!%h(`+^j3VL`HIg?(bmf3gsbIY#f==(hhrkx)8FWaQJj8dBZRs9eI4OC9|j51rEU&!3;cxnw!r(H zIFxZjps#q+4QbM)38nG*Q~$nOmBJ?`|8N(u>2L4sv^Z5VYCcpcCu zUS0ZVOS%{l$?N>$AIZFQt^&TCe*3;+O~SSYGSJ(-Bjv+QltgHwsKPTrHDu4l&teCE3 zg=7vJ^FCpfl;?)q@IhgXQX1JUCNr%iHh16HH+bd=tg+HO zgCr^xao#7U^b&K1ou=e=Db4MMs4A)`YRM08mTaEs$b?K$WscooV<}9wEgm)+iez;r zL^Xg-1kv-8NCa8t2R#sS1lOv^7dO{;@sOQWuw-OXWyok7xV!bmYdzz{Aeme}H9!46$r-W1ZgzRgklVg;Xk-Ecw7Fk)t48)eqqk`w~=G?*<$GLmFJT1eGTh z7P1Tm{D<(7_ZuuBEM#~Zr2lo$|MmR;o%}y9b*Fd^g++w95t%eT4C(l9w?G(0Sv483 IlzGH|04JPs-v9sr literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/lv_border_all_weather.xml b/app/src/main/res/drawable/lv_border_all_weather.xml new file mode 100644 index 0000000..e5901d5 --- /dev/null +++ b/app/src/main/res/drawable/lv_border_all_weather.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml index d3774e3..1be05ff 100644 --- a/app/src/main/res/layout/activity_weather.xml +++ b/app/src/main/res/layout/activity_weather.xml @@ -11,394 +11,643 @@ layout="@layout/layout_base" /> - - - - - - + - + android:layout_height="120dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + android:layout_marginStart="10dp" + android:orientation="horizontal"> - - + android:layout_width="match_parent" + android:layout_height="120dp" + android:layout_weight="2" + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + - - - + android:gravity="center|bottom" + android:paddingBottom="20dp" + android:orientation="vertical"> + android:id="@+id/tv_refresh2" + android:layout_width="25dp" + android:layout_height="25dp" + android:gravity="center" + android:background="@drawable/icon_refresh" + android:text=""/> - + + - - - - - - - - - - - - - - + android:layout_width="match_parent" + android:layout_height="120dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + - - - - + android:gravity="center|bottom" + android:paddingBottom="20dp" + android:orientation="vertical"> - + android:id="@+id/tv_refresh3" + android:layout_width="25dp" + android:layout_height="25dp" + android:gravity="center" + android:background="@drawable/icon_refresh" + android:text=""/> - - - - - + - - + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + android:gravity="center|bottom" + android:paddingBottom="20dp" + android:orientation="vertical"> - + android:id="@+id/tv_refresh4" + android:layout_width="25dp" + android:layout_height="25dp" + android:gravity="center" + android:background="@drawable/icon_refresh" + android:text=""/> - - - - - - - - - - - + - + android:layout_height="120dp" + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:layout_weight="2" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + android:layout_height="120dp" + android:layout_weight="2" + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_work_risk_list.xml b/app/src/main/res/layout/activity_work_risk_list.xml index 2a58902..6c84344 100644 --- a/app/src/main/res/layout/activity_work_risk_list.xml +++ b/app/src/main/res/layout/activity_work_risk_list.xml @@ -4,6 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:background="#E7F1F7" tools:context=".ui.activity.WorkRiskListActivity">