2024年05月28日18:03:11

mac

2024-05-28 216b55f56fe1ec6694e7cca9390765342f570a74

2024年05月28日18:03:11

备份代码

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

@@ -244,6 +244,14 @@
                        HdlAccountLogic.getInstance().loginByPassword(account, password, new ILoginCallBack() {
                            @Override
                            public void onSuccess(HDLLoginBean obj) {
                                if (UserConfigManage.getInstance().isBAccount()) {
                                    restoreButtonStyleToInitializeState();
                                    //安装商跳转界面
                                    startActivity(BPowerStationActivity.class);
                                    hideLoading();
                                    finish();
                                } else {
                                    //C端需要先获取电站列表;
                                HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
                                    @Override
                                    public void onSuccess(List<HouseIdBean> obj) {
@@ -276,6 +284,7 @@
                                    }
                                });
                            }
                            }

                            @Override
                            public void onFailure(HDLException e) {

 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java

@@ -166,17 +166,19 @@
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
            }
            break;
            case 4: {
            case 4:
            case 5:
            {
                text = mContext.getString(R.string.my_power_station_malfunction);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            }
            //5:离线有故障Offline_fault
            break;
            case 5: {
                text = mContext.getString(R.string.Offline_fault);
                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
            }
            break;
//            case 5: {
//                text = mContext.getString(R.string.Offline_fault);
//                drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
//            }
//            break;
        }
        textView.setText(text);
        textView.setBackground(drawable);

 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java

@@ -130,7 +130,9 @@
        } else {
            this.mList.clear();
        }

        if (newData == null) {
            newData = new ArrayList<>();
        }
        this.mList.addAll(newData);
        notifyDataSetChanged();
    }

 app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListEditActivity.java

@@ -42,7 +42,7 @@
    private ActivityHouseListEditBinding viewBinding;

    private HouseListAdapter houseListAdapter;
    private List<HouseIdBean> houseListBeanIDList;
    private List<HouseIdBean> houseListBeanIDList = new ArrayList<>();


    @Override
@@ -61,17 +61,20 @@
        initView();
        //初始化界面监听器
        initEvent();
        if (this.houseListBeanIDList.size() == 0) {
            downReadData(false);
        }
    }

    private void initData() {
        this.houseListBeanIDList = new ArrayList<>();
        this.houseListBeanIDList.clear();
        this.houseListBeanIDList.addAll(HdlResidenceLogic.getInstance().getHouseIdList());
        for (int i = 0; i < this.houseListBeanIDList.size(); i++) {
            this.houseListBeanIDList.get(i).setDelIcon(true);
            this.houseListBeanIDList.get(i).setMove(true);
        }
    }

        }
    }

    @Override
    public void onBackPressed() {
@@ -261,6 +264,9 @@
     * @param isRefreshing 表示是下拉刷新的
     */
    private void downReadData(boolean isRefreshing) {
        if (!isRefreshing) {
            showLoading();
        }
        //获取住宅(电站)ID列表
        HdlResidenceLogic.getInstance().getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
            @Override
@@ -271,6 +277,8 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }
                        if (list != null && list.size() > 0) {
                            //更新缓存
@@ -297,8 +305,11 @@
                        if (isRefreshing) {
                            //关闭下拉刷新的圈圈
                            viewBinding.fragmentHouseSrl.setRefreshing(false);
                        } else {
                            hideLoading();
                        }


                    }
                }, _mActivity, ShowErrorMode.YES);
            }

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

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

@@ -173,7 +173,7 @@
                        android:id="@+id/home_page_station_info_rl2"
                        android:layout_width="match_parent"
                        android:layout_height="@dimen/dp_166"
                        android:background="@drawable/bj_13_ffffff"
                        android:background="@drawable/page_station_generating_bj"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toBottomOf="@+id/home_page_station_info_rl1">

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

@@ -291,7 +291,7 @@
    <string name="contact_us">联系我们</string>
    <string name="wechat_id">微信号</string>
    <string name="email_address">邮箱地址</string>
    <string name="successful_replication">复制成功</string>
    <string name="successful_replication">已复制到剪切板</string>
    <string name="to_be_added">待接入</string>
    <string name="saving_standard_coal">节约标准煤</string>
    <string name="co_reduction_rate">CO2减排</string>