Merge remote-tracking branch 'origin/master'

cloudroam

2025-04-01 1831c2a6304496729fc16af624c37e299beae83e

 gradle.properties

@@ -35,5 +35,5 @@
android.precompileDependenciesResources=false
android.enableJetifier=true
#android.enableD8=true
org.gradle.java.home=D\:\\devInstall\\java\\jdk-17.0.12
org.gradle.java.home=D\:\\tanjiyaun\\jdk\\jdk1.8\\jdk-17.0.12