blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
123
hxb
2022-11-24 4ec30c4521bad6a7e63b5e6a8b6c867f2a2b3c5b 
 AndroidOpenDemo/.idea/workspace.xml


@@ -17,11 +17,8 @@


  <component name="ChangeListManager">


    <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">


      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/CONST.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/p_bindsuccess/BindSuccessFragment.java" afterDir="false" />


      <change beforePath="$PROJECT_DIR$/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/res/layout/fragment_bind_success.xml" afterDir="false" />


    </list>


    <option name="SHOW_DIALOG" value="false" />


    <option name="HIGHLIGHT_CONFLICTS" value="true" />


@@ -376,46 +373,46 @@


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="469" height="466" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669268288615" />


    <state width="1236" height="164" key="GridCell.Tab.0.bottom" timestamp="1669268575109">


    <state width="1236" height="164" key="GridCell.Tab.0.bottom" timestamp="1669269694237">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669268575109" />


    <state width="1236" height="164" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669269694237" />


    <state width="1236" height="262" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669267473682" />


    <state width="1236" height="164" key="GridCell.Tab.0.center" timestamp="1669268575107">


    <state width="1236" height="164" key="GridCell.Tab.0.center" timestamp="1669269694235">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669268575107" />


    <state width="1236" height="164" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669269694235" />


    <state width="1236" height="262" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669267473681" />


    <state width="1236" height="164" key="GridCell.Tab.0.left" timestamp="1669268575106">


    <state width="1236" height="164" key="GridCell.Tab.0.left" timestamp="1669269694233">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669268575106" />


    <state width="1236" height="164" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669269694233" />


    <state width="1236" height="262" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669267473680" />


    <state width="1236" height="164" key="GridCell.Tab.0.right" timestamp="1669268575108">


    <state width="1236" height="164" key="GridCell.Tab.0.right" timestamp="1669269694236">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669268575108" />


    <state width="1236" height="164" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669269694236" />


    <state width="1236" height="262" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669267473682" />


    <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669268569960">


    <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669269689052">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669268569960" />


    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669268409973" />


    <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669268569958">


    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669269689052" />


    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669268592777" />


    <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669269689051">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669268569958" />


    <state width="1236" height="164" key="GridCell.Tab.1.center/0.23.1280.777@0.23.1280.777" timestamp="1669268409972" />


    <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669268569957">


    <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669269689051" />


    <state width="1236" height="164" key="GridCell.Tab.1.center/0.23.1280.777@0.23.1280.777" timestamp="1669268592777" />


    <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669269689050">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669268569957" />


    <state width="1236" height="164" key="GridCell.Tab.1.left/0.23.1280.777@0.23.1280.777" timestamp="1669268409972" />


    <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669268569959">


    <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669269689050" />


    <state width="1236" height="164" key="GridCell.Tab.1.left/0.23.1280.777@0.23.1280.777" timestamp="1669268592776" />


    <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669269689051">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


    <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669268569959" />


    <state width="1236" height="164" key="GridCell.Tab.1.right/0.23.1280.777@0.23.1280.777" timestamp="1669268409973" />


    <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669269689051" />


    <state width="1236" height="164" key="GridCell.Tab.1.right/0.23.1280.777@0.23.1280.777" timestamp="1669268592777" />


    <state x="332" y="155" width="774" height="490" key="find.popup" timestamp="1669267701624">


      <screen x="0" y="0" width="1280" height="800" />


    </state>


@@ -526,29 +523,29 @@


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java</url>


          <line>107</line>


          <option name="timeStamp" value="129" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java</url>


          <line>114</line>


          <option name="timeStamp" value="130" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/model/DeviceAddModel.java</url>


          <line>346</line>


          <option name="timeStamp" value="131" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/service/DeviceAddService.java</url>


          <line>165</line>


          <option name="timeStamp" value="132" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/DeviceAddOpenApiManager.java</url>


          <line>268</line>


          <option name="timeStamp" value="133" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java</url>


          <line>109</line>


          <option name="timeStamp" value="135" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/presenter/ScanPresenter.java</url>


          <line>107</line>


          <option name="timeStamp" value="136" />


        </line-breakpoint>


        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">


          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/helper/PageNavigationHelper.java</url>


          <line>455</line>


          <option name="timeStamp" value="137" />


        </line-breakpoint>


      </breakpoints>


    </breakpoint-manager>


    <watches-manager>