Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2023-04-21 666b28d77fc3c1b1dae61c9dfd878c8e683cef8c

 HDL-ON_Android/Resources/drawable/dialog_background2.xml

@@ -8,6 +8,6 @@

    <!-- 填充颜色 -->
    <solid
        android:color="@color/white"        />
        android:color="#FFFFFF"/>

</shape>