From 3ea2633e2113e35c431e165b4c94dca66ca191ae Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 30 六月 2023 17:27:37 +0800
Subject: [PATCH] Merge branch 'hxb' into wjc
---
.idea/misc.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 106e635..316fc8d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,15 +4,21 @@
<option name="filePathToZoomLevelMap">
<map>
<entry key="../../../../../layout/custom_preview.xml" value="0.22314814814814815" />
+ <entry key="app/src/main/res/drawable/progress_small.xml" value="0.1275" />
<entry key="app/src/main/res/layout/activity_home_login.xml" value="0.10030395136778116" />
<entry key="app/src/main/res/layout/activity_my_power_station.xml" value="0.10030395136778116" />
<entry key="app/src/main/res/layout/fragment_house_list.xml" value="0.10030395136778116" />
<entry key="app/src/main/res/layout/fragment_me.xml" value="0.10030395136778116" />
- <entry key="app/src/main/res/layout/loading_confirm_input.xml" value="0.10030395136778116" />
+ <entry key="app/src/main/res/layout/frgment_house_list_line.xml" value="0.1921875" />
+ <entry key="app/src/main/res/layout/loading_alert.xml" value="0.1" />
+ <entry key="app/src/main/res/layout/loading_confirm.xml" value="0.1" />
+ <entry key="app/src/main/res/layout/loading_confirm_input.xml" value="0.1" />
+ <entry key="app/src/main/res/layout/loading_exception_log.xml" value="0.1921875" />
+ <entry key="app/src/main/res/layout/toolbar_top_view_44.xml" value="0.1921875" />
<entry key="app/src/main/res/layout/toolbar_top_view_52.xml" value="0.10030395136778116" />
</map>
</option>
</component>
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
--
Gitblit v1.8.0