From 4b926c0badf080fbf3f8e968e9b28228ff3b1f48 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 17:57:01 +0800
Subject: [PATCH] Merge branch 'wjc'
---
.idea/misc.xml | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 613a21b..316fc8d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,26 +3,19 @@
<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/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/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/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/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>
--
Gitblit v1.8.0