Merge branch 'wjc_new' into lwj_new

mac

2024-05-30 619d22243b0b44f81d6b2bb82c9e087b0dca6f3b

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