2024年07月03日17:36:47

mac

2024-07-03 1e4ad2c45a7524132d0a29dc7da3511ec3a5db16

2024年07月03日17:36:47

备份代码

 app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java

@@ -494,22 +494,7 @@

            @Override
            public void onFailure(HDLException e) {
                //添加逆变器失败后初始化逆变器
                HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true);
                for (int i = 0; i < list.size(); i++) {
                    GatewayBean gatewayBean = list.get(i);
                    HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                        @Override
                        public void onSuccess(Boolean obj) {
                            HdlLogLogic.print("初始化逆变器成功-->mac:" + gatewayBean.getDevice_mac(), true);
                        }

                        @Override
                        public void onError(HDLLinkException e) {
                            HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true);
                        }
                    });
                }
                if (cloudCallBeak != null) {
                    cloudCallBeak.onFailure(e);
                }

 app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java

@@ -2030,6 +2030,22 @@

                                        @Override
                                        public void onFailure(HDLException e) {
                                            //添加逆变器失败后初始化逆变器
                                            HdlLogLogic.print("添加逆变器失败后开始初始化逆变器-->", true);
                                            for (int i = 0; i < list.size(); i++) {
                                                GatewayBean gatewayBean = list.get(i);
                                                HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
                                                    @Override
                                                    public void onSuccess(Boolean obj) {
                                                        HdlLogLogic.print("初始化逆变器成功-->mac:" + gatewayBean.getDevice_mac(), true);
                                                    }

                                                    @Override
                                                    public void onError(HDLLinkException e) {
                                                        HdlLogLogic.print("初始化逆变器失败-->mac:" + gatewayBean.getDevice_mac(), true);
                                                    }
                                                });
                                            }
                                            uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
                                        }
                                    });

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

@@ -93,6 +93,7 @@
                mC_UserInfo = cUserInfo;
                UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
                UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
                UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
                UserConfigManage.getInstance().Save();
//                hideLoading();
                //获取用户头像路径
@@ -148,9 +149,11 @@
                mB_UserInfo = bUserInfo;
                UserConfigManage.getInstance().setBingPhone(bUserInfo.getUserPhone());
                UserConfigManage.getInstance().setBingEmail(bUserInfo.getUserEmail());
                UserConfigManage.getInstance().setUserName(bUserInfo.getUserName());
                UserConfigManage.getInstance().Save();
//                hideLoading();
                setMemberName(bUserInfo.getUserName());
                setMemberAccount(TextUtils.isEmpty(bUserInfo.getUserPhone()) ? bUserInfo.getUserEmail() : bUserInfo.getUserPhone());
            }

            @Override
@@ -241,6 +244,7 @@


        setMemberName(UserConfigManage.getInstance().getUserName());
        setMemberAccount(UserConfigManage.getInstance().getAccount());
//        setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());


@@ -288,11 +292,22 @@
            userName = "--";
        }
        viewBinding.fragmentMeUserNameTv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
        UserConfigManage.getInstance().Save();


    }

    /**
     * 显示账号
     */
    private void setMemberAccount(String userAccount) {
        if (TextUtils.isEmpty(userAccount)) {
            userAccount = "--";
        }
        viewBinding.fragmentMeUserRoleTv.setText(userAccount);

    }


    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
    public void onEventMessage(BaseEventBus eventBus) {
        super.onEventMessage(eventBus);

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

@@ -142,7 +142,7 @@
                            android:id="@+id/info_rl1_text2_tv"
                            style="@style/Text14Style"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_17"
                            android:layout_height="@dimen/dp_18"
                            android:layout_below="@+id/info_rl1_text1_tv"
                            android:layout_alignStart="@+id/info_rl1_text1_tv"
                            android:layout_marginTop="3dp"
@@ -162,7 +162,7 @@
                            android:id="@+id/info_rl1_text4_tv"
                            style="@style/Text14Style"
                            android:layout_width="wrap_content"
                            android:layout_height="@dimen/dp_17"
                            android:layout_height="@dimen/dp_18"
                            android:layout_below="@+id/info_rl1_text3_tv"
                            android:layout_alignStart="@+id/info_rl1_text1_tv"
                            android:layout_marginTop="3dp"

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

@@ -171,7 +171,6 @@
                android:layout_height="@dimen/dp_17"
                android:layout_marginStart="@dimen/dp_16"
                android:layout_marginTop="@dimen/dp_21"
                android:layout_marginEnd="@dimen/dp_12"
                android:orientation="horizontal"
                app:layout_constraintEnd_toEndOf="parent"
                app:layout_constraintStart_toStartOf="parent"
@@ -179,10 +178,8 @@

                <RelativeLayout
                    android:id="@+id/station_name_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">

                    <TextView
@@ -192,7 +189,9 @@
                        android:text="@string/station_name"
                        android:textColor="@color/text_E6000000"
                        android:textSize="@dimen/text_12"
                        android:textStyle="bold" />
                        android:textStyle="bold"

                        />

                    <ImageView
                        android:id="@+id/station_name_iv"
@@ -200,15 +199,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_name_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_name_iv" />
                </RelativeLayout>


                <RelativeLayout
                    android:id="@+id/station_power_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">

                    <TextView
@@ -226,15 +228,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_power_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_power_iv" />
                </RelativeLayout>


                <RelativeLayout
                    android:id="@+id/station_day_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">

                    <TextView
@@ -252,15 +257,18 @@
                        android:layout_height="@dimen/dp_18"
                        android:layout_toEndOf="@+id/station_day_tv"
                        android:background="@drawable/ascending_descending_order_select" />

                    <View
                        android:layout_width="@dimen/dp_16"
                        android:layout_height="match_parent"
                        android:layout_toEndOf="@+id/station_day_iv" />
                </RelativeLayout>


                <RelativeLayout
                    android:id="@+id/station_month_rl"
                    android:layout_width="0dp"
                    android:layout_width="wrap_content"
                    android:layout_height="match_parent"
                    android:layout_weight="1"
                    android:gravity="center"
                    android:orientation="horizontal">

                    <TextView

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

@@ -267,14 +267,14 @@
    <string name="minutc">Minute</string>
    <string name="seconds">Second</string>
    <string name="the_query_date_is_exceeded">Out of query date</string>
    <string name="energy_generation_statistics">Enviromentail Benefits</string>
    <string name="social_contribution">Statistics</string>
    <string name="energy_generation_statistics">Generation</string>
    <string name="social_contribution">Enviromental Benefits</string>
    <string name="day_power_generation">Yield Today</string>
    <string name="month_power_generation">Yield this month</string>
    <string name="year_power_generation">Yield this year</string>
    <string name="month_power_generation">monthly yield</string>
    <string name="year_power_generation">yearly yield</string>
    <string name="cumulative_power_generation">Total yield</string>
    <string name="generated_power">Power generated</string>
    <string name="generation">Power Generation </string>
    <string name="generated_power">Generation</string>
    <string name="generation">Generation</string>
    <string name="station_name">Name</string>
    <string name="search">Search</string>
    <string name="history_search">Search history</string>