Merge branch '1.4.4' into dev

wjc

1 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

 app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java

@@ -122,6 +122,19 @@
     */
    private boolean noNetworkFlag = false;

    public boolean isAutomaticSkipNoNetworkFlag() {
        return automaticSkipNoNetworkFlag;
    }

    public void setAutomaticSkipNoNetworkFlag(boolean automaticSkipNoNetworkFlag) {
        this.automaticSkipNoNetworkFlag = automaticSkipNoNetworkFlag;
    }

    /**
     * 自动跳转到无网模式(true=同意跳转,false=不同意跳转)
     */
    private boolean automaticSkipNoNetworkFlag = false;

    /**
     * 无网模式设备mac
     */