Merge branch 'dev' of http://172.16.1.23:6688/r/~wxr/HdlToLc into dev

hxb

2022-11-25 2a8632ea01505603ba5b0812995e68efbd0fe249

 AndroidOpenDemo/.idea/workspace.xml

@@ -15,10 +15,10 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/App.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.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$/app/src/main/java/com/utils/HdlToLcUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/HdlToLcUtils.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -57,6 +57,19 @@
                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
                <item name="app" type="2d1252cf:ModuleNode" />
              </path>
              <path>
                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
                <item name="app" type="2d1252cf:ModuleNode" />
                <item name="Tasks" type="e4a08cd1:TasksNode" />
              </path>
              <path>
                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
                <item name="LCAndroidSDKDemo" type="f1a62948:ProjectNode" />
                <item name="app" type="2d1252cf:ModuleNode" />
                <item name="Tasks" type="e4a08cd1:TasksNode" />
                <item name="build" type="c8890929:TasksNode$1" />
              </path>
              <path>
                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
@@ -108,34 +121,29 @@
    <option name="showLibraryContents" value="true" />
  </component>
  <component name="PropertiesComponent">
    <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="M7BBB18B19152766" />
    <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2022-11-21T06:37:44.567Z" />
    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
    <property name="android-custom-view/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx/sources/android-29/android/view/View.java_SELECTED" value="View" />
    <property name="cidr.known.project.marker" value="true" />
    <property name="dart.analysis.tool.window.visible" value="false" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
    <property name="memory.settings.postsync.last.time.stamp" value="1668998991362" />
    <property name="multi-representation-preview/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx/sources/android-29/android/view/View.java_selected" value="Custom views" />
    <property name="last_opened_file_path" value="$PROJECT_DIR$/DeviceAddModule/libs" />
    <property name="memory.settings.postsync.last.time.stamp" value="1669278541025" />
    <property name="project.structure.last.edited" value="Dependencies" />
    <property name="project.structure.proportion" value="0.17" />
    <property name="project.structure.side.proportion" value="0.2" />
    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
    <property name="show.migrate.to.gradle.popup" value="false" />
  </component>
  <component name="PsdUISettings">
    <option name="LAST_EDITED_BUILD_TYPE" value="release" />
  </component>
  <component name="RecentsManager">
    <key name="MoveFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
    </key>
    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
      <recent name="com" />
    </key>
    <key name="CopyClassDialog.RECENTS_KEY">
      <recent name="com.utils" />
      <recent name="com.mm.android.deviceaddmodule.utils" />
    </key>
    <key name="CopyFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
@@ -286,10 +294,10 @@
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <configuration name="AndroidOpenDemo:usermodule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
    <configuration name="AndroidOpenDemo:third-zxing [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
      <ExternalSystemSettings>
        <option name="executionName" />
        <option name="externalProjectPath" value="$PROJECT_DIR$/usermodule" />
        <option name="externalProjectPath" value="$PROJECT_DIR$/third-zxing" />
        <option name="externalSystemIdString" value="GRADLE" />
        <option name="scriptParameters" />
        <option name="taskDescriptions">
@@ -309,9 +317,9 @@
      <list>
        <item itemvalue="Gradle.AndroidOpenDemo:app [assembleRelease]" />
        <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleRelease]" />
        <item itemvalue="Gradle.AndroidOpenDemo:third-zxing [assembleRelease]" />
        <item itemvalue="Gradle.AndroidOpenDemo:app [assembleDebug]" />
        <item itemvalue="Gradle.AndroidOpenDemo:DeviceAddModule [assembleDebug]" />
        <item itemvalue="Gradle.AndroidOpenDemo:usermodule [assembleRelease]" />
      </list>
    </recent_temporary>
  </component>
