wjc
2025-01-20 a2eb306d865fedf8cf505020bf06ad4359169b8e
2025年01月20日21:53:42
2个文件已修改
98 ■■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/HDLApp.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -62,6 +62,12 @@
    private Boolean isLogEnabled = true;
    //三方sdk初始化标识
    private Boolean isInitThirdSDK = false;
    //三方sdk初始化标识
    /**
     * 三方sdk初始化标识
     * 在StartActivity里面初始化三方SDK的标识
     */
    public Boolean isStartInitThirdSDK = false;
    //声明一个当前应用的实例
    private static HDLApp mHDLApp;
    //声明一个公共的信息映射,可当作全局变量使用;
@@ -149,8 +155,8 @@
//        //9.初始化网络工具
//        NetWorkUtil.init(this);
        initAutoSize();
        //初始化极光推送
        initJPush();
//        //初始化极光推送
//        initJPush();
        initHDLLinkPMSdk();
        HDLLinkLocalSdk.getInstance().init(getInstance());
        initSocket();
@@ -269,7 +275,6 @@
    private void initJPush() {
        JPushInterface.setDebugMode(true);
        JPushInterface.init(getBaseContext());
    }
    /**
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -16,20 +16,26 @@
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import java.util.List;
import cn.jpush.android.api.JPushInterface;
import io.dcloud.common.util.RuningAcitvityUtil;
/**
@@ -46,6 +52,36 @@
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //发布审核小米应用市场要求APP第一次启动提前提示《用户协议》和《隐私政策》才允许上线
        final String key = "is_login";
        boolean isLogin = SharedPreUtils.getBoolean(key);
        if (!isLogin) {
            ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
            confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
            confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
            confirmationCancelDialog.setConfirmation(getString(R.string.agree));
            confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
            confirmationCancelDialog.show();
            setStringDifferentColors(confirmationCancelDialog.getContentTextView());
            confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
                @Override
                public void Cancel() {
                    SharedPreUtils.putBoolean(key, false);
                    finish();
                }
            });
            confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                @Override
                public void Confirm() {
                    initSdk();
                    SharedPreUtils.putBoolean(key, true);
                    Intent intent = new Intent();
                    intent.setClass(StartActivity.this, LoginActivity.class);
                    openActivity(intent);
                }
            });
        } else {
            initSdk();
        //初始化服务器域名(用户注册所在服务器域名地址)
        AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
        //判断AccessToken是否null
@@ -78,42 +114,11 @@
                });
            }
        } else {
            //发布审核小米应用市场要求APP第一次启动提前提示《用户协议》和《隐私政策》才允许上线
            final String key = "is_login";
            boolean isLogin = SharedPreUtils.getBoolean(key);
            if (isLogin) {
                Intent intent = new Intent();
                intent.setClass(StartActivity.this, LoginActivity.class);
                openActivity(intent);
            } else {
                ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(this);
                confirmationCancelDialog.setTitle(getString(R.string.user_agreement_and_privacy_agreement));
                confirmationCancelDialog.setContent(getString(R.string.thank_you_for_using));
                confirmationCancelDialog.setConfirmation(getString(R.string.agree));
                confirmationCancelDialog.setCancel(getString(R.string.loading_on_agree));
                confirmationCancelDialog.show();
                setStringDifferentColors(confirmationCancelDialog.getContentTextView());
                confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
                    @Override
                    public void Cancel() {
                        SharedPreUtils.putBoolean(key, false);
                        finish();
                    }
                });
                confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
                    @Override
                    public void Confirm() {
                        SharedPreUtils.putBoolean(key, true);
                        Intent intent = new Intent();
                        intent.setClass(StartActivity.this, LoginActivity.class);
                        openActivity(intent);
                    }
                });
            }
        }
    }
@@ -226,5 +231,25 @@
    }
    /**
     * 初始化三方相关SDK
     * 小米平台上线,需要先同意后,在初始化极光SDK,否则平台审核不让通过
     */
    private void initSdk() {
        if (HDLApp.getInstance().isStartInitThirdSDK) {
            return;
        }
        HDLApp.getInstance().isStartInitThirdSDK = true;
        //初始化极光推送
        initJPush();
    }
    /**
     * 初始化极光SDK
     */
    private void initJPush() {
        JPushInterface.setDebugMode(true);
        JPushInterface.init(getBaseContext());
    }
}