From 0077e2137a77e6e671e95529165e10b3ed1289bb Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 十二月 2023 16:09:09 +0800
Subject: [PATCH] 2023年12月25日16:08:58
---
app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java | 20 ++++++
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 5 +
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 48 +++++++++-------
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 9 +++
app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java | 24 ++++++-
app/src/main/AndroidManifest.xml | 3 -
app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 14 ++++
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 15 ++++
app/build.gradle | 3
12 files changed, 112 insertions(+), 36 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 10ce0ba..a9aa67a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,7 @@
minSdk 23
targetSdk 30
versionCode 1
- versionName "1.1.2"//鐗堟湰瑙勫垯1.1鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
+ versionName "1.1.3"//鐗堟湰瑙勫垯1.1鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�1鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
@@ -74,6 +74,7 @@
}
debug {
signingConfig signingConfigs.debug
+
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6f0137c..d56dd02 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
tools:ignore="ProtectedPermissions" /> <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
<uses-permission android:name="android.permission.VIBRATE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
- <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> -->
<!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
<!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" /> -->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> -->
@@ -31,7 +30,6 @@
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- bugly鎵�闇�鏉冮檺 start -->
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- <uses-permission android:name="android.permission.INTERNET" /> -->
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- UNI鐩告満鍜屽瓨鍌ㄧ殑鏉冮檺 -->
<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
@@ -44,7 +42,6 @@
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
<uses-permission android:name="android.permission.FLASHLIGHT" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CALL_PHONE" />
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 46cba3f..0c27035 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -390,7 +390,7 @@
/**
- * 鐐瑰嚮杩斿洖閿殑浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
*/
@Override
public void onBackPressed() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index a40e348..ce3effe 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.ui.adapter;
import android.content.Context;
+import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.view.LayoutInflater;
import android.view.View;
@@ -42,12 +43,21 @@
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
HouseIdBean houseIdBean = this.mList.get(position);
- holder.homeNameTv.setText(houseIdBean.getHomeName().replace(" ", ""));
+ holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
//瑁呮満瀹归噺
String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + "kW";
holder.capacityTv.setText(capacity);
+ String kw = "0.0";
+ try {
+ double d = Double.parseDouble(houseIdBean.getPower());
+ int intValue = (int) d;
+ int k = intValue / 1000;
+ int w = intValue % 1000;
+ kw = k + "." + w;
+ } catch (Exception ignored) {
+ }
//鍙戠數鍔熺巼
- String power = mContext.getString(R.string.power_station_generated_power) + houseIdBean.getPower() + "kW";
+ String power = mContext.getString(R.string.power_station_generated_power) + kw + "kW";
holder.powerTv.setText(power);
setTextViewStyle(holder.stateTv, houseIdBean.getPowerStationStatus());
GlideUtils.getRoundedCornersImage(mContext, houseIdBean.getPowerStationImage(), holder.homeIconIv, new RoundedCorners(4));
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 38cd53a..6a1f1af 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -50,7 +50,7 @@
}
public String getPower() {
- return power == null ? "" : power;
+ return power == null ? "0" : power;
}
public void setPower(String power) {
@@ -80,7 +80,6 @@
public void setLocalSecret(String localSecret) {
this.localSecret = localSecret;
}
-
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index e2cd970..925d5ef 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -3,6 +3,7 @@
import android.os.Bundle;
import android.os.CountDownTimer;
+import android.os.Process;
import android.text.TextUtils;
import android.view.View;
@@ -15,6 +16,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.sahooz.library.countrypicker.Country;
import com.sahooz.library.countrypicker.CountryPickerFragment;
import com.sahooz.library.countrypicker.PickCountryCallback;
@@ -78,6 +80,7 @@
UserConfigManage.getInstance().setBingEmail(mailStr);
UserConfigManage.getInstance().Save();
HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.set_bind_mail_succeed), 0);
+ finish();
}
@Override
@@ -167,14 +170,24 @@
}
-
@Override
protected void onDestroy() {
super.onDestroy();
+
if (countDownTimer != null) {
countDownTimer.cancel();
countDownTimer = null;
}
}
+
+
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ setResult(20);
+ super.onBackPressed();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index 362be2a..e500277 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -84,6 +84,7 @@
UserConfigManage.getInstance().setBingPhone(phoneStr);
UserConfigManage.getInstance().Save();
HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.set_bind_phone_succeed), 0);
+ finish();
}
@Override
@@ -203,4 +204,12 @@
}
}
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ setResult(20);
+ super.onBackPressed();
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index bdffd5b..53cfc82 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
@@ -88,6 +88,12 @@
viewBinding.homeAffirmTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ String oldPsw = viewBinding.meChangePasswordOldIc.mePswEt.getText().toString().replaceAll(" ", "");
+ String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString().replaceAll(" ", "");
+ String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString().replaceAll(" ", "");
+ if (!isEditTextPassword(oldPsw, newPsw, affirmPsw)) {
+ return;
+ }
// 浜屾纭鎻愮ず妗�
ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(_mActivity);
dialog.setTitle(getString(R.string.loading_title_tip));
@@ -96,7 +102,7 @@
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
- sendChangePassword();
+ sendChangePassword(oldPsw, newPsw);
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@@ -112,25 +118,12 @@
/**
* 鍙戦�佹洿鏀逛釜浜哄瘑鐮佹寚浠�
+ *
+ * @param oldPsw 鍘熸潵瀵嗙爜
+ * @param newPsw 鏂板瘑鐮�
*/
- private void sendChangePassword() {
- String oldPsw = viewBinding.meChangePasswordOldIc.mePswEt.getText().toString().replaceAll(" +", "");
- String newPsw = viewBinding.meChangePasswordNewIc.mePswEt.getText().toString().replaceAll(" +", "");
- String affirmPsw = viewBinding.meChangePasswordAffirmIc.mePswEt.getText().toString().replaceAll(" +", "");
+ private void sendChangePassword(String oldPsw, String newPsw) {
- if (isEditTextPassword(oldPsw, newPsw) || isEditTextPassword(oldPsw, affirmPsw)) {
- HdlThreadLogic.tipFlashingBox(_mActivity, true, "鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.", -1);
- return;
- }
-
- if (newPsw.length() < 6 || affirmPsw.length() < 6) {
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_least6), -1);
- return;
- }
- if (!isEditTextPassword(newPsw, affirmPsw)) {
- HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1);
- return;
- }
if (UserConfigManage.getInstance().isBAccount()) {
//B绔洿鏀逛釜浜哄瘑鐮�
HdlAccountLogic.getInstance().updatePassword_B(oldPsw, newPsw, new CloudCallBeak<String>() {
@@ -202,13 +195,26 @@
/**
* 鏈湴鏍￠獙瀵嗙爜鏄惁姝ｇ‘
*
+ * @param oldPsw 鍘熸潵瀵嗙爜
* @param newPsw 鏂板瘑鐮�
* @param affirmPsw 鍐嶆纭鏂板瘑鐮�
* @return 涓�鏍疯繑鍥瀟rue锛屽惁鑰協alse
*/
- private boolean isEditTextPassword(String newPsw, String affirmPsw) {
- //鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鏍�
- return newPsw.equals(affirmPsw);
+ private boolean isEditTextPassword(String oldPsw, String newPsw, String affirmPsw) {
+ if (newPsw.length() < 6 || affirmPsw.length() < 6) {
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_least6), -1);
+ return false;
+ }
+ if (!newPsw.equals(affirmPsw)) {
+ //鏂板瘑鐮佸拰纭瀵嗙爜涓嶄竴鏍�
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, getString(R.string.home_login_input_unlike_psw), -1);
+ return false;
+ }
+ if (oldPsw.equals(newPsw)) {
+ HdlThreadLogic.tipFlashingBox(_mActivity, true, "鍘熷瘑鐮佸拰鏂板瘑鐮佷笉鑳戒竴鏍�.", -1);
+ return false;
+ }
+ return true;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index d4092a0..062e54d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -113,6 +113,8 @@
@Override
public void onFailure(HDLException e) {
+ //鎬曞叾瀹冧笉鍒ゆ柇null
+ mC_UserInfo = new CUserInfo();
// hideLoading();
HdlThreadLogic.toast(_mActivity, e);
}
@@ -152,6 +154,9 @@
public void onClick(View v) {
Intent intent = new Intent();
intent.setClass(_mActivity, PersonalDataActivity.class);
+ if (mC_UserInfo == null) {
+ mC_UserInfo = new CUserInfo();
+ }
intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
startActivityForResult(intent, 10);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
index eec815a..58b3a7e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/PersonalDataActivity.java
@@ -69,10 +69,7 @@
viewBinding.toolbarTopFragmentMeRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent();
- intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
- intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
- setResult(10, intent);
+ backPressedData();
finish();
}
});
@@ -248,4 +245,23 @@
}
}
+ /**
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
+ */
+ @Override
+ public void onBackPressed() {
+ backPressedData();
+ super.onBackPressed();
+ }
+
+ /**
+ * 杩斿洖缁欎笂涓�绾х晫闈㈡暟鎹�
+ */
+ private void backPressedData() {
+ Intent intent = new Intent();
+ intent.putExtra("memberHeadIcon", mMemberHeadIconUrl);
+ intent.putExtra("memberName", UserConfigManage.getInstance().getUserName());
+ setResult(10, intent);
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
index 91a31dc..05376c3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/PermissionUtils.java
@@ -95,7 +95,7 @@
*/
public static int getAuthorizeStaus(Activity activity, String authorize) {
int flag = ActivityCompat.checkSelfPermission(activity, authorize);
- Boolean isShould = ActivityCompat.shouldShowRequestPermissionRationale(activity, authorize);
+ boolean isShould = ActivityCompat.shouldShowRequestPermissionRationale(activity, authorize);
if (isShould) {
return STATUS_REFUSE;
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java
new file mode 100644
index 0000000..2729629
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/UnitConversionUtils.java
@@ -0,0 +1,20 @@
+package com.hdl.photovoltaic.utils;
+
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 璁￠噺鍗曚綅鎹㈢畻
+ *
+ * @author XinLau
+ */
+public class UnitConversionUtils {
+
+
+
+}
--
Gitblit v1.8.0