Revert "Revert "Merge branch 'hxb' into wjc""

wjc

2023-06-28 14de918a79943e4961b09fa01ed320c6cad41f2e

 .gitignore

@@ -46,4 +46,6 @@
*.log
.idea/libraries/Gradle__com_bulong_rudeness_rudeness_0_1_4_aar.xml
.DS_Store
app/.DS_Store
app/.DS_Store

local.properties