From 593093f5c30da9822deef46096b6b2d5f6520fe1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 10:36:52 +0800
Subject: [PATCH] 2025年04月09日10:36:49
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 10 ----------
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 16 ++++------------
app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java | 2 +-
app/build.gradle | 4 ++--
4 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 79af1d0..a6d2ebb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@
applicationId "com.hdl.photovoltaic"
minSdk 23
targetSdk 34
- versionCode 4
+ versionCode 1
versionName "1.1.0"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
@@ -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(4)}.apk"
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
index 84c22ac..42a1fac 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/AppConfigManage.java
@@ -8,7 +8,7 @@
public class AppConfigManage {
/*********鏄惁姝ｅ紡鏈嶅姟鍣�*********/
- private static final boolean isOnlineServer = false;
+ private static final boolean isOnlineServer = true;
/*********姝ｅ紡鐜*********/
private static final String APP_KEY_ONLINE = "CSZEMDJL";
private static final String APP_SECRET_ONLINE = "CSZEMDKBCSZEMDKR";
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index aff6241..84a71e1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -171,13 +171,6 @@
// viewBinding.homeLoginPasswordEt.setText(pws);
checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString());
isLoginTextViewEnabled();
- if (UserConfigManage.getInstance().isBAccount()) {
- boolean is_Authorization = SharedPreUtils.getBoolean("isAuthorization");
- if (!is_Authorization) {
- //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
- HdlThreadLogic.toast(_mActivity, getString(R.string.forbidden_login));
- }
- }
} catch (Exception ignored) {
}
@@ -342,7 +335,6 @@
@Override
public void onSuccess(HDLLoginBean obj) {
if (UserConfigManage.getInstance().isBAccount()) {
- SharedPreUtils.putBoolean("isAuthorization", true);
restoreButtonStyleToInitializeState();
//瀹夎鍟嗚烦杞晫闈�
startActivity(BPowerStationActivity.class);
@@ -352,7 +344,6 @@
// HdlAccountLogic.getInstance().getCompanyParterMenu_B(new CloudCallBeak<Boolean>() {
// @Override
// public void onSuccess(Boolean isBoolean) {
-// SharedPreUtils.putBoolean("isAuthorization", isBoolean);
// if (isBoolean) {
// //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
// restoreButtonStyleToInitializeState();
@@ -368,7 +359,6 @@
//
// @Override
// public void onFailure(HDLException e) {
-// SharedPreUtils.putBoolean("isAuthorization", false);
// hideLoading();
// HdlThreadLogic.toast(_mActivity, e.getMsg() + "(" + e.getCode() + ")");
// }
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 f2163fb..fe166b3 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -84,18 +84,10 @@
//鍒ゆ柇AccessToken鏄惁null
if (!TextUtils.isEmpty(HDLLinkPMUser.getInstance().getAccessToken())) {
if (UserConfigManage.getInstance().isBAccount()) {
- //2025骞�03鏈�03鏃�14:45:17 鏉ㄦ稕瑕佹眰b绔处鍙烽渶瑕佹楠屾潈闄�
- boolean isAuthorization = SharedPreUtils.getBoolean("isAuthorization");
- if (isAuthorization) {
- //瀹夎鍟嗚烦杞晫闈�
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, BPowerStationActivity.class);
- openActivity(intent);
- } else {
- Intent intent = new Intent();
- intent.setClass(StartActivity.this, LoginActivity.class);
- openActivity(intent);
- }
+ //瀹夎鍟嗚烦杞晫闈�
+ Intent intent = new Intent();
+ intent.setClass(StartActivity.this, BPowerStationActivity.class);
+ openActivity(intent);
} else {
//C绔敤鎴疯烦杞晫闈�
// showLoading();
--
Gitblit v1.8.0