From 6e7ec3f7ffcab2fbfdf32778970cd72a6845e987 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 26 四月 2024 10:12:11 +0800
Subject: [PATCH] 2024年04月26日10:12:04
---
app/src/main/res/drawable/social_contribution_3.png | 0
app/src/main/res/values/styles.xml | 1
app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java | 2
app/src/main/res/drawable/message_select.png | 0
app/src/main/res/drawable/social_contribution_2.png | 0
app/src/main/res/layout/activity_my_power_station.xml | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 91 +++---
app/src/main/res/values/colors.xml | 1
app/src/main/res/drawable/bj.png | 0
app/src/main/res/drawable/message_unselected.png | 0
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 87 +++++-
app/src/main/res/drawable/point_38c494.xml | 6
app/src/main/res/layout/fragment_home_page.xml | 517 ++++++++++++++++++++++++++++++++-------
app/src/main/java/com/hdl/photovoltaic/ui/home/BasicChartComposer.java | 7
app/src/main/res/drawable/social_contribution_1.png | 0
app/src/main/res/drawable/bj_13_ffffff.xml | 31 +
app/src/main/res/drawable/line_c1c1c1.xml | 7
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 3
app/src/main/res/drawable/next_step.png | 0
app/src/main/res/drawable/last_step.png | 0
app/build.gradle | 2
21 files changed, 584 insertions(+), 173 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index b3cb011..3422468 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -184,8 +184,6 @@
-
-
//鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆
// 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓
// 鎺ュ叆鍗庝负鍘傚晢
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 bbef2cc..f94c1b4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -371,49 +371,6 @@
break;
}
- } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
- //鍏跺畠妯″潡
- switch (type) {
- //鑾峰彇娓╁害鍗曚綅
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
- uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
- }
- break;
- //鑾峰彇褰撳墠app璇█
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
- uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
- }
- break;
- //鑾峰彇浣嶇疆淇℃伅
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
- this.uniGetLocationInfo(mode_type, data, callback);
- }
- break;
- //搴旂敤鍐茬獊
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
- if (callback != null) {
- uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
- }
- }
- break;
- //涓撻棬鏀堕泦uni鏃ュ織
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
- String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
- HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
-
- }
- break;
- //uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
- case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
- //EventBus浜嬩欢鍒嗗彂
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
- baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
- EventBus.getDefault().post(baseEventBus);
-
- }
- break;
- }
} else if (HDLUniMP.UNI_EVENT_REPLY_MINE_MODEL.equals(topic)) {
//鎴戠殑妯″潡
switch (type) {
@@ -460,6 +417,54 @@
}
+ } else if (HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL.equals(topic)) {
+ //鍏跺畠妯″潡
+ switch (type) {
+ //鑾峰彇娓╁害鍗曚綅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNIT: {
+ uniCallbackData(mode_type, UserConfigManage.getInstance().getTemperature_unit(), callback);
+ }
+ break;
+ //鑾峰彇褰撳墠app璇█
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_APP_LANGUAGE: {
+ uniCallbackData(mode_type, UserConfigManage.getInstance().getCurrentAppLanguage(), callback);
+ }
+ break;
+ //鑾峰彇浣嶇疆淇℃伅
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCATION_INFO: {
+ this.uniGetLocationInfo(mode_type, data, callback);
+ }
+ break;
+ //搴旂敤鍐茬獊
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT: {
+ if (callback != null) {
+ uniCallbackData(type, HDLUdpConnect.getInstance().isBindSuccess(), callback);
+ }
+ }
+ break;
+ //涓撻棬鏀堕泦uni鏃ュ織
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_UNI_LOG: {
+ String customizeContentFormat = getKeyValue("customizeContentFormat", getKeyValue("data", data));
+ HdlLogLogic.print("uni--->log--->" + customizeContentFormat, true);
+
+ }
+ break;
+ //uni涓婚〉鐐瑰嚮杩斿洖閫氱煡
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK: {
+ //EventBus浜嬩欢鍒嗗彂
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setTopic(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL);
+ baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK);
+ EventBus.getDefault().post(baseEventBus);
+
+ }
+ break;
+ //uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
+ HDLLinkPMUser.getInstance().logout(0);
+ }
+ break;
+ }
}
} catch (Exception e) {
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 2e3cb7c..4b08efb 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -83,7 +83,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.blue);
+// setNotificationBarBackgroundColor(CustomColor.blue);
+ setStatusBarTranslucent();
//鍒濆鍖�
this.initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/BasicChartComposer.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/BasicChartComposer.java
index dfd7cfc..8e0a8e1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/BasicChartComposer.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/BasicChartComposer.java
@@ -18,7 +18,7 @@
public class BasicChartComposer {
public static AAChartModel configureBasicOptions() {
return new AAChartModel()
- .backgroundColor("#ffffff")
+ .backgroundColor("#EDEFF2")
// .backgroundColor("#4b2b7f")
.dataLabelsEnabled(false)
.yAxisGridLineWidth(1)
@@ -34,7 +34,7 @@
AASeriesElement element1 = new AASeriesElement()
.name("Tokyo")
// .colorByPoint(true)
- .color(AARgba(56,196,148,1.0f))//鐚╃孩鑹�, alpha 閫忔槑搴� 1
+ .color(AARgba(56, 196, 148, 1.0f))//鐚╃孩鑹�, alpha 閫忔槑搴� 1
.lineWidth(1.5)
// .borderColor(AARgba(255,255,255,1.0f))
.fillColor(linearGradientColor)
@@ -113,8 +113,7 @@
// .markerSymbol(AAChartSymbolType.Circle)
.tooltipValueSuffix("Kw.h")
// .colorsTheme(colorsArr)
- .legendEnabled(false)
- ;
+ .legendEnabled(false);
if (chartType.equals(AAChartType.Areaspline)) {
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 691f49c..283afbf 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
@@ -51,13 +51,21 @@
import static com.hdl.photovoltaic.ui.home.CustomStyleChartComposer.upsideDownPyramidChart;
import android.content.Intent;
+import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Toast;
+import com.bigkoo.pickerview.builder.TimePickerBuilder;
+import com.bigkoo.pickerview.listener.OnTimeSelectListener;
+import com.bigkoo.pickerview.view.TimePickerView;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartModel;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView;
import com.github.AAChartModel.AAChartCore.AAChartCreator.AAMoveOverEventMessageModel;
import com.github.AAChartModel.AAChartCore.AAChartEnum.AAChartType;
+import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.databinding.FragmentHomePageBinding;
@@ -68,6 +76,11 @@
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import io.dcloud.common.util.DensityUtils;
/**
* 棣栭〉妯″潡
@@ -83,9 +96,6 @@
AAChartView aaChartView2;
AAChartModel aaChartModel2;
- AAChartView aaChartView3;
-
- AAChartModel aaChartModel3;
@Override
@@ -96,42 +106,85 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- viewBinding.test1.setOnClickListener(new View.OnClickListener() {
+ viewBinding.homePageStationDataTitleTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
setUpAAChartView(1);
}
});
- viewBinding.test2.setOnClickListener(new View.OnClickListener() {
+ viewBinding.yearMonthDayTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- setUpAAChartView(2);
+ timeSelectedView();
+
}
});
- viewBinding.test3.setOnClickListener(new View.OnClickListener() {
+ timeSelectedView();
+// viewBinding.test2.setOnClickListener(new View.OnClickListener() {
+// @Override
+// public void onClick(View v) {
+// setUpAAChartView(2);
+// }
+// });
+
+ }
+
+ private void timeSelectedView(){
+ //鏃堕棿閫夋嫨鍣�
+ Calendar selectedDate = Calendar.getInstance();
+ Calendar startDate = Calendar.getInstance();
+ //startDate.set(2013,1,1);
+ Calendar endDate = Calendar.getInstance();
+ //endDate.set(2020,1,1);
+
+ //姝ｇ‘璁剧疆鏂瑰紡
+ startDate.set(2024, 1, 1);
+ endDate.set(2025, 4, 25);
+
+ TimePickerView pvTime = new TimePickerBuilder(_mActivity, new OnTimeSelectListener() {
@Override
- public void onClick(View v) {
- setUpAAChartView(3);
+ public void onTimeSelect(Date date, View v) {//閫変腑浜嬩欢鍥炶皟
+// tvTime.setText(getTime(date));
}
- });
+ })
+ .setType(new boolean[]{true, false, false, false, false, false})// 榛樿鍏ㄩ儴鏄剧ず
+ .setCancelText("鍙栨秷")//鍙栨秷鎸夐挳鏂囧瓧
+ .setSubmitText("纭畾")//纭鎸夐挳鏂囧瓧
+ .setContentTextSize(18)//婊氳疆鏂囧瓧澶у皬
+ .setTitleSize(18)//鏍囬鏂囧瓧澶у皬
+ .setTitleText("鏃堕棿閫夋嫨")//鏍囬鏂囧瓧
+ .setOutSideCancelable(true)//鐐瑰嚮灞忓箷锛岀偣鍦ㄦ帶浠跺閮ㄨ寖鍥存椂锛屾槸鍚﹀彇娑堟樉绀�
+ .isCyclic(false)//鏄惁寰幆婊氬姩
+ .setTitleColor(_mActivity.getColor(R.color.text_90000000))//鏍囬鏂囧瓧棰滆壊
+ .setSubmitColor(_mActivity.getColor(R.color.text_38C494))//纭畾鎸夐挳鏂囧瓧棰滆壊
+ .setCancelColor(_mActivity.getColor(R.color.text_40000000))//鍙栨秷鎸夐挳鏂囧瓧棰滆壊
+ .setTitleBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//鏍囬鑳屾櫙棰滆壊 Night mode
+ .setBgColor(_mActivity.getColor(R.color.text_FFFFFFFF))//婊氳疆鑳屾櫙棰滆壊 Night mode
+ .setTextColorCenter(_mActivity.getColor(R.color.text_90000000))
+ .setDate(selectedDate)// 濡傛灉涓嶈缃殑璇濓紝榛樿鏄郴缁熸椂闂�*/
+ .setRangDate(startDate, endDate)//璧峰缁堟骞存湀鏃ヨ瀹�
+ .setLabel("骞�", "鏈�", "鏃�", "鏃�", "鍒�", "绉�")//榛樿璁剧疆涓哄勾鏈堟棩鏃跺垎绉�
+ .isCenterLabel(false) //鏄惁鍙樉绀轰腑闂撮�変腑椤圭殑label鏂囧瓧锛宖alse鍒欐瘡椤筰tem鍏ㄩ儴閮藉甫鏈塴abel銆�
+ .isDialog(false)//鏄惁鏄剧ず涓哄璇濇鏍峰紡
+ .setItemVisibleCount(17)//瀵硅瘽妗嗛珮搴�
+ .setDividerColor(_mActivity.getColor(R.color.text_E1E1E1))
+ .setDecorView(viewBinding.wwwwww)
+// .setLineSpacingMultiplier(3f)//
+ .build();
+ pvTime.show();
}
private void setUpAAChartView(int value) {
if (value == 1) {
- aaChartView1 = viewBinding.AAChartView1;
+ aaChartView1 = viewBinding.AAChartView;
aaChartView1.callBack = this;
aaChartModel1 = configureAAChartModel();
aaChartView1.aa_drawChartWithChartModel(aaChartModel1);
} else if (value == 2) {
- aaChartView2 = viewBinding.AAChartView2;
+// aaChartView2 = viewBinding.AAChartView2;
aaChartView2.callBack = this;
aaChartModel2 = configureColorfulColumnChart();// configureTheAAChartModel("colorfulColumnChart");
aaChartView2.aa_drawChartWithChartModel(aaChartModel2);
- } else if (value == 3) {
- aaChartView3 = viewBinding.AAChartView3;
- aaChartView3.callBack = this;
- aaChartModel3 = configureAAChartModel();
- aaChartView3.aa_drawChartWithChartModel(aaChartModel3);
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
index af95a5a..fe46256 100644
--- a/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
+++ b/app/src/main/java/com/hdl/photovoltaic/uni/HDLUniMP.java
@@ -79,7 +79,7 @@
public final static String UNI_EVENT_REPLY_OTHER_UNI_LOG = "uni_log";//鏀堕泦uni鏃ュ織
public final static String UNI_EVENT_REPLY_OTHER_BACK = "back";//棣栭〉杩斿洖
public final static String UNI_EVENT_REPLY_OTHER_APPLICATION_CONFLICT = "application_conflict";//搴旂敤鍐茬獊
-
+ public final static String UNI_EVENT_REPLY_OTHER_LOGOUT = "uni_logout";//閫�鍑虹櫥褰�
/*********C绔�愭垜鐨勩�戞ā鍧�*********/
diff --git a/app/src/main/res/drawable/bj.png b/app/src/main/res/drawable/bj.png
new file mode 100644
index 0000000..4b2f787
--- /dev/null
+++ b/app/src/main/res/drawable/bj.png
Binary files differ
diff --git a/app/src/main/res/drawable/bj_13_ffffff.xml b/app/src/main/res/drawable/bj_13_ffffff.xml
index 6fb80d7..f71ebe0 100644
--- a/app/src/main/res/drawable/bj_13_ffffff.xml
+++ b/app/src/main/res/drawable/bj_13_ffffff.xml
@@ -1,8 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
- <corners android:radius="@dimen/dp_13" />
- <gradient
- android:angle="315"
- android:endColor="#00FFECD9"
- android:startColor="#FFE2C6" />
-</shape>
\ No newline at end of file
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item>
+ <shape android:shape="rectangle">
+ <corners android:radius="@dimen/dp_13" />
+ <solid android:color="#CCFFFFFF" />
+ </shape>
+ </item>
+
+ <item >
+ <shape>
+ <corners android:radius="@dimen/dp_13" />
+ <gradient
+ android:angle="315"
+ android:endColor="#00FFECD9"
+ android:startColor="#66FFE2C6" />
+
+ </shape>
+ </item>
+
+
+
+</layer-list>
+
diff --git a/app/src/main/res/drawable/last_step.png b/app/src/main/res/drawable/last_step.png
new file mode 100644
index 0000000..76e89c7
--- /dev/null
+++ b/app/src/main/res/drawable/last_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/line_c1c1c1.xml b/app/src/main/res/drawable/line_c1c1c1.xml
new file mode 100644
index 0000000..fab5ec0
--- /dev/null
+++ b/app/src/main/res/drawable/line_c1c1c1.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <stroke
+ android:width="1dp"
+ android:color="@color/text_C1C1C1" />
+ <corners android:radius="@dimen/dp_6" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/message_select.png b/app/src/main/res/drawable/message_select.png
index a3d6cd4..ace4cee 100644
--- a/app/src/main/res/drawable/message_select.png
+++ b/app/src/main/res/drawable/message_select.png
Binary files differ
diff --git a/app/src/main/res/drawable/message_unselected.png b/app/src/main/res/drawable/message_unselected.png
index 2832896..773462a 100644
--- a/app/src/main/res/drawable/message_unselected.png
+++ b/app/src/main/res/drawable/message_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable/next_step.png b/app/src/main/res/drawable/next_step.png
new file mode 100644
index 0000000..62d6974
--- /dev/null
+++ b/app/src/main/res/drawable/next_step.png
Binary files differ
diff --git a/app/src/main/res/drawable/point_38c494.xml b/app/src/main/res/drawable/point_38c494.xml
new file mode 100644
index 0000000..bd87081
--- /dev/null
+++ b/app/src/main/res/drawable/point_38c494.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="5.5dp" />
+ <solid android:color="@color/text_38C494" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/social_contribution_1.png b/app/src/main/res/drawable/social_contribution_1.png
new file mode 100644
index 0000000..223f452
--- /dev/null
+++ b/app/src/main/res/drawable/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/social_contribution_2.png
new file mode 100644
index 0000000..91c0264
--- /dev/null
+++ b/app/src/main/res/drawable/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/social_contribution_3.png
new file mode 100644
index 0000000..31351a5
--- /dev/null
+++ b/app/src/main/res/drawable/social_contribution_3.png
Binary files differ
diff --git a/app/src/main/res/layout/activity_my_power_station.xml b/app/src/main/res/layout/activity_my_power_station.xml
index 8ff1ef7..c4ff53b 100644
--- a/app/src/main/res/layout/activity_my_power_station.xml
+++ b/app/src/main/res/layout/activity_my_power_station.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/text_F9FAFB"
+ android:background="@drawable/bj"
tools:context="com.hdl.photovoltaic.ui.MyPowerStationActivity">
<!--棣栭〉-Fragment-->
diff --git a/app/src/main/res/layout/fragment_home_page.xml b/app/src/main/res/layout/fragment_home_page.xml
index 0eddf0e..03310b3 100644
--- a/app/src/main/res/layout/fragment_home_page.xml
+++ b/app/src/main/res/layout/fragment_home_page.xml
@@ -12,77 +12,76 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_9"
+ android:layout_marginTop="58dp"
android:text="@string/power_shome_page"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/home_page_station_add_iv"
- android:layout_width="@dimen/dp_18"
- android:layout_height="@dimen/dp_18"
- android:layout_marginTop="@dimen/dp_9"
+ android:layout_width="@dimen/dp_31"
+ android:layout_height="@dimen/dp_31"
+ android:layout_marginTop="53dp"
android:layout_marginEnd="@dimen/dp_24"
android:src="@drawable/add"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- <LinearLayout
- android:id="@+id/home_page_station_ll"
- android:layout_width="0dp"
- android:layout_height="@dimen/dp_56"
- android:layout_marginTop="@dimen/dp_26"
- android:layout_marginEnd="@dimen/dp_16"
- android:orientation="horizontal"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="@+id/home_page_title_tv"
- app:layout_constraintTop_toBottomOf="@+id/home_page_title_tv">
- <!--鍏ㄩ儴-->
- <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:layout_width="0dp"
android:layout_height="0dp"
- android:layout_marginStart="@dimen/dp_16"
- android:layout_marginEnd="@dimen/dp_16"
+ 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_station_ll">
+ 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_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="0dp"
+ 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"
@@ -90,7 +89,7 @@
android:layout_height="312dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
+ app:layout_constraintTop_toBottomOf="@+id/home_page_station_ll">
<RelativeLayout
android:id="@+id/home_page_station_info_rl1"
@@ -109,8 +108,8 @@
<TextView
android:id="@+id/home_page_station_info_rl1_f_text1_tv"
- android:layout_width="62dp"
- android:layout_height="31.5dp"
+ android:layout_width="56dp"
+ android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:gravity="end|center_vertical"
android:text="88"
@@ -248,60 +247,384 @@
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
- <TextView
- android:id="@+id/test1"
- android:layout_width="wrap_content"
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/home_page_station_data_cl"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="鐐瑰嚮娴嬭瘯1"
- android:textSize="@dimen/text_30"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl" />
+ app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_cl">
- <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView
- android:id="@+id/AAChartView1"
- android:layout_width="0dp"
- android:layout_height="300dp"
+ <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="鐐瑰嚮娴嬭瘯"
+ 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="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="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="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="LifeCycle" />
+
+ </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">
+
+ <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_32"
+ 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_32"
+ 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" />
+
+ </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:text="kW"
+ 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/test1" />
+ app:layout_constraintTop_toBottomOf="@+id/home_page_station_data_cl">
- <TextView
- android:id="@+id/test2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鐐瑰嚮娴嬭瘯2"
- android:textSize="@dimen/text_30"
+ <TextView
+ android:id="@+id/social_contribution_title_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="17dp"
+ android:text="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="13dp"
+ 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_14"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/social_contribution_unit_1_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="9dp"
+ 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_14"
+ android:textStyle="bold"
+
+ />
+
+ <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_14" />
+
+
+ </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="13dp"
+ 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_14"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/social_contribution_unit_2_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="9dp"
+ 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_14"
+ android:textStyle="bold"
+
+ />
+
+ <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_14" />
+
+
+ </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="13dp"
+ 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_14"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/social_contribution_unit_3_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="9dp"
+ 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_14"
+ android:textStyle="bold"
+
+ />
+
+ <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_14" />
+
+
+ </RelativeLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <LinearLayout
+ android:id="@+id/wwwwww"
+ android:layout_width="match_parent"
+ android:layout_height="323dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/AAChartView1" />
+ app:layout_constraintTop_toBottomOf="@+id/home_page_station_statistics_cl">
- <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView
- android:id="@+id/AAChartView2"
- android:layout_width="0dp"
- android:layout_height="300dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/test2" />
-
- <TextView
- android:id="@+id/test3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鐐瑰嚮娴嬭瘯3"
- android:textSize="@dimen/text_30"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/AAChartView2" />
-
- <com.github.AAChartModel.AAChartCore.AAChartCreator.AAChartView
- android:id="@+id/AAChartView3"
- android:layout_width="0dp"
- android:layout_height="300dp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/test3" />
-
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dabd399..543e265 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -48,6 +48,7 @@
<color name="text_B2B2B2">#B2B2B2</color>
<color name="text_38C494">#38C494</color>
<color name="text_C2EDDE">#C2EDDE</color>
+ <color name="text_C1C1C1">#C1C1C1</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7fe8ad5..b3160fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
<item name="android:textSize">@dimen/text_20</item>
<item name="android:textStyle">bold</item>
<item name="android:textColor">@color/text_90000000</item>
+ <item name="android:fontFamily"></item>
</style>
<!-- 鑷畾涔夊瓧浣撴牱寮� 鍐呭涓�绾ф爣棰�-->
--
Gitblit v1.8.0