Merge branch 'master' into 2.0

wjc

4 天以前 8f4a21c13de88f6c34705f0660ec54ec5e032aa4

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

@@ -129,6 +129,7 @@
        }
    }


    public TextView getContentTextView() {
        if (viewBinding == null) {
            return null;