From e4cb9970046ef8e7392368a051cae2ab5c84799a Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期一, 29 四月 2024 17:03:11 +0800 Subject: [PATCH] 2024年04月29日17:03:06 --- app/src/main/res/layout/item_station.xml | 2 app/src/main/res/drawable/default_condition.png | 0 app/src/main/res/drawable/ascending_sort.png | 0 app/src/main/res/drawable/search_path.png | 0 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 11 app/src/main/res/drawable/descending_order.png | 0 app/src/main/res/drawable/edit.png | 0 app/src/main/res/drawable/location.png | 0 app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 5 app/src/main/res/layout/fragment_house_list.xml | 297 +++++++++++ app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 10 app/src/main/res/layout/fragment_home_page.xml | 1155 +++++++++++++++++++++++---------------------- app/src/main/res/drawable/search_bj_edeff2.xml | 5 app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 4 app/build.gradle | 2 15 files changed, 885 insertions(+), 606 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1271f2f..4e27706 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,7 +30,7 @@ minSdk 23 targetSdk 30 versionCode 1 - versionName "1.3.2"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑 + versionName "1.3.3"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠g敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true manifestPlaceholders = mfph diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java index 4da2e3d..af09611 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java @@ -128,13 +128,12 @@ /** * 鑾峰彇鍥轰欢鍗囩骇鏂囦欢鍏ㄨ矾寰� * - * @param oid 璇ュ浐浠秓id * @param imageId 闀滃儚id * @param version 椹卞姩鐗堟湰 * @return 鍏ㄨ矾寰� */ - public String getFirmwarePathFileName(String oid, String imageId, String version) { - String fileName = oid + "_" + imageId + "_" + version + ".zip"; + public String getFirmwarePathFileName(String imageId, String version) { + String fileName = imageId + "_" + version + ".zip"; return HdlFileLogic.getInstance().getFirmwareRootPath() + "/" + fileName; } diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java index 16cf484..cb6edc7 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java @@ -640,10 +640,9 @@ String[] ary = path.split("/"); String[] driverInfoAry = ary[ary.length - 1].split("_"); DeviceFirmwareBean deviceFirmwareBean = new DeviceFirmwareBean(); - deviceFirmwareBean.setOid(driverInfoAry[0]); - deviceFirmwareBean.setImageId(driverInfoAry[1]); - deviceFirmwareBean.setVersion(driverInfoAry[2].replace(".zip", "")); - deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(deviceFirmwareBean.getOid(), osImageId, deviceFirmwareBean.getVersion())); + deviceFirmwareBean.setImageId(driverInfoAry[0]); + deviceFirmwareBean.setVersion(driverInfoAry[1].replace(".zip", "")); + deviceFirmwareBean.setLocalUrl(HdlFileLogic.getInstance().getFirmwarePathFileName(osImageId, deviceFirmwareBean.getVersion())); list.add(deviceFirmwareBean); } } @@ -671,7 +670,7 @@ HdlThreadLogic.runSubThread(new Runnable() { @Override public void run() { - String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version); + String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version); //涓嶅湪瀛愮嚎绋嬭娴佷細鍗℃涓荤嚎绋� boolean isBoolean = HdlOtaLogic.getInstance().disposeDownLoadFile(firmwarePathFileName, responseBody, md5, HdlOtaLogic.firmware_type); if (isBoolean) { @@ -725,7 +724,7 @@ @Override public void onServiceConnected(ComponentName name, IBinder service) { //鏈湴鍗囩骇鍥轰欢鏂囦欢璺緞 - String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(oid, imageId, version); + String firmwarePathFileName = HdlFileLogic.getInstance().getFirmwarePathFileName(imageId, version); byte[] data = HdlFileLogic.getInstance().readFileByte(firmwarePathFileName); if (data == null || data.length == 0) { uniCallbackData(type, null, -2, HDLApp.getInstance().getString(R.string.found_locally_firmware_upgrade_file), callback); diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java index 4b08efb..dd855f2 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -251,8 +251,8 @@ } private void initView() { - viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page);// - viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);// + viewBinding.myPowerStationBottomIl0.titleTv.setText(R.string.power_shome_page); + viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station); viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message); viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me); this.bottomViewChangeOfStyle(); diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java index 69a46c0..b13c13a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java @@ -9,6 +9,7 @@ import androidx.appcompat.content.res.AppCompatResources; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.bigkoo.pickerview.builder.TimePickerBuilder; import com.bigkoo.pickerview.listener.OnTimeSelectListener; @@ -264,6 +265,15 @@ viewBinding.yearMonthDayTv.setText(time); } }); + //璁剧疆涓嬫媺绠ご棰滆壊 + viewBinding.srl.setColorSchemeResources(R.color.text_FF245EC3); + viewBinding.srl.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + viewBinding.srl.setRefreshing(false); + readDate(); + } + }); } /** diff --git a/app/src/main/res/drawable/ascending_sort.png b/app/src/main/res/drawable/ascending_sort.png new file mode 100644 index 0000000..cb82fc7 --- /dev/null +++ b/app/src/main/res/drawable/ascending_sort.png Binary files differ diff --git a/app/src/main/res/drawable/default_condition.png b/app/src/main/res/drawable/default_condition.png new file mode 100644 index 0000000..aea9459 --- /dev/null +++ b/app/src/main/res/drawable/default_condition.png Binary files differ diff --git a/app/src/main/res/drawable/descending_order.png b/app/src/main/res/drawable/descending_order.png new file mode 100644 index 0000000..3084f4d --- /dev/null +++ b/app/src/main/res/drawable/descending_order.png Binary files differ diff --git a/app/src/main/res/drawable/edit.png b/app/src/main/res/drawable/edit.png new file mode 100644 index 0000000..ebbe686 --- /dev/null +++ b/app/src/main/res/drawable/edit.png Binary files differ diff --git a/app/src/main/res/drawable/location.png b/app/src/main/res/drawable/location.png new file mode 100644 index 0000000..4078192 --- /dev/null +++ b/app/src/main/res/drawable/location.png Binary files differ diff --git a/app/src/main/res/drawable/search_bj_edeff2.xml b/app/src/main/res/drawable/search_bj_edeff2.xml new file mode 100644 index 0000000..23e1bbe --- /dev/null +++ b/app/src/main/res/drawable/search_bj_edeff2.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="@dimen/dp_17" /> + <solid android:color="@color/text_EDEFF2" /> +</shape> \ No newline at end of file diff --git a/app/src/main/res/drawable/search_path.png b/app/src/main/res/drawable/search_path.png new file mode 100644 index 0000000..e221c53 --- /dev/null +++ b/app/src/main/res/drawable/search_path.png Binary files differ diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml index cb8fa80..97c4360 100644 --- a/app/src/main/res/layout/fragment_home_page.xml +++ b/app/src/main/res/layout/fragment_home_page.xml @@ -27,8 +27,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - <ScrollView + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/srl" android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="@dimen/dp_26" @@ -37,617 +37,628 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/dp_16" - android:layout_marginEnd="@dimen/dp_16"> - - <LinearLayout - android:id="@+id/home_page_station_ll" - android:layout_width="375dp" - android:layout_height="@dimen/dp_56" - android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - <!--鍏ㄩ儴--> - <include - android:id="@+id/home_page_station_all_ic" - layout="@layout/item_station" /> - - <View - android:layout_width="15.5dp" - android:layout_height="match_parent" /> - <!--鏁呴殰--> - <include - android:id="@+id/home_page_station_fault_ic" - layout="@layout/item_station" /> - - <View - android:layout_width="16dp" - android:layout_height="match_parent" /> - <!--绂荤嚎--> - <include - android:id="@+id/home_page_station_offline_ic" - layout="@layout/item_station" /> - - <View - android:layout_width="15.5dp" - android:layout_height="match_parent" /> - <!--寰呮帴鍏�--> - <include - android:id="@+id/home_page_station_connected_ic" - layout="@layout/item_station" /> - - - </LinearLayout> + <ScrollView + android:id="@+id/sl" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/dp_26" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv"> <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/home_page_station_info_cl" - android:layout_width="0dp" - android:layout_height="312dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_ll"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16"> - <RelativeLayout - android:id="@+id/home_page_station_info_rl1" - android:layout_width="0dp" - android:layout_height="146dp" + <LinearLayout + android:id="@+id/home_page_station_ll" + android:layout_width="375dp" + android:layout_height="@dimen/dp_56" + android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> + <!--鍏ㄩ儴--> + <include + android:id="@+id/home_page_station_all_ic" + layout="@layout/item_station" /> + + <View + android:layout_width="15.5dp" + android:layout_height="match_parent" /> + <!--鏁呴殰--> + <include + android:id="@+id/home_page_station_fault_ic" + layout="@layout/item_station" /> + + <View + android:layout_width="16dp" + android:layout_height="match_parent" /> + <!--绂荤嚎--> + <include + android:id="@+id/home_page_station_offline_ic" + layout="@layout/item_station" /> + + <View + android:layout_width="15.5dp" + android:layout_height="match_parent" /> + <!--寰呮帴鍏�--> + <include + android:id="@+id/home_page_station_connected_ic" + layout="@layout/item_station" /> + + + </LinearLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/home_page_station_info_cl" + android:layout_width="0dp" + android:layout_height="312dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_ll"> <RelativeLayout - android:id="@+id/home_page_station_info_rl1_f" - android:layout_width="102dp" - android:layout_height="102dp" - android:layout_marginTop="@dimen/dp_22" - android:background="@drawable/disc"> + android:id="@+id/home_page_station_info_rl1" + android:layout_width="0dp" + android:layout_height="146dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <RelativeLayout + android:id="@+id/home_page_station_info_rl1_f" + android:layout_width="102dp" + android:layout_height="102dp" + android:layout_marginTop="@dimen/dp_22" + android:background="@drawable/disc"> + + <TextView + android:id="@+id/info_rl1_f_text1_tv" + android:layout_width="56dp" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:gravity="end|center_vertical" + android:text="88" + android:textSize="@dimen/text_26" + android:textStyle="bold" /> + + <TextView + android:id="@+id/home_page_station_info_rl1_f_text2_tv" + android:layout_width="9dp" + android:layout_height="14.5dp" + android:layout_alignBottom="@+id/info_rl1_f_text1_tv" + android:layout_marginStart="2.5dp" + android:layout_marginBottom="4.5dp" + android:layout_toEndOf="@+id/info_rl1_f_text1_tv" + android:text="%" + android:textColor="@color/text_191919" + android:textSize="@dimen/text_12" /> + </RelativeLayout> + <TextView - android:id="@+id/info_rl1_f_text1_tv" - android:layout_width="56dp" + android:id="@+id/info_rl1_text1_tv" + style="@style/Text20Style" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_24" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_21" + android:layout_toEndOf="@+id/home_page_station_info_rl1_f" + android:text="33333333" /> + + <TextView + android:id="@+id/info_rl1_text2_tv" + style="@style/Text14Style" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_17" + android:layout_below="@+id/info_rl1_text1_tv" + android:layout_alignStart="@+id/info_rl1_text1_tv" + android:layout_marginTop="3dp" + android:text="@string/installed_capacity" /> + + <TextView + android:id="@+id/info_rl1_text3_tv" + style="@style/Text20Style" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_24" + android:layout_below="@+id/info_rl1_text2_tv" + android:layout_alignStart="@+id/info_rl1_text1_tv" + android:layout_marginTop="@dimen/dp_16" + android:text="33333" /> + + <TextView + android:id="@+id/info_rl1_text4_tv" + style="@style/Text14Style" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_17" + android:layout_below="@+id/info_rl1_text3_tv" + android:layout_alignStart="@+id/info_rl1_text1_tv" + android:layout_marginTop="3dp" + android:text="@string/generated_power" /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/home_page_station_info_rl2" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_166" + android:background="@drawable/bj_13_ffffff" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1"> + + <ImageView + android:layout_width="25dp" + android:layout_height="22dp" + android:layout_marginStart="15.5dp" + android:layout_marginTop="10.5dp" + android:src="@drawable/info_1" /> + + <TextView + android:id="@+id/home_page_station_info_rl1_title_tv" + android:layout_width="wrap_content" + android:layout_height="14.5dp" + android:layout_marginStart="@dimen/dp_47" + android:layout_marginTop="17dp" + android:text="@string/generation" + android:textColor="@color/text_191919" + android:textSize="@dimen/text_12" /> + + <include + android:id="@+id/home_page_station_info_rl2_day_ic" + layout="@layout/item_data" + android:layout_width="@dimen/dp_171" + android:layout_height="@dimen/dp_44" + android:layout_marginTop="47.5dp" /> + + <View + android:id="@+id/line1_v" + android:layout_width="0.5dp" + android:layout_height="37.5dp" + android:layout_marginTop="53dp" + android:layout_toEndOf="@+id/home_page_station_info_rl2_day_ic" + android:background="@color/text_E1E1E1" /> + + <include + android:id="@+id/home_page_station_info_rl2_mon_ic" + layout="@layout/item_data" + android:layout_width="@dimen/dp_171" + android:layout_height="@dimen/dp_44" + android:layout_marginTop="47.5dp" + android:layout_toEndOf="@+id/line1_v" /> + + <include + android:id="@+id/home_page_station_info_rl2_year_ic" + layout="@layout/item_data" + android:layout_width="@dimen/dp_171" + android:layout_height="@dimen/dp_44" + android:layout_marginTop="106dp" /> + + <View + android:id="@+id/line2_v" + android:layout_width="0.5dp" + android:layout_height="37.5dp" + android:layout_marginTop="109.5dp" + android:layout_toEndOf="@+id/home_page_station_info_rl2_year_ic" + android:background="@color/text_E1E1E1" /> + + <include + android:id="@+id/home_page_station_info_rl2_cumulative_ic" + layout="@layout/item_data" + android:layout_width="@dimen/dp_171" + android:layout_height="@dimen/dp_44" + android:layout_marginTop="106dp" + android:layout_toEndOf="@+id/line2_v" /> + + </RelativeLayout> + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/home_page_station_data_cl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl"> + + <TextView + android:id="@+id/home_page_station_data_title_tv" + android:layout_width="wrap_content" + android:layout_height="18dp" + android:layout_marginTop="@dimen/dp_25" + android:text="@string/energy_generation_statistics" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_14" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + <!--鏃堕棿绫诲瀷--> + <LinearLayout + android:id="@+id/home_page_station_select_time_type_ll" + android:layout_width="match_parent" + android:layout_height="30.5dp" + android:layout_marginTop="@dimen/dp_13" + android:background="@drawable/line_c1c1c1" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_title_tv"> + + <TextView + android:id="@+id/day_tv" + style="@style/Text14Style" + android:layout_width="86dp" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/day" /> + + <View + android:id="@+id/v_1" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/text_C1C1C1" /> + + <TextView + android:id="@+id/month_tv" + style="@style/Text14Style" + android:layout_width="86dp" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/month" /> + + <View + android:id="@+id/v_2" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/text_C1C1C1" /> + + <TextView + android:id="@+id/year_tv" + style="@style/Text14Style" + android:layout_width="86dp" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/year" /> + + <View + android:id="@+id/v_3" + android:layout_width="1dp" + android:layout_height="match_parent" + android:background="@color/text_C1C1C1" /> + + <TextView + android:id="@+id/lifeCycle_tv" + style="@style/Text14Style" + android:layout_width="86dp" + android:layout_height="match_parent" + android:gravity="center" + android:text="@string/life_cycle" /> + + </LinearLayout> + <!--鏃堕棿鍒囨崲鎺т欢--> + <LinearLayout + android:id="@+id/home_page_station_select_time_ll" + android:layout_width="match_parent" + android:layout_height="30.5dp" + android:layout_marginTop="@dimen/dp_23" + android:gravity="center" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_type_ll"> + <!--鍔犲ぇ鐐瑰嚮鐑尯--> + <LinearLayout + android:id="@+id/last_step_click_ll" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:gravity="end|center_vertical" - android:text="88" - android:textSize="@dimen/text_26" + android:orientation="horizontal"> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + <ImageView + android:id="@+id/last_step_iv" + android:layout_width="9dp" + android:layout_height="15dp" + android:scaleType="fitCenter" + android:src="@drawable/last_step" /> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + </LinearLayout> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + + <TextView + android:id="@+id/year_month_day_tv" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:gravity="center" + android:text="2024/03/07" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_16" + android:textStyle="bold" /> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + <!--鍔犲ぇ鐐瑰嚮鐑尯--> + <LinearLayout + android:id="@+id/next_step_click_ll" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + <ImageView + android:id="@+id/next_step_iv" + android:layout_width="9dp" + android:layout_height="15dp" + android:scaleType="fitCenter" + android:src="@drawable/next_step" /> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + </LinearLayout> + + </LinearLayout> + + <RelativeLayout + android:id="@+id/chart_title_rl" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_15" + android:layout_marginTop="@dimen/dp_36" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_ll"> + + <TextView + android:id="@+id/unit_tv" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentStart="true" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_12" /> + + <TextView + android:id="@+id/unit_icon_tv" + android:layout_width="@dimen/dp_11" + android:layout_height="@dimen/dp_11" + android:layout_marginTop="@dimen/dp_3" + android:layout_marginEnd="@dimen/dp_3" + android:layout_toStartOf="@+id/unit_text_tv" + android:background="@drawable/point_38c494" /> + + <TextView + android:id="@+id/unit_text_tv" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_alignParentEnd="true" + android:text="PV power generation" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_12" /> + + </RelativeLayout> + + <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView + android:id="@+id/AAChartView" + android:layout_width="0dp" + android:layout_height="284dp" + android:layout_marginTop="@dimen/dp_18" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/chart_title_rl" /> + </androidx.constraintlayout.widget.ConstraintLayout> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/home_page_station_statistics_cl" + android:layout_width="match_parent" + android:layout_height="186dp" + android:layout_marginTop="@dimen/dp_26" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl"> + + <TextView + android:id="@+id/social_contribution_title_tv" + android:layout_width="wrap_content" + android:layout_height="17dp" + android:text="@string/social_contribution" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_14" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <RelativeLayout + android:id="@+id/social_contribution_1_rl" + android:layout_width="@dimen/dp_104" + android:layout_height="@dimen/dp_126" + android:layout_marginTop="@dimen/dp_13" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> + + <ImageView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scaleType="fitCenter" + android:src="@drawable/social_contribution_1" /> + + <TextView + android:id="@+id/social_contribution_data_1_tv" + android:layout_width="wrap_content" + android:layout_height="22dp" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_16" + android:text="13.14" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_18" android:textStyle="bold" /> <TextView - android:id="@+id/home_page_station_info_rl1_f_text2_tv" - android:layout_width="9dp" - android:layout_height="14.5dp" - android:layout_alignBottom="@+id/info_rl1_f_text1_tv" - android:layout_marginStart="2.5dp" - android:layout_marginBottom="4.5dp" - android:layout_toEndOf="@+id/info_rl1_f_text1_tv" - android:text="%" - android:textColor="@color/text_191919" + android:id="@+id/social_contribution_unit_1_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignBottom="@+id/social_contribution_data_1_tv" + android:layout_marginStart="@dimen/dp_2" + android:layout_toEndOf="@+id/social_contribution_data_1_tv" + android:text="(T)" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_12" + + + /> + + <TextView + android:id="@+id/social_contribution_des_1_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_35" + android:text="ssss" + android:textColor="@color/text_40000000" android:textSize="@dimen/text_12" /> + + </RelativeLayout> - - <TextView - android:id="@+id/info_rl1_text1_tv" - style="@style/Text20Style" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_24" + <RelativeLayout + android:id="@+id/social_contribution_2_rl" + android:layout_width="@dimen/dp_104" + android:layout_height="@dimen/dp_126" android:layout_marginStart="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_21" - android:layout_toEndOf="@+id/home_page_station_info_rl1_f" - android:text="33333333" /> - - <TextView - android:id="@+id/info_rl1_text2_tv" - style="@style/Text14Style" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_17" - android:layout_below="@+id/info_rl1_text1_tv" - android:layout_alignStart="@+id/info_rl1_text1_tv" - android:layout_marginTop="3dp" - android:text="@string/installed_capacity" /> - - <TextView - android:id="@+id/info_rl1_text3_tv" - style="@style/Text20Style" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_24" - android:layout_below="@+id/info_rl1_text2_tv" - android:layout_alignStart="@+id/info_rl1_text1_tv" - android:layout_marginTop="@dimen/dp_16" - android:text="33333" /> - - <TextView - android:id="@+id/info_rl1_text4_tv" - style="@style/Text14Style" - android:layout_width="wrap_content" - android:layout_height="@dimen/dp_17" - android:layout_below="@+id/info_rl1_text3_tv" - android:layout_alignStart="@+id/info_rl1_text1_tv" - android:layout_marginTop="3dp" - android:text="@string/generated_power" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/home_page_station_info_rl2" - android:layout_width="match_parent" - android:layout_height="@dimen/dp_166" - android:background="@drawable/bj_13_ffffff" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1"> - - <ImageView - android:layout_width="25dp" - android:layout_height="22dp" - android:layout_marginStart="15.5dp" - android:layout_marginTop="10.5dp" - android:src="@drawable/info_1" /> - - <TextView - android:id="@+id/home_page_station_info_rl1_title_tv" - android:layout_width="wrap_content" - android:layout_height="14.5dp" - android:layout_marginStart="@dimen/dp_47" - android:layout_marginTop="17dp" - android:text="@string/generation" - android:textColor="@color/text_191919" - android:textSize="@dimen/text_12" /> - - <include - android:id="@+id/home_page_station_info_rl2_day_ic" - layout="@layout/item_data" - android:layout_width="@dimen/dp_171" - android:layout_height="@dimen/dp_44" - android:layout_marginTop="47.5dp" /> - - <View - android:id="@+id/line1_v" - android:layout_width="0.5dp" - android:layout_height="37.5dp" - android:layout_marginTop="53dp" - android:layout_toEndOf="@+id/home_page_station_info_rl2_day_ic" - android:background="@color/text_E1E1E1" /> - - <include - android:id="@+id/home_page_station_info_rl2_mon_ic" - layout="@layout/item_data" - android:layout_width="@dimen/dp_171" - android:layout_height="@dimen/dp_44" - android:layout_marginTop="47.5dp" - android:layout_toEndOf="@+id/line1_v" /> - - <include - android:id="@+id/home_page_station_info_rl2_year_ic" - layout="@layout/item_data" - android:layout_width="@dimen/dp_171" - android:layout_height="@dimen/dp_44" - android:layout_marginTop="106dp" /> - - <View - android:id="@+id/line2_v" - android:layout_width="0.5dp" - android:layout_height="37.5dp" - android:layout_marginTop="109.5dp" - android:layout_toEndOf="@+id/home_page_station_info_rl2_year_ic" - android:background="@color/text_E1E1E1" /> - - <include - android:id="@+id/home_page_station_info_rl2_cumulative_ic" - layout="@layout/item_data" - android:layout_width="@dimen/dp_171" - android:layout_height="@dimen/dp_44" - android:layout_marginTop="106dp" - android:layout_toEndOf="@+id/line2_v" /> - - </RelativeLayout> - </androidx.constraintlayout.widget.ConstraintLayout> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/home_page_station_data_cl" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl"> - - <TextView - android:id="@+id/home_page_station_data_title_tv" - android:layout_width="wrap_content" - android:layout_height="18dp" - android:layout_marginTop="@dimen/dp_25" - android:text="@string/energy_generation_statistics" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_14" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - <!--鏃堕棿绫诲瀷--> - <LinearLayout - android:id="@+id/home_page_station_select_time_type_ll" - android:layout_width="match_parent" - android:layout_height="30.5dp" - android:layout_marginTop="@dimen/dp_13" - android:background="@drawable/line_c1c1c1" - android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_title_tv"> - - <TextView - android:id="@+id/day_tv" - style="@style/Text14Style" - android:layout_width="86dp" - android:layout_height="match_parent" - android:gravity="center" - android:text="@string/day" /> - - <View - android:id="@+id/v_1" - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@color/text_C1C1C1" /> - - <TextView - android:id="@+id/month_tv" - style="@style/Text14Style" - android:layout_width="86dp" - android:layout_height="match_parent" - android:gravity="center" - android:text="@string/month" /> - - <View - android:id="@+id/v_2" - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@color/text_C1C1C1" /> - - <TextView - android:id="@+id/year_tv" - style="@style/Text14Style" - android:layout_width="86dp" - android:layout_height="match_parent" - android:gravity="center" - android:text="@string/year" /> - - <View - android:id="@+id/v_3" - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@color/text_C1C1C1" /> - - <TextView - android:id="@+id/lifeCycle_tv" - style="@style/Text14Style" - android:layout_width="86dp" - android:layout_height="match_parent" - android:gravity="center" - android:text="@string/life_cycle" /> - - </LinearLayout> - <!--鏃堕棿鍒囨崲鎺т欢--> - <LinearLayout - android:id="@+id/home_page_station_select_time_ll" - android:layout_width="match_parent" - android:layout_height="30.5dp" - android:layout_marginTop="@dimen/dp_23" - android:gravity="center" - android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_type_ll"> - <!--鍔犲ぇ鐐瑰嚮鐑尯--> - <LinearLayout - android:id="@+id/last_step_click_ll" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> + android:layout_marginTop="@dimen/dp_13" + app:layout_constraintStart_toEndOf="@+id/social_contribution_1_rl" + app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> <ImageView - android:id="@+id/last_step_iv" - android:layout_width="9dp" - android:layout_height="15dp" + android:layout_width="match_parent" + android:layout_height="match_parent" android:scaleType="fitCenter" - android:src="@drawable/last_step" /> + android:src="@drawable/social_contribution_2" /> - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> - </LinearLayout> + <TextView + android:id="@+id/social_contribution_data_2_tv" + android:layout_width="wrap_content" + android:layout_height="22dp" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_16" + android:text="13.14" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_18" + android:textStyle="bold" /> - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> + <TextView + android:id="@+id/social_contribution_unit_2_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignBottom="@+id/social_contribution_data_2_tv" + android:layout_marginStart="@dimen/dp_2" + android:layout_toEndOf="@+id/social_contribution_data_2_tv" + android:text="(T)" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_12" + + /> + + <TextView + android:id="@+id/social_contribution_des_2_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_35" + android:text="ssss" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_12" /> - <TextView - android:id="@+id/year_month_day_tv" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="center" - android:text="2024/03/07" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_16" - android:textStyle="bold" /> + </RelativeLayout> - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> - <!--鍔犲ぇ鐐瑰嚮鐑尯--> - <LinearLayout - android:id="@+id/next_step_click_ll" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> + <RelativeLayout + android:id="@+id/social_contribution_3_rl" + android:layout_width="@dimen/dp_104" + android:layout_height="@dimen/dp_126" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_13" + app:layout_constraintStart_toEndOf="@+id/social_contribution_2_rl" + app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> <ImageView - android:id="@+id/next_step_iv" - android:layout_width="9dp" - android:layout_height="15dp" + android:layout_width="match_parent" + android:layout_height="match_parent" android:scaleType="fitCenter" - android:src="@drawable/next_step" /> + android:src="@drawable/social_contribution_3" /> - <View - android:layout_width="@dimen/dp_16" - android:layout_height="match_parent" /> + <TextView + android:id="@+id/social_contribution_data_3_tv" + android:layout_width="wrap_content" + android:layout_height="22dp" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_16" + android:text="13.14" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_18" + android:textStyle="bold" /> - </LinearLayout> + <TextView + android:id="@+id/social_contribution_unit_3_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignBottom="@+id/social_contribution_data_3_tv" + android:layout_marginStart="@dimen/dp_2" + android:layout_toEndOf="@+id/social_contribution_data_3_tv" + android:text="(T)" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_12" - </LinearLayout> + /> - <RelativeLayout - android:id="@+id/chart_title_rl" - android:layout_width="match_parent" - android:layout_height="@dimen/dp_15" - android:layout_marginTop="@dimen/dp_36" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_select_time_ll"> - - <TextView - android:id="@+id/unit_tv" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentStart="true" - android:textColor="@color/text_40000000" - android:textSize="@dimen/text_12" /> - - <TextView - android:id="@+id/unit_icon_tv" - android:layout_width="@dimen/dp_11" - android:layout_height="@dimen/dp_11" - android:layout_marginTop="@dimen/dp_3" - android:layout_marginEnd="@dimen/dp_3" - android:layout_toStartOf="@+id/unit_text_tv" - android:background="@drawable/point_38c494" /> - - <TextView - android:id="@+id/unit_text_tv" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:text="PV power generation" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_12" /> - - </RelativeLayout> - - <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView - android:id="@+id/AAChartView" - android:layout_width="0dp" - android:layout_height="284dp" - android:layout_marginTop="@dimen/dp_18" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/chart_title_rl" /> - </androidx.constraintlayout.widget.ConstraintLayout> - - <androidx.constraintlayout.widget.ConstraintLayout - android:id="@+id/home_page_station_statistics_cl" - android:layout_width="match_parent" - android:layout_height="186dp" - android:layout_marginTop="@dimen/dp_26" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl"> - - <TextView - android:id="@+id/social_contribution_title_tv" - android:layout_width="wrap_content" - android:layout_height="17dp" - android:text="@string/social_contribution" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_14" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <RelativeLayout - android:id="@+id/social_contribution_1_rl" - android:layout_width="@dimen/dp_104" - android:layout_height="@dimen/dp_126" - android:layout_marginTop="@dimen/dp_13" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> - - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="fitCenter" - android:src="@drawable/social_contribution_1" /> - - <TextView - android:id="@+id/social_contribution_data_1_tv" - android:layout_width="wrap_content" - android:layout_height="22dp" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_16" - android:text="13.14" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_18" - android:textStyle="bold" /> - - <TextView - android:id="@+id/social_contribution_unit_1_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignBottom="@+id/social_contribution_data_1_tv" - android:layout_marginStart="@dimen/dp_2" - android:layout_toEndOf="@+id/social_contribution_data_1_tv" - android:text="(T)" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_12" + <TextView + android:id="@+id/social_contribution_des_3_tv" + android:layout_width="wrap_content" + android:layout_height="15dp" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_marginTop="@dimen/dp_35" + android:text="ssss" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_12" /> - /> + </RelativeLayout> - <TextView - android:id="@+id/social_contribution_des_1_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_35" - android:text="ssss" - android:textColor="@color/text_40000000" - android:textSize="@dimen/text_12" /> + </androidx.constraintlayout.widget.ConstraintLayout> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/social_contribution_2_rl" - android:layout_width="@dimen/dp_104" - android:layout_height="@dimen/dp_126" - android:layout_marginStart="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_13" - app:layout_constraintStart_toEndOf="@+id/social_contribution_1_rl" - app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> - - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="fitCenter" - android:src="@drawable/social_contribution_2" /> - - <TextView - android:id="@+id/social_contribution_data_2_tv" - android:layout_width="wrap_content" - android:layout_height="22dp" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_16" - android:text="13.14" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_18" - android:textStyle="bold" /> - - <TextView - android:id="@+id/social_contribution_unit_2_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignBottom="@+id/social_contribution_data_2_tv" - android:layout_marginStart="@dimen/dp_2" - android:layout_toEndOf="@+id/social_contribution_data_2_tv" - android:text="(T)" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_12" - - /> - - <TextView - android:id="@+id/social_contribution_des_2_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_35" - android:text="ssss" - android:textColor="@color/text_40000000" - android:textSize="@dimen/text_12" /> - - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/social_contribution_3_rl" - android:layout_width="@dimen/dp_104" - android:layout_height="@dimen/dp_126" - android:layout_marginStart="@dimen/dp_16" - android:layout_marginTop="@dimen/dp_13" - app:layout_constraintStart_toEndOf="@+id/social_contribution_2_rl" - app:layout_constraintTop_toBottomOf="@+id/social_contribution_title_tv"> - - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="fitCenter" - android:src="@drawable/social_contribution_3" /> - - <TextView - android:id="@+id/social_contribution_data_3_tv" - android:layout_width="wrap_content" - android:layout_height="22dp" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_16" - android:text="13.14" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_18" - android:textStyle="bold" /> - - <TextView - android:id="@+id/social_contribution_unit_3_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignBottom="@+id/social_contribution_data_3_tv" - android:layout_marginStart="@dimen/dp_2" - android:layout_toEndOf="@+id/social_contribution_data_3_tv" - android:text="(T)" - android:textColor="@color/text_90000000" - android:textSize="@dimen/text_12" - - /> - - <TextView - android:id="@+id/social_contribution_des_3_tv" - android:layout_width="wrap_content" - android:layout_height="15dp" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:layout_marginStart="@dimen/dp_10" - android:layout_marginTop="@dimen/dp_35" - android:text="ssss" - android:textColor="@color/text_40000000" - android:textSize="@dimen/text_12" /> - - - </RelativeLayout> </androidx.constraintlayout.widget.ConstraintLayout> - </androidx.constraintlayout.widget.ConstraintLayout> - - - </ScrollView> + </ScrollView> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_house_list.xml b/app/src/main/res/layout/fragment_house_list.xml index 0722160..86a5314 100644 --- a/app/src/main/res/layout/fragment_house_list.xml +++ b/app/src/main/res/layout/fragment_house_list.xml @@ -6,27 +6,281 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include - android:id="@+id/toolbar_top_fragment_house_list_rl" - layout="@layout/toolbar_top_view_52" /> - - <RelativeLayout - android:id="@+id/fragment_house_list_head_rl" + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/power_station_label_top_cl" android:layout_width="match_parent" - android:layout_height="@dimen/dp_64" - android:background="@color/text_F9FAFB" - android:visibility="gone" + android:layout_height="@dimen/dp_200" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/toolbar_top_fragment_house_list_rl"> + app:layout_constraintTop_toTopOf="parent"> - <LinearLayout - android:id="@+id/fragment_house_list_content_ll" + <RelativeLayout + android:id="@+id/title_cl" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/dp_20" - android:layout_marginEnd="@dimen/dp_20" - android:orientation="horizontal"> + android:layout_height="@dimen/dp_31" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <TextView + android:id="@+id/power_station_label" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:text="Power Station" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_20" + android:textStyle="bold" /> + + <TextView + android:id="@+id/device_label" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/dp_21" + android:layout_toStartOf="@+id/edit_iv" + android:layout_toEndOf="@+id/power_station_label" + android:gravity="" + android:text="Equipment" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_16" + + /> + + <ImageView + android:id="@+id/edit_iv" + android:layout_width="@dimen/dp_31" + android:layout_height="@dimen/dp_31" + android:layout_marginEnd="@dimen/dp_13" + android:layout_toStartOf="@+id/add_iv" + android:src="@drawable/edit" + + /> + + <ImageView + android:id="@+id/add_iv" + android:layout_width="@dimen/dp_31" + android:layout_height="@dimen/dp_31" + android:layout_alignParentEnd="true" + android:src="@drawable/add" /> + + + </RelativeLayout> + <!--鎼滅储--> + <RelativeLayout + android:id="@+id/search_cl" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_35" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_16" + android:layout_marginEnd="@dimen/dp_16" + + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/title_cl"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginEnd="@dimen/dp_17" + android:layout_toStartOf="@+id/default_condition_iv" + android:background="@drawable/search_bj_edeff2"> + + <ImageView + android:id="@+id/search_iv" + android:layout_width="@dimen/dp_18" + android:layout_height="@dimen/dp_18" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/dp_13" + android:src="@drawable/search_path" /> + + <TextView + android:id="@+id/search_tv" + android:layout_width="wrap_content" + android:layout_height="@dimen/dp_17" + android:layout_centerVertical="true" + android:layout_marginStart="@dimen/dp_11" + android:layout_toEndOf="@+id/search_iv" + android:text="Search the power station" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_14" /> + </RelativeLayout> + + <ImageView + android:id="@+id/default_condition_iv" + android:layout_width="@dimen/dp_31" + android:layout_height="@dimen/dp_31" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:src="@drawable/default_condition" /> + + + </RelativeLayout> + <!--鏉′欢绛涢��--> + <LinearLayout + android:id="@+id/screening_condition_ll" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_56" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_21" + android:layout_marginEnd="@dimen/dp_16" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/search_cl"> + + <LinearLayout + android:id="@+id/screening_condition_1" + android:layout_width="@dimen/dp_74" + android:layout_height="@dimen/dp_56" + android:layout_gravity="center_vertical" + android:background="@drawable/station_status_no_ffffff" + android:orientation="vertical"> + + <TextView + android:id="@+id/screening_condition_number1_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_25" + android:layout_marginTop="7dp" + android:gravity="center" + android:text="99" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_21" + android:textStyle="bold" /> + + <TextView + android:id="@+id/screening_condition_text1_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_17" + android:layout_marginTop="1dp" + android:gravity="center" + android:text="state" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_14" /> + + </LinearLayout> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + <LinearLayout + android:id="@+id/screening_condition_2" + android:layout_width="@dimen/dp_74" + android:layout_height="@dimen/dp_56" + android:layout_gravity="center_vertical" + android:background="@drawable/station_status_no_ffffff" + android:orientation="vertical"> + + <TextView + android:id="@+id/screening_condition_number2_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_25" + android:layout_marginTop="7dp" + android:gravity="center" + android:text="99" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_21" + android:textStyle="bold" /> + + <TextView + android:id="@+id/screening_condition_text2_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_17" + android:layout_marginTop="1dp" + android:gravity="center" + android:text="state" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_14" /> + + </LinearLayout> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + <LinearLayout + android:id="@+id/screening_condition_3" + android:layout_width="@dimen/dp_74" + android:layout_height="@dimen/dp_56" + android:layout_gravity="center_vertical" + android:background="@drawable/station_status_no_ffffff" + android:orientation="vertical"> + + <TextView + android:id="@+id/screening_condition_number3_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_25" + android:layout_marginTop="7dp" + android:gravity="center" + android:text="99" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_21" + android:textStyle="bold" /> + + <TextView + android:id="@+id/screening_condition_text3_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_17" + android:layout_marginTop="1dp" + android:gravity="center" + android:text="state" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_14" /> + + </LinearLayout> + + <View + android:layout_width="@dimen/dp_16" + android:layout_height="match_parent" /> + + <LinearLayout + android:id="@+id/screening_condition_4" + android:layout_width="@dimen/dp_74" + android:layout_height="@dimen/dp_56" + android:layout_gravity="center_vertical" + android:background="@drawable/station_status_no_ffffff" + android:orientation="vertical"> + + <TextView + android:id="@+id/screening_condition_number4_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_25" + android:layout_marginTop="7dp" + android:gravity="center" + android:text="99" + android:textColor="@color/text_90000000" + android:textSize="@dimen/text_21" + android:textStyle="bold" /> + + <TextView + android:id="@+id/screening_condition_text4_tv" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_17" + android:layout_marginTop="1dp" + android:gravity="center" + android:text="state" + android:textColor="@color/text_40000000" + android:textSize="@dimen/text_14" /> + + </LinearLayout> + + </LinearLayout> + <!--鍗囧簭闄嶅簭鍔熻兘--> + <LinearLayout + android:id="@+id/ascending_order_descending_order_parent_ll" + android:layout_width="match_parent" + android:layout_height="@dimen/dp_17" + android:layout_marginStart="@dimen/dp_16" + android:layout_marginTop="@dimen/dp_21" + android:layout_marginEnd="@dimen/dp_12" + android:orientation="horizontal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/screening_condition_ll"> <RelativeLayout android:id="@+id/fragment_house_list_content_title1_rl" @@ -111,7 +365,9 @@ </LinearLayout> - </RelativeLayout> + + </androidx.constraintlayout.widget.ConstraintLayout> + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/fragment_house_srl" @@ -120,7 +376,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/fragment_house_list_head_rl"> + app:layout_constraintTop_toBottomOf="@+id/power_station_label_top_cl"> <androidx.recyclerview.widget.RecyclerView android:id="@+id/fragment_house_srl_list_rc" @@ -136,12 +392,11 @@ layout="@layout/null_data_view" android:layout_width="match_parent" android:layout_height="224dp" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:visibility="gone" - /> + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/item_station.xml b/app/src/main/res/layout/item_station.xml index 772a677..32adc65 100644 --- a/app/src/main/res/layout/item_station.xml +++ b/app/src/main/res/layout/item_station.xml @@ -13,7 +13,7 @@ android:layout_marginTop="7dp" android:text="99" android:textColor="@color/text_90000000" - android:textSize="@dimen/text_14" + android:textSize="@dimen/text_21" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" -- Gitblit v1.8.0