Merge remote-tracking branch 'origin/master'

.idea/.name

@@ -0,0 +1 @@
+ChaBaiDao

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/example/bpa/app/ICSApp.java

@@ -34,7 +34,7 @@ public class ICSApp extends Application {
 	}
 
 	/**
-	 * 初始化数据库数据
+	 * 初始化数据库数据(DDD)
 	 */
 	public void InitDBdata()
 	{

app/src/main/res/layout/activity_main.xml

@@ -121,6 +121,7 @@
               android:layout_alignParentLeft="true"
               android:layout_alignParentBottom="true"
               android:src="@mipmap/zx"/>
+
           <ImageView
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"