Merge branch '1.5.1'

wjc

2025-02-07 e57e1c01a52a326343122d458ad3bd330fc9d347

 app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AndroidPermissionActivity.java

@@ -66,8 +66,8 @@
    private void showDialog() {
        AlertDialog.Builder builder = new AlertDialog.Builder(this);
        builder.setTitle(R.string.app_name);
        builder.setMessage(HDLApp.getInstance().getResources().getString(R.string.app_update_content));
        builder.setPositiveButton(HDLApp.getInstance().getResources().getString(R.string.me_set), new DialogInterface.OnClickListener() {
        builder.setMessage(HDLApp.getInstance().getAppLocaleContext().getString(R.string.app_update_content));
        builder.setPositiveButton(HDLApp.getInstance().getAppLocaleContext().getString(R.string.me_set), new DialogInterface.OnClickListener() {
            @RequiresApi(api = Build.VERSION_CODES.O)
            @Override
            public void onClick(DialogInterface dialogInterface, int i) {
@@ -75,7 +75,7 @@
                mAlertDialog.dismiss();
            }
        });
        builder.setNegativeButton(HDLApp.getInstance().getResources().getString(R.string.loading_cancel), new DialogInterface.OnClickListener() {
        builder.setNegativeButton(HDLApp.getInstance().getAppLocaleContext().getString(R.string.loading_cancel), new DialogInterface.OnClickListener() {
            @Override
            public void onClick(DialogInterface dialogInterface, int i) {
                if (sListener != null) {