2024年12月25日13:26:59

wjc

2024-12-25 1a8ba64b9cca5aaa98c4f84602f0fb78d3b6b6b4

2024年12月25日13:26:59

 app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java

@@ -41,6 +41,7 @@
import com.hdl.photovoltaic.ui.home.aachart.BasicChartComposer;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.TimeUtils;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
@@ -312,7 +313,9 @@
                Calendar calendar = TimeUtils.stringToCalendar(currDate, timeDateFormat);
                String time = TimeUtils.addDayMonthYearToDate(calendar, 1, timeDateFormat, timeType);
                if (TimeUtils.stringDateToTimestamp(time, timeDateFormat) > TimeUtils.getCurrentTimestamp()) {
                    HdlThreadLogic.toast(_mActivity, getString(R.string.the_query_date_is_exceeded));
                    FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                    flashingBoxDialog.setContent(getString(R.string.the_query_date_is_exceeded));
                    flashingBoxDialog.show();

                    return;
                }

 app/src/main/java/com/hdl/photovoltaic/ui/me/ContactUsActivity.java

@@ -14,6 +14,7 @@
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.bean.ContactBean;
import com.hdl.photovoltaic.widget.FlashingBoxDialog;

/**
 * 联系我们的界面
@@ -85,7 +86,10 @@
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
//                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                    FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                    flashingBoxDialog.setContent(getString(R.string.successful_replication));
                    flashingBoxDialog.show();
                }

//                return true; // 返回true表示已处理长按事件
@@ -105,7 +109,10 @@
                    // 将剪贴数据对象复制到剪贴板
                    clipboard.setPrimaryClip(clip);
                    // 可以添加一个Toast或者其他提示来告知用户复制成功
                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
//                    HdlThreadLogic.toast(_mActivity, getString(R.string.successful_replication));
                    FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
                    flashingBoxDialog.setContent(getString(R.string.successful_replication));
                    flashingBoxDialog.show();
                }
//                return true; // 返回true表示已处理长按事件
            }

 app/src/main/java/com/hdl/photovoltaic/widget/FlashingBoxDialog.java

@@ -29,7 +29,7 @@
    private int mMillisecond = 1500;

    public FlashingBoxDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        super(context, R.style.Custom_List_Dialog);
    }

    /**

 app/src/main/java/com/hdl/photovoltaic/widget/FlashingIconBoxDialog.java

@@ -32,7 +32,7 @@
    private int mMillisecond = 1500;

    public FlashingIconBoxDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        super(context, R.style.Custom_List_Dialog);
    }

    /**
@@ -66,7 +66,7 @@
    /**
     * 设置图标
     *
     * @param drawable 成功或者失败图标
     * @param drawable 成功或者失败,提示图标
     */
    public void setImage(Drawable drawable) {
        this.mDrawable = drawable;

 app/src/main/java/com/hdl/photovoltaic/widget/ListStaticDialog.java

@@ -29,7 +29,7 @@
    private Context mContext;

    public ListStaticDialog(@NonNull Context context) {
        super(context, R.style.Custom_Dialog);
        super(context, R.style.DefaultFilteringDialog);
        mContext = context;
    }

@@ -40,7 +40,7 @@
        if (window != null) {
            window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
            WindowManager.LayoutParams layoutParams = window.getAttributes();
            layoutParams.gravity = Gravity.BOTTOM;
            layoutParams.gravity = Gravity.BOTTOM|Gravity.START|Gravity.END;
            window.setAttributes(layoutParams);
        }
        viewBinding = DialogStaticListBinding.inflate(getLayoutInflater());

 app/src/main/res/drawable/code_box.png

 app/src/main/res/layout/activity_contact_us.xml

@@ -74,7 +74,7 @@
            android:layout_marginStart="@dimen/dp_16"
            android:text="@string/email_address"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_16" />
            android:textSize="@dimen/text_14" />

        <TextView
            android:id="@+id/email_address_content_tv"
@@ -84,7 +84,7 @@
            android:layout_centerVertical="true"
            android:layout_marginEnd="@dimen/dp_16"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_16" />
            android:textSize="@dimen/text_14" />

    </RelativeLayout>


 app/src/main/res/layout/dialog_confirm_input.xml

@@ -57,6 +57,7 @@
                android:paddingEnd="@dimen/dp_16"
                android:textColor="@color/text_E6FFFFFF"
                android:textColorHint="@color/text_66FFFFFF"
                android:textSize="@dimen/text_14"
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"

 app/src/main/res/layout/dialog_flashing_box.xml

@@ -1,33 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent">
    android:layout_height="match_parent"
    android:gravity="center">

    <LinearLayout
        android:id="@+id/tip_parent_cl"
        android:layout_width="0dp"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/dp_100"
        android:layout_marginEnd="@dimen/dp_100"
        android:background="@drawable/dialog_flashing_box"
        android:gravity="center"
        android:paddingTop="@dimen/dp_16"
        android:paddingBottom="@dimen/dp_16"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
        android:paddingTop="@dimen/dp_8"
        android:paddingBottom="@dimen/dp_8">

        <TextView
            android:id="@+id/tip_content_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:gravity="center"
            android:paddingStart="@dimen/dp_4"
            android:paddingEnd="@dimen/dp_4"
            android:paddingStart="@dimen/dp_10"
            android:paddingEnd="@dimen/dp_10"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_14" />
    </LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

 app/src/main/res/layout/dialog_flashing_icon_box.xml

@@ -32,8 +32,10 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:gravity="center"
            android:paddingStart="@dimen/dp_4"
            android:paddingEnd="@dimen/dp_4"
            android:paddingStart="@dimen/dp_8"
            android:paddingTop="@dimen/dp_2"
            android:paddingEnd="@dimen/dp_8"
            android:paddingBottom="@dimen/dp_2"
            android:textColor="@color/text_FFFFFFFF"
            android:textSize="@dimen/text_14" />


 app/src/main/res/layout/dialog_static_list.xml

@@ -1,25 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="@dimen/dp_200"
    android:layout_marginStart="@dimen/dp_20"
    android:layout_marginEnd="@dimen/dp_20"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toStartOf="parent">
    android:layout_height="wrap_content"
    android:background="@color/text_FF222222"
    android:orientation="vertical">


    <LinearLayout
        android:id="@+id/hdl_china_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_china_tv"
@@ -27,7 +20,7 @@
            android:layout_height="wrap_content"
            android:text="HDL China"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18" />
            android:textSize="@dimen/text_14" />
    </LinearLayout>

    <View
@@ -35,9 +28,6 @@
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="@color/text_1AFFFFFF"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_china_ll"

        />

@@ -46,12 +36,8 @@
        android:id="@+id/hdl_bahrain_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/line_v">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_bahrain_tv"
@@ -59,32 +45,34 @@
            android:layout_height="wrap_content"
            android:text="HDL Bahrain"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18"
            android:textSize="@dimen/text_14"

            />
    </LinearLayout>

    <View
        android:layout_width="match_parent"
        android:layout_height="20dp"
        android:background="@color/text_FF000000"

        />

    <LinearLayout
        android:id="@+id/hdl_cancel_ll"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_50"
        android:layout_marginTop="@dimen/dp_20"
        android:background="@color/text_FF222222"
        android:gravity="center"
        android:orientation="horizontal"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/hdl_bahrain_ll">
        android:orientation="horizontal">

        <TextView
            android:id="@+id/hdl_cancel_tv"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="@dimen/text_18"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="@dimen/text_14"

            />
    </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>


 app/src/main/res/layout/view_camera_album.xml

@@ -1,54 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/ll_Pop"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_height="wrap_content"
    android:background="@color/text_FF222222"
    android:orientation="vertical">

    <LinearLayout
        android:id="@+id/ll_Pop"
    <TextView
        android:id="@+id/tv_Camera"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical">
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_photograph"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="14sp" />

        <TextView
    <View
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_0_5"
        android:background="@color/text_1AFFFFFF" />

            android:id="@+id/tv_Camera"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/me_personal_data_photograph"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
    <TextView
        android:id="@+id/tv_Album"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/me_personal_data_select_album"
        android:textColor="@color/text_E6FFFFFF"
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_0_5"
            android:background="@color/text_1AFFFFFF" />
    <View
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_20"
        android:background="@color/text_FF000000" />

        <TextView
            android:id="@+id/tv_Album"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/me_personal_data_select_album"
            android:textColor="@color/text_E6FFFFFF"
            android:textSize="16sp" />
    <TextView
        android:id="@+id/tv_Cancel"
        android:layout_width="match_parent"
        android:layout_height="@dimen/dp_54"
        android:gravity="center"
        android:text="@string/loading_cancel"
        android:textColor="@color/text_66FFFFFF"
        android:textSize="14sp" />

        <View
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_8" />

        <TextView
            android:id="@+id/tv_Cancel"
            android:layout_width="match_parent"
            android:layout_height="@dimen/dp_54"
            android:background="@color/text_FF1C1C1E"
            android:gravity="center"
            android:text="@string/loading_cancel"
            android:textColor="@color/text_66FFFFFF"
            android:textSize="16sp" />

    </LinearLayout>
</LinearLayout>

 app/src/main/res/values-zh/strings.xml

@@ -26,12 +26,12 @@
    <string name="home_login_be_logging_in">登录中…</string>
    <string name="home_login_power_station">体验电站</string>
    <string name="home_login_consent_service_agreement">同意《用户协议》和《隐私协议》</string>
    <string name="home_login_error_account_null">账号不能为空.</string>
    <string name="home_login_error_password_null">密码不能为空.</string>
    <string name="home_login_error_account_or_password">账号或者密码不对,请重新输入.</string>
    <string name="home_login_error_6_16_str">密码不符合最低安全要求,最少6–16个字符.</string>
    <string name="home_login_error_password_6">密码不能小于6个字符.</string>
    <string name="home_login_error_password_16">密码不能大于16个字符.</string>
    <string name="home_login_error_account_null">账号不能为空。</string>
    <string name="home_login_error_password_null">密码不能为空。</string>
    <string name="home_login_error_account_or_password">账号或者密码不对，请重新输入。</string>
    <string name="home_login_error_6_16_str">密码不符合最低安全要求，最少6–16个字符。</string>
    <string name="home_login_error_password_6">密码不能小于6个字符。</string>
    <string name="home_login_error_password_16">密码不能大于16个字符。</string>
    <string name="home_login_input_6_16">请输入6–16位的密码</string>
    <string name="home_login_confirm_psw">请再次确认密码</string>
    <string name="home_login_phone">手机号</string>
@@ -41,10 +41,10 @@
    <string name="home_login_verification_code">获取验证码</string>
    <string name="home_login_input_verification_code">请输入验证码</string>
    <string name="home_login_confirm_reset">确认重置</string>
    <string name="home_login_null_verification_code">验证码不能为空.</string>
    <string name="home_login_phone_null">手机号不能为空.</string>
    <string name="home_login_mail_null">邮箱不能为空.</string>
    <string name="home_login_psw_unlikeliness">两次输入密码不一样.</string>
    <string name="home_login_null_verification_code">验证码不能为空。</string>
    <string name="home_login_phone_null">手机号不能为空。</string>
    <string name="home_login_mail_null">邮箱不能为空。</string>
    <string name="home_login_psw_unlikeliness">两次输入密码不一样。</string>
    <string name="home_login_psw_verification_repeater">后重发</string>
    <string name="home_login_verification_regain">重新获取</string>
    <string name="home_login_pws_reset_succeeded">密码重置成功</string>
@@ -59,14 +59,14 @@
    <string name="home_login_input_old_pws">请输入原密码</string>
    <string name="home_login_input_new_pws">请输入新密码</string>
    <string name="home_login_input_affirm_psw">请再次输入新密码</string>
    <string name="home_login_input_unlike_psw">新密码和确认密码不一致.</string>
    <string name="home_login_input_unlike_psw">新密码和确认密码不一致。</string>
    <string name="home_login_change_name_succeed">修改成功</string>
    <string name="verification">验证码</string>
    <string name="home_phone_number">区号</string>
    <string name="home_chinese_mainland">中国大陆</string>
    <string name="home_password_changed_successfully_log_in">密码修改成功,将重新登录.</string>
    <string name="home_old_password_not_new_password">原密码和新密码不能一样.</string>
    <string name="home_account_registered_successfully">注册成功.</string>
    <string name="home_chinese_mainland">中国</string>
    <string name="home_password_changed_successfully_log_in">密码修改成功，将重新登录。</string>
    <string name="home_old_password_not_new_password">原密码和新密码不能一样。</string>
    <string name="home_account_registered_successfully">注册成功。</string>


    <!--我的电站-->
@@ -152,7 +152,7 @@
    <string name="app_scan_code_download">扫码下载新特锐能APP</string>
    <string name="app_version_upgrade">版本更新</string>
    <string name="app_new_version">已经是最新版本</string>
    <string name="app_service_agreement">服务协议</string>
    <string name="app_service_agreement">用户协议</string>
    <string name="app_privacy_policy">隐私政策</string>
    <string name="app_update_now">立即更新</string>
    <string name="app_cancel_update">取消更新</string>
@@ -161,12 +161,12 @@
    <string name="app_stop_current_download">是否停止当前下载？</string>
    <string name="app_version">版本</string>
    <string name="app_package_size">大小</string>
    <string name="app_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装</string>
    <string name="app_update_fail">授权失败，无法安装应用</string>
    <string name="app_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装。</string>
    <string name="app_update_fail">授权失败，无法安装应用。</string>

    <!--ota-->
    <string name="ota_binding_cloud_upgrade_fails">逆变器没绑定过,升级失败</string>
    <string name="ota_not_cloud_upgrade_fails">逆变器没连上云,升级失败</string>
    <string name="ota_binding_cloud_upgrade_fails">逆变器没绑定过，升级失败。</string>
    <string name="ota_not_cloud_upgrade_fails">逆变器没连上云，升级失败。</string>


    <!--uin-->
@@ -178,22 +178,22 @@
    <string name="loading_agree">同意并登录</string>
    <string name="loading_on_agree">不同意</string>
    <string name="loading_privacy">隐私权政策及服务条款</string>
    <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《用户协议》和《隐私协议》.</string>
    <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《用户协议》和《隐私协议》。</string>
    <string name="kill_app">再按一次退出应用</string>
    <string name="loading_not_supported">抱歉,暂不支持</string>
    <string name="loading_not_supported">抱歉，暂不支持。</string>
    <string name="loading_title_tip">提示</string>
    <string name="loading_app_restart">确认后App将会重新启动</string>
    <string name="loading_log_out">确认退出登录?</string>
    <string name="loading_log_out">确认退出登录？</string>


    <!--    权限       -->
    <string name="camera_album_file_create_fial">文件创建失败</string>
    <string name="camera_album_file_save_fial">保存路径异常，请重试</string>
    <string name="camera_album_file_save_fial">保存路径异常，请重试。</string>
    <!--    权限       -->

    <!--    图片上传       -->
    <string name="camera_album_file_get_fial">图片获取失败</string>
    <string name="camera_album_system_fial">系统处理图片失败，请重试</string>
    <string name="camera_album_system_fial">系统处理图片失败，请重试。</string>
    <string name="apk_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装。</string>
    <string name="apk_update_sure">设置</string>
    <string name="permission_open">请到设置中打开权限</string>
@@ -204,9 +204,9 @@
    <string name="event">事件</string>
    <string name="The_gateway_cannot_be_found_locally">本地找不到网关</string>
    <string name="welcome_to_the_smart_energy_app">欢迎打开智慧能源APP</string>
    <string name="no_permissions_unable_to_receive_push">通知权限没开启,将无法收到推送信息</string>
    <string name="no_permissions_unable_to_receive_push">通知权限没开启，将无法收到推送信息。</string>
    <string name="go_to_settings">前往设置</string>
    <string name="system_positioning_switch">需要打开系统定位开关,否则取法获取位置信息</string>
    <string name="system_positioning_switch">需要打开系统定位开关，否则取法获取位置信息。</string>


    <!--异常-->
@@ -219,10 +219,10 @@
    <string name="exception_the_upgrade_file_is_downloaded">升级文件下载完成</string>
    <string name="exception_no_location_information_permission">没有位置信息权限</string>
    <string name="exception_the_location_function_is_not_enabled">没开启定位功能</string>
    <string name="exception_unable_location_move10_meters_later">无法获取位置,请移动手机10米后,再重新获取</string>
    <string name="exception_unable_location_move10_meters_later">无法获取位置，请移动手机10米后，再重新获取。</string>
    <string name="succeed">成功</string>

    <string name="delete_power_station">是否要删除%s电站?</string>
    <string name="delete_power_station">是否要删除%s电站？</string>
    <string name="power_station_selection">电站选择</string>
    <string name="alarm_all_device">全部设备</string>
    <string name="alarm_all_device_inverter">逆变器</string>
@@ -241,22 +241,22 @@
    <string name="alarm_device">设备报警</string>
    <string name="alarm_record">报警记录</string>
    <string name="power_station_editing">电站编辑</string>
    <string name="switch_power_station">是否要切换%s电站?</string>
    <string name="deleting_please_wait">删除中,请稍等…</string>
    <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>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string>
    <string name="restarting_please_wait">重启中，请等待…</string>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试。</string>

    <string name="cancel_download_successfully">取消下载成功.</string>
    <string name="cancel_download_successfully">取消下载成功。</string>
    <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功</string>
    <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败</string>
    <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件,请下载好固件文件,再重新升级</string>
    <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败,无法升级</string>
    <string name="local_service_fails">本地服务有异常失败,无法升级</string>
    <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件，请下载好固件文件，再重新升级。</string>
    <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败，无法升级。</string>
    <string name="local_service_fails">本地服务有异常失败，无法升级。</string>
    <string name="writing_drive_memory_succeeded">写入新驱动文件到内存成功</string>
    <string name="download_drive_file_failed">下载驱动升级文件失败</string>
    <string name="found_locally_drive_file">本地找不到升级驱动文件,请下载好驱动文件,再重新升级</string>
    <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败,无法升级</string>
    <string name="found_locally_drive_file">本地找不到升级驱动文件，请下载好驱动文件，再重新升级。</string>
    <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败，无法升级。</string>
    <string name="time_selectd">时间选择</string>
    <string name="life_cycle">生命期</string>
    <string name="year">年</string>
@@ -265,7 +265,7 @@
    <string name="hour">时</string>
    <string name="minutc">分</string>
    <string name="seconds">秒</string>
    <string name="the_query_date_is_exceeded">超出查询日期.</string>
    <string name="the_query_date_is_exceeded">超出查询日期</string>
    <string name="energy_generation_statistics">发电量统计</string>
    <string name="social_contribution">社会贡献</string>
    <string name="day_power_generation">当日发电量</string>
@@ -277,7 +277,7 @@
    <string name="station_name">电站名称</string>
    <string name="search">搜索</string>
    <string name="history_search">历史搜索</string>
    <string name="search_content_null">搜索内容不能为空.</string>
    <string name="search_content_null">搜索内容不能为空</string>
    <string name="no_equipment">暂无设备!</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
@@ -292,7 +292,7 @@
    <string name="email_address">邮箱地址</string>
    <string name="successful_replication">已复制到剪切板</string>
    <string name="to_be_added">待接入</string>
    <string name="saving_standard_coal">标准煤</string>
    <string name="saving_standard_coal">节约标准煤</string>
    <string name="co_reduction_rate">CO2减排</string>
    <string name="quantity_of_equivalent_values">等效植树量</string>
    <string name="pv_power">发电功率</string>

 app/src/main/res/values/strings.xml

@@ -26,12 +26,12 @@
    <string name="home_login_be_logging_in">登录中…</string>
    <string name="home_login_power_station">体验电站</string>
    <string name="home_login_consent_service_agreement">同意《用户协议》和《隐私协议》</string>
    <string name="home_login_error_account_null">账号不能为空.</string>
    <string name="home_login_error_password_null">密码不能为空.</string>
    <string name="home_login_error_account_or_password">账号或者密码不对,请重新输入.</string>
    <string name="home_login_error_6_16_str">密码不符合最低安全要求,最少6–16个字符.</string>
    <string name="home_login_error_password_6">密码不能小于6个字符.</string>
    <string name="home_login_error_password_16">密码不能大于16个字符.</string>
    <string name="home_login_error_account_null">账号不能为空。</string>
    <string name="home_login_error_password_null">密码不能为空。</string>
    <string name="home_login_error_account_or_password">账号或者密码不对，请重新输入。</string>
    <string name="home_login_error_6_16_str">密码不符合最低安全要求，最少6–16个字符。</string>
    <string name="home_login_error_password_6">密码不能小于6个字符。</string>
    <string name="home_login_error_password_16">密码不能大于16个字符。</string>
    <string name="home_login_input_6_16">请输入6–16位的密码</string>
    <string name="home_login_confirm_psw">请再次确认密码</string>
    <string name="home_login_phone">手机号</string>
@@ -41,10 +41,10 @@
    <string name="home_login_verification_code">获取验证码</string>
    <string name="home_login_input_verification_code">请输入验证码</string>
    <string name="home_login_confirm_reset">确认重置</string>
    <string name="home_login_null_verification_code">验证码不能为空.</string>
    <string name="home_login_phone_null">手机号不能为空.</string>
    <string name="home_login_mail_null">邮箱不能为空.</string>
    <string name="home_login_psw_unlikeliness">两次输入密码不一样.</string>
    <string name="home_login_null_verification_code">验证码不能为空。</string>
    <string name="home_login_phone_null">手机号不能为空。</string>
    <string name="home_login_mail_null">邮箱不能为空。</string>
    <string name="home_login_psw_unlikeliness">两次输入密码不一样。</string>
    <string name="home_login_psw_verification_repeater">后重发</string>
    <string name="home_login_verification_regain">重新获取</string>
    <string name="home_login_pws_reset_succeeded">密码重置成功</string>
@@ -59,14 +59,14 @@
    <string name="home_login_input_old_pws">请输入原密码</string>
    <string name="home_login_input_new_pws">请输入新密码</string>
    <string name="home_login_input_affirm_psw">请再次输入新密码</string>
    <string name="home_login_input_unlike_psw">新密码和确认密码不一致.</string>
    <string name="home_login_input_unlike_psw">新密码和确认密码不一致。</string>
    <string name="home_login_change_name_succeed">修改成功</string>
    <string name="verification">验证码</string>
    <string name="home_phone_number">区号</string>
    <string name="home_chinese_mainland">中国大陆</string>
    <string name="home_password_changed_successfully_log_in">密码修改成功,将重新登录.</string>
    <string name="home_old_password_not_new_password">原密码和新密码不能一样.</string>
    <string name="home_account_registered_successfully">注册成功.</string>
    <string name="home_password_changed_successfully_log_in">密码修改成功，将重新登录。</string>
    <string name="home_old_password_not_new_password">原密码和新密码不能一样。</string>
    <string name="home_account_registered_successfully">注册成功。</string>


    <!--我的电站-->
@@ -152,7 +152,7 @@
    <string name="app_scan_code_download">扫码下载新特锐能APP</string>
    <string name="app_version_upgrade">版本更新</string>
    <string name="app_new_version">已经是最新版本</string>
    <string name="app_service_agreement">服务协议</string>
    <string name="app_service_agreement">用户协议</string>
    <string name="app_privacy_policy">隐私政策</string>
    <string name="app_update_now">立即更新</string>
    <string name="app_cancel_update">取消更新</string>
@@ -161,12 +161,12 @@
    <string name="app_stop_current_download">是否停止当前下载？</string>
    <string name="app_version">版本</string>
    <string name="app_package_size">大小</string>
    <string name="app_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装</string>
    <string name="app_update_fail">授权失败，无法安装应用</string>
    <string name="app_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装。</string>
    <string name="app_update_fail">授权失败，无法安装应用。</string>

    <!--ota-->
    <string name="ota_binding_cloud_upgrade_fails">逆变器没绑定过,升级失败</string>
    <string name="ota_not_cloud_upgrade_fails">逆变器没连上云,升级失败</string>
    <string name="ota_binding_cloud_upgrade_fails">逆变器没绑定过，升级失败。</string>
    <string name="ota_not_cloud_upgrade_fails">逆变器没连上云，升级失败。</string>


    <!--uin-->
@@ -178,22 +178,22 @@
    <string name="loading_agree">同意并登录</string>
    <string name="loading_on_agree">不同意</string>
    <string name="loading_privacy">隐私权政策及服务条款</string>
    <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《用户协议》和《隐私协议》.</string>
    <string name="loading_privacy_server">为了更好的保障您的合法权益，请您阅读并同意以下协议《用户协议》和《隐私协议》。</string>
    <string name="kill_app">再按一次退出应用</string>
    <string name="loading_not_supported">抱歉,暂不支持</string>
    <string name="loading_not_supported">抱歉，暂不支持。</string>
    <string name="loading_title_tip">提示</string>
    <string name="loading_app_restart">确认后App将会重新启动</string>
    <string name="loading_log_out">确认退出登录?</string>
    <string name="loading_log_out">确认退出登录？</string>


    <!--    权限       -->
    <string name="camera_album_file_create_fial">文件创建失败</string>
    <string name="camera_album_file_save_fial">保存路径异常，请重试</string>
    <string name="camera_album_file_save_fial">保存路径异常，请重试。</string>
    <!--    权限       -->

    <!--    图片上传       -->
    <string name="camera_album_file_get_fial">图片获取失败</string>
    <string name="camera_album_system_fial">系统处理图片失败，请重试</string>
    <string name="camera_album_system_fial">系统处理图片失败，请重试。</string>
    <string name="apk_update_content">为了正常升级河东APP，请点击设置按钮，允许安装未知来源应用，本功能只限用于河东APP版本升级，Android 11版本及以上需要在授权之后重新下载安装。</string>
    <string name="apk_update_sure">设置</string>
    <string name="permission_open">请到设置中打开权限</string>
@@ -204,9 +204,9 @@
    <string name="event">事件</string>
    <string name="The_gateway_cannot_be_found_locally">本地找不到网关</string>
    <string name="welcome_to_the_smart_energy_app">欢迎打开智慧能源APP</string>
    <string name="no_permissions_unable_to_receive_push">通知权限没开启,将无法收到推送信息</string>
    <string name="no_permissions_unable_to_receive_push">通知权限没开启，将无法收到推送信息。</string>
    <string name="go_to_settings">前往设置</string>
    <string name="system_positioning_switch">需要打开系统定位开关,否则取法获取位置信息</string>
    <string name="system_positioning_switch">需要打开系统定位开关，否则取法获取位置信息。</string>


    <!--异常-->
@@ -219,10 +219,10 @@
    <string name="exception_the_upgrade_file_is_downloaded">升级文件下载完成</string>
    <string name="exception_no_location_information_permission">没有位置信息权限</string>
    <string name="exception_the_location_function_is_not_enabled">没开启定位功能</string>
    <string name="exception_unable_location_move10_meters_later">无法获取位置,请移动手机10米后,再重新获取</string>
    <string name="exception_unable_location_move10_meters_later">无法获取位置，请移动手机10米后，再重新获取。</string>
    <string name="succeed">成功</string>

    <string name="delete_power_station">是否要删除%s电站?</string>
    <string name="delete_power_station">是否要删除%s电站？</string>
    <string name="power_station_selection">电站选择</string>
    <string name="alarm_all_device">全部设备</string>
    <string name="alarm_all_device_inverter">逆变器</string>
@@ -241,22 +241,22 @@
    <string name="alarm_device">设备报警</string>
    <string name="alarm_record">报警记录</string>
    <string name="power_station_editing">电站编辑</string>
    <string name="switch_power_station">是否要切换%s电站?</string>
    <string name="deleting_please_wait">删除中,请稍等…</string>
    <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>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试</string>
    <string name="restarting_please_wait">重启中，请等待…</string>
    <string name="port_conflict">应用冲突，需要关闭onpro或者其它版本的调试软件然后再重新启动这个软件试试。</string>

    <string name="cancel_download_successfully">取消下载成功.</string>
    <string name="cancel_download_successfully">取消下载成功。</string>
    <string name="writing_firmware_upgrade_memory_succeeded">写入新固件文件到内存成功</string>
    <string name="download_firmware_upgrade_file_failed">下载固件升级文件失败</string>
    <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件,请下载好固件文件,再重新升级</string>
    <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败,无法升级</string>
    <string name="local_service_fails">本地服务有异常失败,无法升级</string>
    <string name="found_locally_firmware_upgrade_file">本地找不到升级固件文件，请下载好固件文件，再重新升级。</string>
    <string name="notify_gateway_firmware_upgrade_failed">通知给网关升级固件文件地址失败，无法升级。</string>
    <string name="local_service_fails">本地服务有异常失败，无法升级。</string>
    <string name="writing_drive_memory_succeeded">写入新驱动文件到内存成功</string>
    <string name="download_drive_file_failed">下载驱动升级文件失败</string>
    <string name="found_locally_drive_file">本地找不到升级驱动文件,请下载好驱动文件,再重新升级</string>
    <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败,无法升级</string>
    <string name="found_locally_drive_file">本地找不到升级驱动文件，请下载好驱动文件，再重新升级。</string>
    <string name="notify_gateway_drive_failed">通知给网关升级驱动文件地址失败，无法升级。</string>
    <string name="time_selectd">时间选择</string>
    <string name="life_cycle">生命期</string>
    <string name="year">年</string>
@@ -265,7 +265,7 @@
    <string name="hour">时</string>
    <string name="minutc">分</string>
    <string name="seconds">秒</string>
    <string name="the_query_date_is_exceeded">超出查询日期.</string>
    <string name="the_query_date_is_exceeded">超出查询日期</string>
    <string name="energy_generation_statistics">发电量统计</string>
    <string name="social_contribution">社会贡献</string>
    <string name="day_power_generation">当日发电量</string>
@@ -277,7 +277,7 @@
    <string name="station_name">电站名称</string>
    <string name="search">搜索</string>
    <string name="history_search">历史搜索</string>
    <string name="search_content_null">搜索内容不能为空.</string>
    <string name="search_content_null">搜索内容不能为空</string>
    <string name="no_equipment">暂无设备!</string>
    <string name="filtering">筛选</string>
    <string name="reset">重置</string>
@@ -292,7 +292,7 @@
    <string name="email_address">邮箱地址</string>
    <string name="successful_replication">已复制到剪切板</string>
    <string name="to_be_added">待接入</string>
    <string name="saving_standard_coal">标准煤</string>
    <string name="saving_standard_coal">节约标准煤</string>
    <string name="co_reduction_rate">CO2减排</string>
    <string name="quantity_of_equivalent_values">等效植树量</string>
    <string name="pv_power">发电功率</string>