Merge branch 'dev' into 1.4.4

wjc

8 天以前 89d140a2ca1b27edad1c561347a00ce6561e12bd

Merge branch 'dev' into 1.4.4

 app/debug/output-metadata.json

File was deleted

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

@@ -253,7 +253,7 @@
                                    houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//装机容量
                                    houseInfoBean.setPower(houseIdBean.getPower());//发电功率
                                    houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//今天发电量
                                    houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//电站状态(电站状态    1:正常(运行),2:离线,3:连接中,4:故障)
                                    houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//电站状态(电站状态    1:正常(运行),2:离线,3:连接中,4:故障)
                                    //添加到本地缓存
                                    addHouseToLocalMemory(houseInfoBean);
                                }
@@ -1259,4 +1259,4 @@
        }
    }

}
}

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

@@ -1074,8 +1074,8 @@

    public void requestPermissions(OnCallBeak onCallBeak) {

        //ACCESS_FINE_LOCATION    允许使用GPS定位
        //ACCESS_COARSE_LOCATION    允许使用WIFI热点或基站来获取粗略的定位
        //ACCESS_FINE_LOCATION    允许使用GPS定位
        //ACCESS_COARSE_LOCATION    允许使用WIFI热点或基站来获取粗略的定位
        String[] ary = PermissionUtils.checkPermission(_mActivity, new String[]{Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION});
        if (ary.length > 0) {
            this.requestPermissions(ary, PermissionUtils.STATUS_SUCCESS);
@@ -1265,4 +1265,4 @@
    }


}
}

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

@@ -536,9 +536,4 @@
    </androidx.constraintlayout.widget.ConstraintLayout>


</androidx.constraintlayout.widget.ConstraintLayout>





</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -375,5 +375,4 @@

    </RelativeLayout>

</com.hdl.photovoltaic.widget.SwipeLayout>

</com.hdl.photovoltaic.widget.SwipeLayout>