Merge branch '1.3.1' into google

wjc

5 天以前 99fe0cdba240f67e75e3d051e51fa61d71188cab

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

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


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