Merge branch 'wjc_new' into develop_new

mac

2024-05-29 6666e651e35ef6ae079247da975c58098111c13c

1
2
3
4
5
6
7
<resources>
    <declare-styleable name="FullscreenAttrs">
        <attr name="fullscreenBackgroundColor" format="color" />
        <attr name="fullscreenTextColor" format="color" />
    </declare-styleable>
 
</resources>