@@ -347,118 +355,41 @@
    </ignored-roots>
  </component>
  <component name="WindowStateProjectService">
    <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser" timestamp="1669107811029">
    <state width="1236" height="362" key="GridCell.Tab.0.bottom" timestamp="1669368743267">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state x="453" y="91" key="#com.intellij.ide.util.MemberChooser/0.0.1280.800@0.0.1280.800" timestamp="1669107811029" />
    <state x="180" y="331" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog" timestamp="1669107459555">
    <state width="1236" height="362" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669368743267" />
    <state width="1236" height="362" key="GridCell.Tab.0.center" timestamp="1669368743265">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state x="180" y="331" key="#com.intellij.refactoring.move.MoveHandler.SelectRefactoringDialog/0.0.1280.800@0.0.1280.800" timestamp="1669107459555" />
    <state x="326" y="288" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages" timestamp="1669107461906">
    <state width="1236" height="362" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669368743265" />
    <state width="1236" height="362" key="GridCell.Tab.0.left" timestamp="1669368743264">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state x="326" y="288" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages/0.0.1280.800@0.0.1280.800" timestamp="1669107461905" />
    <state width="503" height="480" key="DebuggerActiveHint" timestamp="1669108173504">
    <state width="1236" height="362" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669368743264" />
    <state width="1236" height="362" key="GridCell.Tab.0.right" timestamp="1669368743266">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="503" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669108173504" />
    <state width="462" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669100189203" />
    <state width="1236" height="441" key="GridCell.Tab.0.bottom" timestamp="1669109814728">
    <state width="1236" height="362" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669368743266" />
    <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669279002690">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="441" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669109814728" />
    <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" />
    <state width="1236" height="441" key="GridCell.Tab.0.center" timestamp="1669109814726">
    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669279002690" />
    <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669279002687">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="441" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669109814726" />
    <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" />
    <state width="1236" height="441" key="GridCell.Tab.0.left" timestamp="1669109814725">
    <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669279002687" />
    <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669279002687">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="441" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669109814725" />
    <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" />
    <state width="1236" height="441" key="GridCell.Tab.0.right" timestamp="1669109814726">
    <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669279002687" />
    <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669279002690">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="441" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669109814726" />
    <state width="1236" height="206" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669007123736" />
    <state width="1236" height="287" key="GridCell.Tab.1.bottom" timestamp="1669108419920">
    <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669279002690" />
    <state x="332" y="155" width="774" height="490" key="find.popup" timestamp="1669368850354">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669108419920" />
    <state width="1236" height="287" key="GridCell.Tab.1.center" timestamp="1669108419919">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669108419919" />
    <state width="1236" height="287" key="GridCell.Tab.1.left" timestamp="1669108419918">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669108419918" />
    <state width="1236" height="287" key="GridCell.Tab.1.right" timestamp="1669108419919">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669108419919" />
    <state x="332" y="44" width="769" height="629" key="find.popup" timestamp="1669101340329">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state x="332" y="44" width="769" height="629" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669101340329" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
      <breakpoints>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>jar://$PROJECT_DIR$/DeviceAddModule/libs/lechangeSDK.jar!/com/lechange/opensdk/media/LCOpenSDK_ParamReal.class</url>
          <line>46</line>
          <option name="timeStamp" value="2" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java</url>
          <line>1085</line>
          <option name="timeStamp" value="4" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceSubAccountListService.java</url>
          <line>19</line>
          <option name="timeStamp" value="11" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
          <line>112</line>
          <option name="timeStamp" value="21" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
          <line>108</line>
          <option name="timeStamp" value="26" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.java</url>
          <line>237</line>
          <option name="timeStamp" value="40" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/common/openapi/DeviceInfoOpenApiManager.java</url>
          <line>77</line>
          <option name="timeStamp" value="61" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpSend.java</url>
          <line>187</line>
          <option name="timeStamp" value="84" />
        </line-breakpoint>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/adapter/DeviceListAdapter.java</url>
          <line>48</line>
          <option name="timeStamp" value="92" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>
    <watches-manager>
      <configuration name="app">
        <watch expression="LCDeviceEngine.newInstance().subAccessToken" language="JAVA" />
      </configuration>
    </watches-manager>
    <state x="332" y="155" width="774" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669368850354" />
  </component>
</project>