Merge branch 'wjc'

wjc

2023-06-19 a1ac20d9cbe90b566bffe3ed39a6e07700c3248f

 .idea/misc.xml

@@ -3,10 +3,16 @@
  <component name="DesignSurface">
    <option name="filePathToZoomLevelMap">
      <map>
        <entry key="app/src/main/res/layout/activity_my_power_station.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>