Merge branch 'wjc_new' into develop_new

mac

2024-05-21 d24c8a8d62caf0c0902246972a80f34edd098ba0

1
2
3
4
<manifest xmlns:android="http://schemas.android.com/apk/res/android" 
    package="com.contrarywind.view"> 
 
</manifest>