Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL-ON_Android/Resources/drawable/btn_disagree.xml

@@ -8,7 +8,7 @@

    <!-- 填充颜色 -->
    <solid
        android:color="@color/white"        />
        android:color="#FFFFFF"/>

    <!--    边框颜色-->
    <stroke