Merge branch 'dev-hxb' into wjc_new

mac

2024-04-12 1311774b7c71fe94016a7b2cdf508e3d39114422

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_4"/>
    <solid android:color="#000000"/>
 
</shape>