From 2a8632ea01505603ba5b0812995e68efbd0fe249 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 25 十一月 2022 17:44:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://172.16.1.23:6688/r/~wxr/HdlToLc into dev
---
AndroidOpenDemo/.idea/misc.xml | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/AndroidOpenDemo/.idea/misc.xml b/AndroidOpenDemo/.idea/misc.xml
index 17007bd..74c7ee0 100644
--- a/AndroidOpenDemo/.idea/misc.xml
+++ b/AndroidOpenDemo/.idea/misc.xml
@@ -3,16 +3,18 @@
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
<map>
- <entry key="../../../../../layout/custom_preview.xml" value="0.33645833333333336" />
- <entry key="DeviceAddModule/src/main/res/layout/activity_device_add.xml" value="0.16666666666666666" />
- <entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.16666666666666666" />
- <entry key="app/src/main/res/layout/activity_device_list.xml" value="0.16666666666666666" />
- <entry key="app/src/main/res/layout/activity_device_online_media_play.xml" value="0.16666666666666666" />
- <entry key="app/src/main/res/layout/activity_device_record_list.xml" value="0.17552083333333332" />
- <entry key="app/src/main/res/layout/fragment_device_detail_main.xml" value="0.17552083333333332" />
- <entry key="app/src/main/res/layout/item_device_list.xml" value="0.17552083333333332" />
+ <entry key="DeviceAddModule/src/main/res/layout/activity_device_add.xml" value="0.13722826086956522" />
+ <entry key="DeviceAddModule/src/main/res/layout/fragment_scan.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/drawable/transparent_divider.xml" value="0.165" />
+ <entry key="app/src/main/res/layout/activity_capture.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/layout/activity_device_detail.xml" value="0.13722826086956522" />
+ <entry key="app/src/main/res/layout/activity_device_list.xml" value="0.13949275362318841" />
+ <entry key="app/src/main/res/layout/activity_device_online_media_play.xml" value="0.25" />
+ <entry key="app/src/main/res/layout/fragment_device_detail_main.xml" value="0.15572916666666667" />
+ <entry key="app/src/main/res/layout/fragment_device_detail_name.xml" value="0.15572916666666667" />
</map>
</option>
</component>
+ <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
--
Gitblit v1.8.0