2025年04月09日10:36:49

wjc

2025-04-09 593093f5c30da9822deef46096b6b2d5f6520fe1

2025年04月09日10:36:49

 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是我们修复bug用的
        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"
        }
    }


 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";

 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() + ")");
//                                }

 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();