Merge branch 'master' of http://218.59.175.43:3000/xwj/nsgk_android

 Conflicts:

	app/src/main/AndroidManifest.xml

	app/src/main/java/com/nsgk/ruralWeb/FullscreenActivity.java

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources>
     <!--下边是APP安装后的显示名称文字-->
-    <string name="app_name">银农直连</string>
+    <string name="app_name">宅基地</string>
     <string name="dummy_button">Dummy Button</string>
     <string name="dummy_content">DUMMY\nCONTENT</string>
     <string name="copyright">Copyright © 2024 ZNRX All Rights Reserved.</string>