From e0ca0f4d1d079557fbb2367d8ca18f5d75f36235 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 10 四月 2025 15:19:48 +0800
Subject: [PATCH] 2025-04-10 15:19:45
---
app/src/main/res/drawable-xhdpi/logo.png | 0
app/src/main/res/drawable-xhdpi/reset.png | 0
app/src/main/res/drawable-xhdpi/null_data_icon.gif | 0
app/src/main/res/drawable-xhdpi/close.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java | 9 ++++
app/src/main/res/drawable-xhdpi/home_page_selected.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 1
app/src/main/res/drawable-xhdpi/default_user.png | 0
app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java | 21 ++++++----
app/src/main/res/drawable-xhdpi/l.png | 0
app/src/main/res/drawable-xhdpi/select_state.png | 0
app/src/main/res/drawable-xhdpi/desktop_logo.png | 0
app/src/main/res/drawable-xhdpi/search_back.png | 0
app/src/main/res/drawable-xhdpi/unselectedme.png | 0
app/src/main/res/drawable-xhdpi/more.png | 0
app/src/main/res/drawable-xhdpi/disc.png | 0
app/src/main/res/drawable-xhdpi/editor_house.png | 0
app/src/main/res/drawable-xhdpi/power_station_selected.png | 0
app/src/main/res/drawable-xhdpi/move_house.png | 0
app/src/main/res/drawable-xhdpi/spinner.png | 0
app/build.gradle | 4 +-
app/src/main/res/drawable-xhdpi/power_station_unselected.png | 0
app/src/main/res/drawable-xhdpi/show.png | 0
app/src/main/res/drawable-xhdpi/del_home.png | 0
app/src/main/res/drawable-xhdpi/clear.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java | 24 ++++++------
app/src/main/res/drawable-xhdpi/select.png | 0
app/src/main/res/drawable-xhdpi/device_image.png | 0
app/src/main/res/drawable-xhdpi/set.png | 0
app/src/main/res/drawable-xhdpi/social_contribution_2.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 37 +++++++++---------
app/src/main/res/drawable-xhdpi/fast_scan_light_open.png | 0
app/src/main/res/drawable-xhdpi/open.png | 0
app/src/main/res/drawable-xhdpi/me_unselected.png | 0
app/src/main/res/drawable-xhdpi/message_center.png | 0
app/src/main/res/drawable-xhdpi/qr_code.png | 0
app/src/main/res/drawable-xhdpi/social_contribution_1.png | 0
app/src/main/res/drawable-xhdpi/start_icon.png | 0
app/src/main/res/drawable-xhdpi/dcloud_circle_white_progress.png | 0
app/src/main/res/drawable-xhdpi/descending_order.png | 0
app/src/main/res/drawable-xhdpi/social_contribution_3.png | 0
app/src/main/res/drawable-xhdpi/down.png | 0
app/src/main/res/drawable-xhdpi/clear_all.png | 0
app/src/main/res/drawable-xhdpi/fast_scan_light_close.png | 0
app/src/main/res/drawable-xhdpi/next.png | 0
app/src/main/res/drawable-xhdpi/user_management.png | 0
app/src/main/res/drawable-xhdpi/selected.png | 0
app/src/main/res/drawable-xhdpi/edit.png | 0
app/src/main/res/drawable-xhdpi/asregards.png | 0
app/src/main/res/drawable-xhdpi/me_selected.png | 0
app/src/main/res/drawable-xhdpi/device_debug.png | 0
app/src/main/res/drawable-xhdpi/ascending_sort.png | 0
app/src/main/res/drawable-xhdpi/up.png | 0
app/src/main/res/drawable-xhdpi/back_c.png | 0
app/src/main/res/drawable/loading.gif | 0
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 15 +++++--
app/src/main/res/layout/fragment_home_page.xml | 2
app/src/main/res/drawable-xhdpi/hide.png | 0
app/src/main/res/drawable-xhdpi/region.png | 0
app/src/main/res/drawable-xhdpi/save_image.png | 0
app/src/main/res/drawable-xhdpi/back.png | 0
app/src/main/res/drawable-xhdpi/language_bj.png | 0
app/src/main/res/drawable-xhdpi/message.png | 0
app/src/main/res/drawable-xhdpi/plant_default_picture.png | 0
app/src/main/res/drawable-xhdpi/history_del.png | 0
app/src/main/res/drawable-xhdpi/succeed.png | 0
app/src/main/res/drawable-xhdpi/language_pull_down.png | 0
app/src/main/res/drawable-xhdpi/last_step.png | 0
app/src/main/res/drawable-xhdpi/code_box.png | 0
app/src/main/res/drawable-xhdpi/message_selected.png | 0
app/src/main/res/drawable-xhdpi/home_page_unselected.png | 0
app/src/main/res/drawable-xhdpi/selectedme.png | 0
app/src/main/res/drawable-xhdpi/tip.png | 0
app/src/main/res/drawable-xhdpi/message_unselected.png | 0
app/src/main/res/drawable-xhdpi/loading_44.png | 0
app/src/main/res/drawable-xhdpi/info_1.png | 0
/dev/null | 0
app/src/main/res/drawable-xhdpi/page_station_generating_bj.png | 0
app/src/main/res/drawable-xhdpi/unselectedpowerstation.png | 0
app/src/main/res/drawable-xhdpi/unselected.png | 0
app/src/main/res/drawable-xhdpi/selectedpowerstation.png | 0
app/src/main/res/drawable-xhdpi/tip_fail.png | 0
app/src/main/res/drawable-xhdpi/next_step.png | 0
app/src/main/res/drawable-xhdpi/move_c_house.png | 0
app/src/main/res/drawable-xhdpi/tip_succeed.png | 0
85 files changed, 66 insertions(+), 47 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 53caeb2..5198b43 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,7 +30,7 @@
minSdk 23
targetSdk 34
versionCode 4
- versionName "1.1.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.2.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -90,7 +90,7 @@
*/
android.applicationVariants.configureEach { variant ->
variant.outputs.configureEach {
- outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(2)}.apk"
+ outputFileName = "photovoltaic_v${versionName}_${generateTime()}_${getEnvironmentVersion(1)}.apk"
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index b16a231..786694b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -16,6 +16,7 @@
import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
index a8040cd..713a66a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/StatisticsBean.java
@@ -12,6 +12,15 @@
private String fieldName;// 鎻忚堪
private String fieldValue;//鍊�
private String time;// 鏃堕棿
+ private boolean future;//琛ㄧず鏄惁鏄湭鏉ユ椂闂达紙true琛ㄧず鏈潵鏃堕棿锛�
+
+ public boolean isFuture() {
+ return future;
+ }
+
+ public void setFuture(boolean future) {
+ this.future = future;
+ }
public String getFieldName() {
return fieldName == null ? "" : fieldName;
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 ed0af8e..4b41efd 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
@@ -141,7 +141,6 @@
@Override
public void onClick(View v) {
HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, ConstantManage.station_page, PowerStationStatus.All);
-
}
});
//鏁呴殰
@@ -612,17 +611,23 @@
HdlThreadLogic.runMainThread(new Runnable() {
@Override
public void run() {
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return;
}
String[] keys = new String[list.size()];
Object[] values = new Object[list.size()];
for (int i = 0; i < list.size(); i++) {
- keys[i] = list.get(i).getFieldName();
+ StatisticsBean statisticsBean = list.get(i);
+ keys[i] = statisticsBean.getFieldName();
if (TimeType.day.equals(timeType)) {
- values[i] = HdlCommonLogic.convertBigDecimal(list.get(i).getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ if (statisticsBean.isFuture()) {
+ //鏈潵鏃堕棿涓嶆樉绀�
+ values[i] = null;
+ } else {
+ values[i] = HdlCommonLogic.convertBigDecimal(statisticsBean.getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//鑾峰彇鏁存暟閮ㄥ垎
+ }
} else {
- values[i] = HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue());
+ values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue());
}
}
fieldNames = keys;
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
index 5475399..f5ce3d4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/aachart/BasicChartComposer.java
@@ -72,18 +72,18 @@
"rgba(56,196,148,0.5)",//娣辩矇鑹�, alpha 閫忔槑搴�1
"rgba(255,255,255,0)"//鐑儏鐨勭矇绾�, alpha 閫忔槑搴� 0.1
);
- try {
- if (data.length > 0) {
- for (int i = data.length - 1; i >= 0; i--) {
- if (!(Double.parseDouble(data[i].toString()) == 0)) {
- break;
- }
- data[i] = null;
- }
- }
- } catch (Exception ignored) {
-
- }
+// try {
+// if (data.length > 0) {
+// for (int i = data.length - 1; i >= 0; i--) {
+// if (!(Double.parseDouble(data[i].toString()) == 0)) {
+// break;
+// }
+// data[i] = null;
+// }
+// }
+// } catch (Exception ignored) {
+//
+// }
//棰滆壊瀛楃涓茶缃敮鎸佸崄鍏繘鍒剁被鍨嬪拰 rgba 绫诲瀷
AAStyle aaStyle = new AAStyle();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index f1fe445..8a8744c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -8,6 +8,7 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.Settings;
+import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -126,7 +127,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- getStatusOverview();
+// getStatusOverview();
initData();
//鍒濆鍖�
initView();
@@ -171,7 +172,7 @@
return;
}
powerStationStatusValue = PowerStationStatus.All;
- stationStatusStyle(viewBinding.allLl,viewBinding.allDesTv);
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -184,7 +185,7 @@
return;
}
powerStationStatusValue = PowerStationStatus.malfunction;
- stationStatusStyle(viewBinding.faultsLl,viewBinding.faultsDesTv);
+ stationStatusStyle(viewBinding.faultsLl, viewBinding.faultsDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -197,7 +198,7 @@
return;
}
powerStationStatusValue = PowerStationStatus.off;
- stationStatusStyle(viewBinding.offlineLl,viewBinding.offlineDesTv);
+ stationStatusStyle(viewBinding.offlineLl, viewBinding.offlineDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -210,7 +211,7 @@
return;
}
powerStationStatusValue = PowerStationStatus.connecting;
- stationStatusStyle(viewBinding.connectedLl,viewBinding.connectedDesTv);
+ stationStatusStyle(viewBinding.connectedLl, viewBinding.connectedDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
}
@@ -507,7 +508,7 @@
viewBinding.powerStationLabelParent.setVisibility(View.VISIBLE);
viewBinding.deviceLabelParent.setVisibility(View.GONE);
- stationStatusStyle(viewBinding.allLl,viewBinding.allDesTv);
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
//鐢电珯鏍囩
houseInfoAdapter = new HouseInfoAdapter(_mActivity);
viewBinding.fragmentHouseSrlListRc.setLayoutManager(new LinearLayoutManager(_mActivity));
@@ -667,27 +668,27 @@
isClickPowerStationLabel = true;
selectedTitleLabelStyle();
initializationState();
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
getStatusOverview();
loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
} else if (eventBus.getType().equals(ConstantManage.station_page)) {
+ // 鍙栨秷绮樻�т簨浠�
+ EventBus.getDefault().removeStickyEvent(eventBus);
+ isClickPowerStationLabel = true;
+ selectedTitleLabelStyle();
+ powerStationStatusValue = eventBus.getData() == null ? "" : eventBus.getData().toString();
//閫氳繃棣栭〉鐢电珯杩涙潵鐨�
if (eventBus.getData().equals(PowerStationStatus.All)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.allLl.performClick();
+ stationStatusStyle(viewBinding.allLl, viewBinding.allDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.malfunction)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.faultsLl.performClick();
+ stationStatusStyle(viewBinding.faultsLl, viewBinding.faultsDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.off)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.offlineLl.performClick();
+ stationStatusStyle(viewBinding.offlineLl, viewBinding.offlineDesTv);
} else if (eventBus.getData().equals(PowerStationStatus.connecting)) {
- isClickPowerStationLabel = true;
- selectedTitleLabelStyle();
- viewBinding.connectedLl.performClick();
+ stationStatusStyle(viewBinding.connectedLl, viewBinding.connectedDesTv);
}
+ getStatusOverview();
+ loadNextPageHouseList(true, key, value, installedCapacityMinValue, installedCapacityMaxValue, screeningConditionStatus, powerStationStatusValue, 1, true);
} else if (eventBus.getType().equals(ConstantManage.station_edit)) {
//缂栬緫鍚庢洿鏂颁竴涓嬩綇瀹呭垪琛�
//loadNextPageHouseList(false, key, value, installedCapacityMinValue, installedCapacityMaxValue, gridTypeValue, powerStationStatusValue, 1, true);
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
index a4d020d..89af2f3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
@@ -29,17 +29,20 @@
setCancelable(true);//绯荤粺鍚庨��鍙互鍙栨秷
setCanceledOnTouchOutside(false);
setContentView(R.layout.loading_alert);
- content = (TextView) findViewById(R.id.load_content_tv);
- ImageView imageView = (ImageView) findViewById(R.id.load_pb);
- WindowManager.LayoutParams params = getWindow().getAttributes();
- params.width = WindowManager.LayoutParams.WRAP_CONTENT;
- params.height = WindowManager.LayoutParams.WRAP_CONTENT;
- getWindow().setAttributes(params);
- Glide.with(context)
+ try {
+ content = (TextView) findViewById(R.id.load_content_tv);
+ ImageView imageView = (ImageView) findViewById(R.id.load_pb);
+ WindowManager.LayoutParams params = getWindow().getAttributes();
+ params.width = WindowManager.LayoutParams.WRAP_CONTENT;
+ params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+ getWindow().setAttributes(params);
+ Glide.with(context)
// .asBitmap() // 寮哄埗浣滀负闈欐�佸浘鐗囧姞杞�
- .load(R.drawable.loading_gif)
- .into(imageView);
+ .load(R.drawable.loading)
+ .into(imageView);
// content.setText(R.string.device_鍔犺浇涓�);
+ } catch (Exception e) {
+ }
}
public void setText(String mes) {
diff --git a/app/src/main/res/drawable/ascending_sort.png b/app/src/main/res/drawable-xhdpi/ascending_sort.png
similarity index 100%
rename from app/src/main/res/drawable/ascending_sort.png
rename to app/src/main/res/drawable-xhdpi/ascending_sort.png
Binary files differ
diff --git a/app/src/main/res/drawable/asregards.png b/app/src/main/res/drawable-xhdpi/asregards.png
similarity index 100%
rename from app/src/main/res/drawable/asregards.png
rename to app/src/main/res/drawable-xhdpi/asregards.png
Binary files differ
diff --git a/app/src/main/res/drawable/back.png b/app/src/main/res/drawable-xhdpi/back.png
similarity index 100%
rename from app/src/main/res/drawable/back.png
rename to app/src/main/res/drawable-xhdpi/back.png
Binary files differ
diff --git a/app/src/main/res/drawable/back_c.png b/app/src/main/res/drawable-xhdpi/back_c.png
similarity index 100%
rename from app/src/main/res/drawable/back_c.png
rename to app/src/main/res/drawable-xhdpi/back_c.png
Binary files differ
diff --git a/app/src/main/res/drawable/clear.png b/app/src/main/res/drawable-xhdpi/clear.png
similarity index 100%
rename from app/src/main/res/drawable/clear.png
rename to app/src/main/res/drawable-xhdpi/clear.png
Binary files differ
diff --git a/app/src/main/res/drawable/clear_all.png b/app/src/main/res/drawable-xhdpi/clear_all.png
similarity index 100%
rename from app/src/main/res/drawable/clear_all.png
rename to app/src/main/res/drawable-xhdpi/clear_all.png
Binary files differ
diff --git a/app/src/main/res/drawable/close.png b/app/src/main/res/drawable-xhdpi/close.png
similarity index 100%
rename from app/src/main/res/drawable/close.png
rename to app/src/main/res/drawable-xhdpi/close.png
Binary files differ
diff --git a/app/src/main/res/drawable/code_box.png b/app/src/main/res/drawable-xhdpi/code_box.png
similarity index 100%
rename from app/src/main/res/drawable/code_box.png
rename to app/src/main/res/drawable-xhdpi/code_box.png
Binary files differ
diff --git a/app/src/main/res/drawable/dcloud_circle_white_progress.png b/app/src/main/res/drawable-xhdpi/dcloud_circle_white_progress.png
similarity index 100%
rename from app/src/main/res/drawable/dcloud_circle_white_progress.png
rename to app/src/main/res/drawable-xhdpi/dcloud_circle_white_progress.png
Binary files differ
diff --git a/app/src/main/res/drawable/default_user.png b/app/src/main/res/drawable-xhdpi/default_user.png
similarity index 100%
rename from app/src/main/res/drawable/default_user.png
rename to app/src/main/res/drawable-xhdpi/default_user.png
Binary files differ
diff --git a/app/src/main/res/drawable/del_home.png b/app/src/main/res/drawable-xhdpi/del_home.png
similarity index 100%
rename from app/src/main/res/drawable/del_home.png
rename to app/src/main/res/drawable-xhdpi/del_home.png
Binary files differ
diff --git a/app/src/main/res/drawable/descending_order.png b/app/src/main/res/drawable-xhdpi/descending_order.png
similarity index 100%
rename from app/src/main/res/drawable/descending_order.png
rename to app/src/main/res/drawable-xhdpi/descending_order.png
Binary files differ
diff --git a/app/src/main/res/drawable/desktop_logo.png b/app/src/main/res/drawable-xhdpi/desktop_logo.png
similarity index 100%
rename from app/src/main/res/drawable/desktop_logo.png
rename to app/src/main/res/drawable-xhdpi/desktop_logo.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/device_debug.png b/app/src/main/res/drawable-xhdpi/device_debug.png
new file mode 100644
index 0000000..93c160f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/device_debug.png
Binary files differ
diff --git a/app/src/main/res/drawable/device_image.png b/app/src/main/res/drawable-xhdpi/device_image.png
similarity index 100%
rename from app/src/main/res/drawable/device_image.png
rename to app/src/main/res/drawable-xhdpi/device_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/disc.png b/app/src/main/res/drawable-xhdpi/disc.png
similarity index 100%
rename from app/src/main/res/drawable/disc.png
rename to app/src/main/res/drawable-xhdpi/disc.png
Binary files differ
diff --git a/app/src/main/res/drawable/down.png b/app/src/main/res/drawable-xhdpi/down.png
similarity index 100%
rename from app/src/main/res/drawable/down.png
rename to app/src/main/res/drawable-xhdpi/down.png
Binary files differ
diff --git a/app/src/main/res/drawable/edit.png b/app/src/main/res/drawable-xhdpi/edit.png
similarity index 100%
rename from app/src/main/res/drawable/edit.png
rename to app/src/main/res/drawable-xhdpi/edit.png
Binary files differ
diff --git a/app/src/main/res/drawable/editor_house.png b/app/src/main/res/drawable-xhdpi/editor_house.png
similarity index 100%
rename from app/src/main/res/drawable/editor_house.png
rename to app/src/main/res/drawable-xhdpi/editor_house.png
Binary files differ
diff --git a/app/src/main/res/drawable/fast_scan_light_close.png b/app/src/main/res/drawable-xhdpi/fast_scan_light_close.png
similarity index 100%
rename from app/src/main/res/drawable/fast_scan_light_close.png
rename to app/src/main/res/drawable-xhdpi/fast_scan_light_close.png
Binary files differ
diff --git a/app/src/main/res/drawable/fast_scan_light_open.png b/app/src/main/res/drawable-xhdpi/fast_scan_light_open.png
similarity index 100%
rename from app/src/main/res/drawable/fast_scan_light_open.png
rename to app/src/main/res/drawable-xhdpi/fast_scan_light_open.png
Binary files differ
diff --git a/app/src/main/res/drawable/hide.png b/app/src/main/res/drawable-xhdpi/hide.png
similarity index 100%
rename from app/src/main/res/drawable/hide.png
rename to app/src/main/res/drawable-xhdpi/hide.png
Binary files differ
diff --git a/app/src/main/res/drawable/history_del.png b/app/src/main/res/drawable-xhdpi/history_del.png
similarity index 100%
rename from app/src/main/res/drawable/history_del.png
rename to app/src/main/res/drawable-xhdpi/history_del.png
Binary files differ
diff --git a/app/src/main/res/drawable/home_page_selected.png b/app/src/main/res/drawable-xhdpi/home_page_selected.png
similarity index 100%
rename from app/src/main/res/drawable/home_page_selected.png
rename to app/src/main/res/drawable-xhdpi/home_page_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/home_page_unselected.png b/app/src/main/res/drawable-xhdpi/home_page_unselected.png
similarity index 100%
rename from app/src/main/res/drawable/home_page_unselected.png
rename to app/src/main/res/drawable-xhdpi/home_page_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/info_1.png b/app/src/main/res/drawable-xhdpi/info_1.png
similarity index 100%
rename from app/src/main/res/drawable/info_1.png
rename to app/src/main/res/drawable-xhdpi/info_1.png
Binary files differ
diff --git a/app/src/main/res/drawable/l.png b/app/src/main/res/drawable-xhdpi/l.png
similarity index 100%
rename from app/src/main/res/drawable/l.png
rename to app/src/main/res/drawable-xhdpi/l.png
Binary files differ
diff --git a/app/src/main/res/drawable/language_bj.png b/app/src/main/res/drawable-xhdpi/language_bj.png
similarity index 100%
rename from app/src/main/res/drawable/language_bj.png
rename to app/src/main/res/drawable-xhdpi/language_bj.png
Binary files differ
diff --git a/app/src/main/res/drawable/language_pull_down.png b/app/src/main/res/drawable-xhdpi/language_pull_down.png
similarity index 100%
rename from app/src/main/res/drawable/language_pull_down.png
rename to app/src/main/res/drawable-xhdpi/language_pull_down.png
Binary files differ
diff --git a/app/src/main/res/drawable/last_step.png b/app/src/main/res/drawable-xhdpi/last_step.png
similarity index 100%
rename from app/src/main/res/drawable/last_step.png
rename to app/src/main/res/drawable-xhdpi/last_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/loading_44.png b/app/src/main/res/drawable-xhdpi/loading_44.png
similarity index 100%
rename from app/src/main/res/drawable/loading_44.png
rename to app/src/main/res/drawable-xhdpi/loading_44.png
Binary files differ
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable-xhdpi/logo.png
similarity index 100%
rename from app/src/main/res/drawable/logo.png
rename to app/src/main/res/drawable-xhdpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable/me_selected.png b/app/src/main/res/drawable-xhdpi/me_selected.png
similarity index 100%
rename from app/src/main/res/drawable/me_selected.png
rename to app/src/main/res/drawable-xhdpi/me_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/me_unselected.png b/app/src/main/res/drawable-xhdpi/me_unselected.png
similarity index 100%
rename from app/src/main/res/drawable/me_unselected.png
rename to app/src/main/res/drawable-xhdpi/me_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/message.png b/app/src/main/res/drawable-xhdpi/message.png
similarity index 100%
rename from app/src/main/res/drawable/message.png
rename to app/src/main/res/drawable-xhdpi/message.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_center.png b/app/src/main/res/drawable-xhdpi/message_center.png
similarity index 100%
rename from app/src/main/res/drawable/message_center.png
rename to app/src/main/res/drawable-xhdpi/message_center.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_selected.png b/app/src/main/res/drawable-xhdpi/message_selected.png
similarity index 100%
rename from app/src/main/res/drawable/message_selected.png
rename to app/src/main/res/drawable-xhdpi/message_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_unselected.png b/app/src/main/res/drawable-xhdpi/message_unselected.png
similarity index 100%
rename from app/src/main/res/drawable/message_unselected.png
rename to app/src/main/res/drawable-xhdpi/message_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/more.png b/app/src/main/res/drawable-xhdpi/more.png
similarity index 100%
rename from app/src/main/res/drawable/more.png
rename to app/src/main/res/drawable-xhdpi/more.png
Binary files differ
diff --git a/app/src/main/res/drawable/move_c_house.png b/app/src/main/res/drawable-xhdpi/move_c_house.png
similarity index 100%
rename from app/src/main/res/drawable/move_c_house.png
rename to app/src/main/res/drawable-xhdpi/move_c_house.png
Binary files differ
diff --git a/app/src/main/res/drawable/move_house.png b/app/src/main/res/drawable-xhdpi/move_house.png
similarity index 100%
rename from app/src/main/res/drawable/move_house.png
rename to app/src/main/res/drawable-xhdpi/move_house.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/next.png b/app/src/main/res/drawable-xhdpi/next.png
new file mode 100644
index 0000000..128ee6e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/next.png
Binary files differ
diff --git a/app/src/main/res/drawable/next_step.png b/app/src/main/res/drawable-xhdpi/next_step.png
similarity index 100%
rename from app/src/main/res/drawable/next_step.png
rename to app/src/main/res/drawable-xhdpi/next_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/null_data_icon.gif b/app/src/main/res/drawable-xhdpi/null_data_icon.gif
similarity index 100%
rename from app/src/main/res/drawable/null_data_icon.gif
rename to app/src/main/res/drawable-xhdpi/null_data_icon.gif
Binary files differ
diff --git a/app/src/main/res/drawable/open.png b/app/src/main/res/drawable-xhdpi/open.png
similarity index 100%
rename from app/src/main/res/drawable/open.png
rename to app/src/main/res/drawable-xhdpi/open.png
Binary files differ
diff --git a/app/src/main/res/drawable/page_station_generating_bj.png b/app/src/main/res/drawable-xhdpi/page_station_generating_bj.png
similarity index 100%
rename from app/src/main/res/drawable/page_station_generating_bj.png
rename to app/src/main/res/drawable-xhdpi/page_station_generating_bj.png
Binary files differ
diff --git a/app/src/main/res/drawable/plant_default_picture.png b/app/src/main/res/drawable-xhdpi/plant_default_picture.png
similarity index 100%
rename from app/src/main/res/drawable/plant_default_picture.png
rename to app/src/main/res/drawable-xhdpi/plant_default_picture.png
Binary files differ
diff --git a/app/src/main/res/drawable/power_station_selected.png b/app/src/main/res/drawable-xhdpi/power_station_selected.png
similarity index 100%
rename from app/src/main/res/drawable/power_station_selected.png
rename to app/src/main/res/drawable-xhdpi/power_station_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/power_station_unselected.png b/app/src/main/res/drawable-xhdpi/power_station_unselected.png
similarity index 100%
rename from app/src/main/res/drawable/power_station_unselected.png
rename to app/src/main/res/drawable-xhdpi/power_station_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/qr_code.png b/app/src/main/res/drawable-xhdpi/qr_code.png
similarity index 100%
rename from app/src/main/res/drawable/qr_code.png
rename to app/src/main/res/drawable-xhdpi/qr_code.png
Binary files differ
diff --git a/app/src/main/res/drawable/region.png b/app/src/main/res/drawable-xhdpi/region.png
similarity index 100%
rename from app/src/main/res/drawable/region.png
rename to app/src/main/res/drawable-xhdpi/region.png
Binary files differ
diff --git a/app/src/main/res/drawable/reset.png b/app/src/main/res/drawable-xhdpi/reset.png
similarity index 100%
rename from app/src/main/res/drawable/reset.png
rename to app/src/main/res/drawable-xhdpi/reset.png
Binary files differ
diff --git a/app/src/main/res/drawable/save_image.png b/app/src/main/res/drawable-xhdpi/save_image.png
similarity index 100%
rename from app/src/main/res/drawable/save_image.png
rename to app/src/main/res/drawable-xhdpi/save_image.png
Binary files differ
diff --git a/app/src/main/res/drawable/search_back.png b/app/src/main/res/drawable-xhdpi/search_back.png
similarity index 100%
rename from app/src/main/res/drawable/search_back.png
rename to app/src/main/res/drawable-xhdpi/search_back.png
Binary files differ
diff --git a/app/src/main/res/drawable/select.png b/app/src/main/res/drawable-xhdpi/select.png
similarity index 100%
rename from app/src/main/res/drawable/select.png
rename to app/src/main/res/drawable-xhdpi/select.png
Binary files differ
diff --git a/app/src/main/res/drawable/select_state.png b/app/src/main/res/drawable-xhdpi/select_state.png
similarity index 100%
rename from app/src/main/res/drawable/select_state.png
rename to app/src/main/res/drawable-xhdpi/select_state.png
Binary files differ
diff --git a/app/src/main/res/drawable/selected.png b/app/src/main/res/drawable-xhdpi/selected.png
similarity index 100%
rename from app/src/main/res/drawable/selected.png
rename to app/src/main/res/drawable-xhdpi/selected.png
Binary files differ
diff --git a/app/src/main/res/drawable/selectedme.png b/app/src/main/res/drawable-xhdpi/selectedme.png
similarity index 100%
rename from app/src/main/res/drawable/selectedme.png
rename to app/src/main/res/drawable-xhdpi/selectedme.png
Binary files differ
diff --git a/app/src/main/res/drawable/selectedpowerstation.png b/app/src/main/res/drawable-xhdpi/selectedpowerstation.png
similarity index 100%
rename from app/src/main/res/drawable/selectedpowerstation.png
rename to app/src/main/res/drawable-xhdpi/selectedpowerstation.png
Binary files differ
diff --git a/app/src/main/res/drawable/set.png b/app/src/main/res/drawable-xhdpi/set.png
similarity index 100%
rename from app/src/main/res/drawable/set.png
rename to app/src/main/res/drawable-xhdpi/set.png
Binary files differ
diff --git a/app/src/main/res/drawable/show.png b/app/src/main/res/drawable-xhdpi/show.png
similarity index 100%
rename from app/src/main/res/drawable/show.png
rename to app/src/main/res/drawable-xhdpi/show.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_1.png b/app/src/main/res/drawable-xhdpi/social_contribution_1.png
similarity index 100%
rename from app/src/main/res/drawable/social_contribution_1.png
rename to app/src/main/res/drawable-xhdpi/social_contribution_1.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_2.png b/app/src/main/res/drawable-xhdpi/social_contribution_2.png
similarity index 100%
rename from app/src/main/res/drawable/social_contribution_2.png
rename to app/src/main/res/drawable-xhdpi/social_contribution_2.png
Binary files differ
diff --git a/app/src/main/res/drawable/social_contribution_3.png b/app/src/main/res/drawable-xhdpi/social_contribution_3.png
similarity index 100%
rename from app/src/main/res/drawable/social_contribution_3.png
rename to app/src/main/res/drawable-xhdpi/social_contribution_3.png
Binary files differ
diff --git a/app/src/main/res/drawable/spinner.png b/app/src/main/res/drawable-xhdpi/spinner.png
similarity index 100%
rename from app/src/main/res/drawable/spinner.png
rename to app/src/main/res/drawable-xhdpi/spinner.png
Binary files differ
diff --git a/app/src/main/res/drawable/start_icon.png b/app/src/main/res/drawable-xhdpi/start_icon.png
similarity index 100%
rename from app/src/main/res/drawable/start_icon.png
rename to app/src/main/res/drawable-xhdpi/start_icon.png
Binary files differ
diff --git a/app/src/main/res/drawable/succeed.png b/app/src/main/res/drawable-xhdpi/succeed.png
similarity index 100%
rename from app/src/main/res/drawable/succeed.png
rename to app/src/main/res/drawable-xhdpi/succeed.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip.png b/app/src/main/res/drawable-xhdpi/tip.png
similarity index 100%
rename from app/src/main/res/drawable/tip.png
rename to app/src/main/res/drawable-xhdpi/tip.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip_fail.png b/app/src/main/res/drawable-xhdpi/tip_fail.png
similarity index 100%
rename from app/src/main/res/drawable/tip_fail.png
rename to app/src/main/res/drawable-xhdpi/tip_fail.png
Binary files differ
diff --git a/app/src/main/res/drawable/tip_succeed.png b/app/src/main/res/drawable-xhdpi/tip_succeed.png
similarity index 100%
rename from app/src/main/res/drawable/tip_succeed.png
rename to app/src/main/res/drawable-xhdpi/tip_succeed.png
Binary files differ
diff --git a/app/src/main/res/drawable/unselected.png b/app/src/main/res/drawable-xhdpi/unselected.png
similarity index 100%
rename from app/src/main/res/drawable/unselected.png
rename to app/src/main/res/drawable-xhdpi/unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/unselectedme.png b/app/src/main/res/drawable-xhdpi/unselectedme.png
similarity index 100%
rename from app/src/main/res/drawable/unselectedme.png
rename to app/src/main/res/drawable-xhdpi/unselectedme.png
Binary files differ
diff --git a/app/src/main/res/drawable/unselectedpowerstation.png b/app/src/main/res/drawable-xhdpi/unselectedpowerstation.png
similarity index 100%
rename from app/src/main/res/drawable/unselectedpowerstation.png
rename to app/src/main/res/drawable-xhdpi/unselectedpowerstation.png
Binary files differ
diff --git a/app/src/main/res/drawable/up.png b/app/src/main/res/drawable-xhdpi/up.png
similarity index 100%
rename from app/src/main/res/drawable/up.png
rename to app/src/main/res/drawable-xhdpi/up.png
Binary files differ
diff --git a/app/src/main/res/drawable/user_management.png b/app/src/main/res/drawable-xhdpi/user_management.png
similarity index 100%
rename from app/src/main/res/drawable/user_management.png
rename to app/src/main/res/drawable-xhdpi/user_management.png
Binary files differ
diff --git a/app/src/main/res/drawable/device_debug.png b/app/src/main/res/drawable/device_debug.png
deleted file mode 100644
index 8668c84..0000000
--- a/app/src/main/res/drawable/device_debug.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/loading_gif.gif b/app/src/main/res/drawable/loading.gif
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/loading_gif.gif
rename to app/src/main/res/drawable/loading.gif
Binary files differ
diff --git a/app/src/main/res/drawable/loading_gif.png b/app/src/main/res/drawable/loading_gif.png
deleted file mode 100644
index 1c79833..0000000
--- a/app/src/main/res/drawable/loading_gif.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable/next.png b/app/src/main/res/drawable/next.png
deleted file mode 100644
index 4559ca1..0000000
--- a/app/src/main/res/drawable/next.png
+++ /dev/null
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 29ece2d..646bbfb 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -51,7 +51,7 @@
android:id="@+id/sl"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="@dimen/dp_26">
+ android:layout_marginTop="@dimen/dp_5">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
--
Gitblit v1.8.0