From 75c900c4521d53c00efd47365d5270863a712060 Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 19 六月 2023 10:30:36 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
.idea/misc.xml | 34 ++++++++--------------------------
1 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 19f8f00..fd5a617 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,34 +3,16 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
- <entry key="../../../../../layout/custom_preview.xml" value="0.22923076923076924" />
- <entry key="../../../.gradle/caches/transforms-2/files-2.1/7c2cbaa925629e10707989293f119941/jetified-zxing-android-embedded-3.4.0/res/layout/zxing_barcode_scanner.xml" value="0.20625" />
- <entry key="../../../.gradle/caches/transforms-2/files-2.1/7c2cbaa925629e10707989293f119941/jetified-zxing-android-embedded-3.4.0/res/layout/zxing_capture.xml" value="0.20625" />
- <entry key="app/src/main/res/drawable/bg_load_dialog.xml" value="0.1275" />
- <entry key="app/src/main/res/drawable/progress_small.xml" value="0.1275" />
- <entry key="app/src/main/res/drawable/progress_small1.xml" value="0.1275" />
- <entry key="app/src/main/res/layout/activity_1.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_123.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_capture.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_fast_scan.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_home_login.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_my_power_station.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/activity_new_capture.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/fragment_house_list.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/fragment_me.xml" value="0.1" />
- <entry key="app/src/main/res/layout/frgment_house_list_line.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/loading_alert.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/loading_alert1.xml" value="0.1" />
- <entry key="app/src/main/res/layout/toolbar_top_view_52.xml" value="0.20625" />
- <entry key="app/src/main/res/layout/toolbar_top_view_53.xml" value="0.20625" />
- <entry key="third-zxing/src/main/res/drawable/transparent_divider.xml" value="0.1275" />
- <entry key="third-zxing/src/main/res/layout/activity_capture.xml" value="0.20625" />
- <entry key="third-zxing/src/main/res/layout/toolbar.xml" value="0.20625" />
- <entry key="third-zxing/src/main/res/layout/toolbar_top_view.xml" value="0.20625" />
- <entry key="third-zxing/src/main/res/layout/toolbar_top_view_52.xml" value="0.20625" />
+ <entry key="../../../../../layout/custom_preview.xml" value="0.22314814814814815" />
+ <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.1" />
+ <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" default="true" project-jdk-name="11" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
--
Gitblit v1.8.0