Merge branch 'wjc_new' into develop_new

mac

2024-05-22 e5068e0a3b20b579bd62a142f9af8f5ecaa54472

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