app/build.gradle
@@ -30,7 +30,7 @@ minSdk 23 targetSdk 34 versionCode 4 versionName "1.1.0"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的 versionName "1.2.0"//版本规则1.3是产品功能迭代用的,最后一位0是我们修复bug用的 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" } }
@@ -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;
@@ -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; 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.getBigDecimal(list.get(i).getFieldValue()); values[i] = HdlCommonLogic.convertBigDecimal(statisticsBean.getFieldValue(), 1000);// HdlCommonLogic.getBigDecimal(list.get(i).getFieldValue()).intValue();//获取整数部分 } } else { values[i] = HdlCommonLogic.getBigDecimal(statisticsBean.getFieldValue()); } } fieldNames = keys; 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(); 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(); @@ -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); app/src/main/java/com/hdl/photovoltaic/widget/LoadingDialog.java
@@ -29,6 +29,7 @@ setCancelable(true);//系统后退可以取消 setCanceledOnTouchOutside(false); setContentView(R.layout.loading_alert); try { content = (TextView) findViewById(R.id.load_content_tv); ImageView imageView = (ImageView) findViewById(R.id.load_pb); WindowManager.LayoutParams params = getWindow().getAttributes(); @@ -37,9 +38,11 @@ getWindow().setAttributes(params); Glide.with(context) // .asBitmap() // 强制作为静态图片加载 .load(R.drawable.loading_gif) .load(R.drawable.loading) .into(imageView); // content.setText(R.string.device_加载中); } catch (Exception e) { } } public void setText(String mes) { app/src/main/res/drawable-xhdpi/ascending_sort.pngapp/src/main/res/drawable-xhdpi/asregards.pngapp/src/main/res/drawable-xhdpi/back.pngapp/src/main/res/drawable-xhdpi/back_c.pngapp/src/main/res/drawable-xhdpi/clear.pngapp/src/main/res/drawable-xhdpi/clear_all.pngapp/src/main/res/drawable-xhdpi/close.pngapp/src/main/res/drawable-xhdpi/code_box.pngapp/src/main/res/drawable-xhdpi/dcloud_circle_white_progress.pngapp/src/main/res/drawable-xhdpi/default_user.pngapp/src/main/res/drawable-xhdpi/del_home.pngapp/src/main/res/drawable-xhdpi/descending_order.pngapp/src/main/res/drawable-xhdpi/desktop_logo.pngapp/src/main/res/drawable-xhdpi/device_debug.png
Binary files differ
app/src/main/res/drawable/loading.gifapp/src/main/res/drawable/loading_gif.pngBinary files differ
app/src/main/res/drawable/next.pngBinary files differ
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"
