Merge branch 'wjc_new' into wxw_new

mac

2024-05-30 b6e0ba5d2b447fbb46ea03ef2a2424628f9ea66e

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
    <corners android:radius="@dimen/dp_13" />
    <solid android:color="@color/text_FFFFFFFF" />
 
</shape>