From 05df9bdaf543227c53f8026386339a3d78c5d769 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 三月 2024 14:54:39 +0800
Subject: [PATCH] 2024年03月27日14:54:34
---
app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java | 6 +
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 64 ++++++++++++---
app/src/main/res/layout/activity_cpower_station.xml | 17 ++++
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 10 ++
app/src/main/res/values-zh/strings.xml | 1
app/src/main/res/values/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 85 +++++++++++++--------
app/src/main/res/values-en/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java | 9 ++
10 files changed, 143 insertions(+), 53 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index f4448d2..8ab6aa9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -68,6 +68,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
+ setNotificationBarBackgroundColor(CustomColor.white);
+ setStatusBarTextColor();
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
@@ -76,6 +78,13 @@
this.initMqttClient();
//涓婁紶鏋佸厜娉ㄥ唽ID鍒颁簯绔�
this.pushTokens();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ //鐩殑鏄负鍚姩椤甸伄浣忎笅涓�椤�
+ AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -157,36 +166,9 @@
}
});
}
- } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL)
- && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) {
+ } else if (event.getTopic().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_MODEL) && event.getType().contains(HDLUniMP.UNI_EVENT_REPLY_OTHER_BACK)) {
//鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
- if (AppManagerUtils.getAppManager().getActivitySize() <= 1) {
- if (backPressTimes == 0) {
- HdlThreadLogic.toast(_mActivity, R.string.kill_app);
- backPressTimes = 1;
- new Thread() {
- @Override
- public void run() {
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- } finally {
- backPressTimes = 0;
- }
- }
- }.start();
- return;
- } else {
- //鍏抽棴灏忕▼搴�
- if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
- HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
- }
- AppManagerUtils.getAppManager().finishAllActivity();
- HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
- Process.killProcess(Process.myPid());
- }
- }
+ killProcessApp();
}
}
@@ -209,13 +191,50 @@
}
HouseIdBean houseIdBean = HouseIdList.get(select_home);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
- String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C
- + "?homeId=" + houseIdBean.getHomeId()
- + "&homeName=" + houseIdBean.getHomeName()
- + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
+ String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
}
+
+ }
+
+// /**
+// * 鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
+// */
+// @Override
+// public void onBackPressed() {
+// killProcessApp();
+// super.onBackPressed();
+// }
+
+ private void killProcessApp() {
+ //鐗╃悊鎸夐敭杩斿洖浜嬩欢(鍖呮嫭宸︽粦绉婚櫎浜嬩欢)
+ if (AppManagerUtils.getAppManager().getActivitySize() <= 1) {
+ if (backPressTimes == 0) {
+ HdlThreadLogic.toast(_mActivity, R.string.kill_app);
+ backPressTimes = 1;
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } finally {
+ backPressTimes = 0;
+ }
+ }
+ }.start();
+ return;
+ } else {
+ //鍏抽棴灏忕▼搴�
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ AppManagerUtils.getAppManager().finishAllActivity();
+ Process.killProcess(Process.myPid());
+ }
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
index 2acbcf4..b5a945b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/HomeLoginActivity.java
@@ -31,6 +31,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
@@ -40,6 +41,7 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.TimeUtils;
@@ -112,6 +114,11 @@
viewBinding.homeLoginLanguageTv.setText("绠�浣撲腑鏂�");
} else {
viewBinding.homeLoginLanguageTv.setText("English");
+ }
+ if (UserConfigManage.getInstance().isBAccount()) {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.GONE);
+ } else {
+ viewBinding.homeLoginRegisterTv.setVisibility(View.VISIBLE);
}
String acc = "13375012441";
@@ -250,8 +257,8 @@
} else {
//C绔敤鎴疯烦杞晫闈�
startActivity(CPowerStationActivity.class);
- }
+ }
finish();
}
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 1ee7d7c..051f5e5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -102,6 +102,8 @@
@Override
protected void onResume() {
super.onResume();
+ //鐩殑鏄负鍚姩椤甸伄浣忎笅涓�椤�
+ AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
// Intent intent = new Intent(_mActivity, MyPowerStationActivity.class);
// intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
// intent.putExtra("skip", "skip");//閲岄潰鍒ゆ柇鏈夎繖涓爣璇嗗氨璺宠浆鍒版秷鎭腑蹇冪晫闈�
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 8040f0b..a11ab05 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -12,10 +12,15 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.uni.HDLUniMP;
import java.util.List;
+/**
+ * App鍚姩椤碉紙鐩殑鏄负浜嗚鐢ㄦ埛鐐瑰嚮APP鍥炬爣鐨勬椂鍊欐湁涓�涓灛闂村搷搴旂殑浜や簰浣撻獙銆傦級
+ */
public class StartActivity extends CustomBaseActivity {
@Override
@@ -45,9 +50,10 @@
} else {
//C绔敤鎴疯烦杞晫闈�
intent.setClass(StartActivity.this, CPowerStationActivity.class);
+
}
startActivity(intent);
- finish();
+// finish();
}
@Override
@@ -62,7 +68,7 @@
intent.setClass(StartActivity.this, CPowerStationActivity.class);
}
startActivity(intent);
- finish();
+// finish();
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 170a46c..85b6e08 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -4,6 +4,7 @@
import android.content.Intent;
import android.os.Bundle;
+import android.os.SystemClock;
import android.view.View;
import com.hdl.linkpm.sdk.HDLLinkPMSdk;
@@ -12,6 +13,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding;
+import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
@@ -110,23 +112,55 @@
dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
- UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
- UserConfigManage.getInstance().Save();
- //閰嶇疆鎺ュ彛璇锋眰璇█
- HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
dialog.dismiss();
- if (!UserConfigManage.getInstance().isBAccount()) {
- finish();
- //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull)
- if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
- HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ showLoading(getString(R.string.restarting_please_wait));
+ HdlThreadLogic.runSubThread(new Runnable() {
+ @Override
+ public void run() {
+ if (!UserConfigManage.getInstance().isBAccount()) {
+ //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull)
+ if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+ HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+ }
+ SystemClock.sleep(2000);//杩涚▼娌℃湁閭ｄ箞蹇鏉�姝�
+ HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
+ }
+ HdlThreadLogic.runMainThread(new Runnable() {
+ @Override
+ public void run() {
+ hideLoading();
+ UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
+ UserConfigManage.getInstance().Save();
+ //閰嶇疆鎺ュ彛璇锋眰璇█
+ HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+
+ AppManagerUtils.getAppManager().finishAllActivity();
+ Intent intent = new Intent();
+ intent.setClass(HDLApp.getInstance(), StartActivity.class);
+ startActivity(intent);
+ }
+ });
+
}
- HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
- }
- AppManagerUtils.getAppManager().finishAllActivity();
- Intent intent = new Intent();
- intent.setClass(HDLApp.getInstance(), StartActivity.class);
- startActivity(intent);
+ });
+// UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
+// UserConfigManage.getInstance().Save();
+// //閰嶇疆鎺ュ彛璇锋眰璇█
+// HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
+// dialog.dismiss();
+// if (!UserConfigManage.getInstance().isBAccount()) {
+// //鍥犱负C绔富鐣岄潰鏄痷ni鍐欑殑锛岃繖閲岃瑷�鍒囨崲蹇呴』鎶ni鍏虫帀鍐嶉噸鏂板惎鍔�,鍚﹀垯浼氭敹涓嶅埌uni鍙戣繃鏉ョ殑鏁版嵁(鎺ュ彛涓簄ull)
+// if (null != HDLUniMPSDKManager.getInstance().getUniMP()) {
+// HDLUniMPSDKManager.getInstance().getUniMP().closeUniMP();
+// }
+// SystemClock.sleep(2000);
+// HDLUniMPSDKManager.getInstance().initDCUniMPSDK(HDLApp.getInstance());
+// }
+// AppManagerUtils.getAppManager().finishAllActivity();
+// Intent intent = new Intent();
+// intent.setClass(HDLApp.getInstance(), StartActivity.class);
+// startActivity(intent);
+
}
});
dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
index 23138e3..642db56 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/popupview/CameraAlbumPopWindow.java
@@ -17,6 +17,7 @@
import android.os.Environment;
import android.provider.DocumentsContract;
import android.provider.MediaStore;
+import android.provider.Settings;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -239,12 +240,15 @@
HdlThreadLogic.toast(mContext, R.string.camera_album_file_save_fial);
} else {
if (!TextUtils.isEmpty(outputImagepath.getAbsolutePath())) {
+ //(android13,14闇�瑕佸啀璁剧疆-闅愮-)鐗规畩鏉冮檺璁剧疆
orc_bitmap = BitmapFactory.decodeFile(outputImagepath.getAbsolutePath());//鑾峰彇鍥剧墖
saveBitmap(comp(ImgUpdateDirection(outputImagepath.getAbsolutePath()))); //鍘嬬缉鍥剧墖
} else {
HdlThreadLogic.toast(mContext, R.string.camera_album_file_get_fial);
}
}
+
+
}
/**
@@ -530,8 +534,6 @@
public interface CameraAlbumListener {
void successCallBack(File a);
}
-
-
}
diff --git a/app/src/main/res/layout/activity_cpower_station.xml b/app/src/main/res/layout/activity_cpower_station.xml
index 23d07d6..70c3bc8 100644
--- a/app/src/main/res/layout/activity_cpower_station.xml
+++ b/app/src/main/res/layout/activity_cpower_station.xml
@@ -4,6 +4,23 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/text_FFFFFFFF"
tools:context=".ui.CPowerStationActivity">
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_5"
+ android:layout_marginEnd="@dimen/dp_5"
+ android:gravity="center"
+ android:text="@string/welcome_to_the_smart_energy_app"
+ android:textColor="@color/text_245EC3"
+ android:textSize="@dimen/text_28"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.496"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.093" />
+
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 28e15a3..7c5fec8 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -244,5 +244,6 @@
<string name="switch_power_station">Do you want to switch the %s power station?</string>
<string name="deleting_please_wait">Deleting, please wait鈥�</string>
<string name="already_the_first_one">It\'s already the first one</string>
+ <string name="restarting_please_wait">Restarting, please wait</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 748a617..4057914 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -244,6 +244,7 @@
<string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
<string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡.</string>
+ <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3896308..0e3da36 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -243,6 +243,7 @@
<string name="switch_power_station">鏄惁瑕佸垏鎹�%s鐢电珯?</string>
<string name="deleting_please_wait">鍒犻櫎涓�,璇风◢绛夆��</string>
<string name="already_the_first_one">宸茬粡鏄涓�涓簡.</string>
+ <string name="restarting_please_wait">閲嶅惎涓�,璇风瓑寰呪��</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0