2ee0de35fd9b32180b370faf8ce0f3968a32d8fa..2a8632ea01505603ba5b0812995e68efbd0fe249
2022-11-25 hxb
Merge branch 'dev' of http://172.16.1.23:6688/r/~wxr/HdlToLc into dev
2a8632 对比 | 目录
2022-11-25 hxb
合并代码
49c135 对比 | 目录
2022-11-25 hxb
隐藏掉版本信息
bbe392 对比 | 目录
1个文件已添加
4个文件已修改
99 ■■■■■ 已修改文件
AndroidOpenDemo/.idea/gradle.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AndroidOpenDemo/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AndroidOpenDemo/.idea/workspace.xml 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
AndroidOpenDemo/.idea/gradle.xml
@@ -4,7 +4,7 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
        <option name="testRunner" value="GRADLE" />
        <option name="testRunner" value="PLATFORM" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
        <option name="gradleJvm" value="1.8" />
@@ -17,6 +17,7 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
AndroidOpenDemo/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml
New file
@@ -0,0 +1,11 @@
<component name="libraryTable">
  <library name="Gradle: org.greenrobot:eventbus:3.0.0">
    <CLASSES>
      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/ddd99896e9569eaababbe81b35d80e1b91c4ad85/eventbus-3.0.0.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES>
      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.greenrobot/eventbus/3.0.0/777f0a941d3dd0f9988d4f22b42b36ce2fe64ea4/eventbus-3.0.0-sources.jar!/" />
    </SOURCES>
  </library>
</component>
AndroidOpenDemo/.idea/workspace.xml
@@ -14,24 +14,18 @@
    <option name="autoReloadType" value="NONE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="043706f3-1ad4-46a8-824f-407f7d64557c" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_02.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
    <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/callBack/IAddCamera.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/callBack/IAddCamera.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceOnlineMediaPlayActivity.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/DeviceUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/utils/DeviceUtils.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_main.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_device_detail_name.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
    <option name="LAST_RESOLUTION" value="IGNORE" />
  </component>
  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[364c4b3158493098]" />
  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[M7BBB18B19152766]" />
  <component name="ExternalProjectsData">
    <projectState path="$PROJECT_DIR$">
      <ProjectState />
@@ -145,18 +139,18 @@
    <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="CopyFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
      <recent name="$PROJECT_DIR$/app/src/main/java/com/hdl" />
      <recent name="$PROJECT_DIR$/app/src/main/res/drawable" />
      <recent name="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi" />
      <recent name="$PROJECT_DIR$/app/src/main/res/layout" />
    </key>
    <key name="MoveFile.RECENT_KEYS">
      <recent name="$PROJECT_DIR$/DeviceAddModule/libs" />
    </key>
    <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
      <recent name="com" />
    </key>
  </component>
  <component name="RunManager" selected="Android App.app">
@@ -175,7 +169,6 @@
      <option name="ARTIFACT_NAME" value="" />
      <option name="PM_INSTALL_OPTIONS" value="" />
      <option name="ALL_USERS" value="false" />
      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
      <option name="MODE" value="default_activity" />
@@ -183,7 +176,6 @@
      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
      <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
      <option name="FORCE_STOP_RUNNING_APP" value="true" />
      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -242,9 +234,7 @@
        </option>
        <option name="vmOptions" />
      </ExternalSystemSettings>
      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
      <DebugAllEnabled>false</DebugAllEnabled>
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <configuration name="AndroidOpenDemo:DeviceAddModule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -263,9 +253,7 @@
        </option>
        <option name="vmOptions" />
      </ExternalSystemSettings>
      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
      <DebugAllEnabled>false</DebugAllEnabled>
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <configuration name="AndroidOpenDemo:app [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -284,9 +272,7 @@
        </option>
        <option name="vmOptions" />
      </ExternalSystemSettings>
      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
      <DebugAllEnabled>false</DebugAllEnabled>
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <configuration name="AndroidOpenDemo:app [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -305,9 +291,7 @@
        </option>
        <option name="vmOptions" />
      </ExternalSystemSettings>
      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
      <DebugAllEnabled>false</DebugAllEnabled>
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <configuration name="AndroidOpenDemo:third-zxing [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
@@ -326,9 +310,7 @@
        </option>
        <option name="vmOptions" />
      </ExternalSystemSettings>
      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
      <DebugAllEnabled>false</DebugAllEnabled>
      <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled>
      <method v="2" />
    </configuration>
    <recent_temporary>
@@ -341,7 +323,7 @@
      </list>
    </recent_temporary>
  </component>
  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" />
  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
  <component name="SvnConfiguration">
    <configuration />
  </component>
@@ -373,22 +355,22 @@
    </ignored-roots>
  </component>
  <component name="WindowStateProjectService">
    <state width="1236" height="607" key="GridCell.Tab.0.bottom" timestamp="1669342111796">
    <state width="1236" height="362" key="GridCell.Tab.0.bottom" timestamp="1669368743267">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="607" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669342111796" />
    <state width="1236" height="607" key="GridCell.Tab.0.center" timestamp="1669342111794">
    <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 width="1236" height="607" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669342111794" />
    <state width="1236" height="607" key="GridCell.Tab.0.left" timestamp="1669342111793">
    <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 width="1236" height="607" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669342111793" />
    <state width="1236" height="607" key="GridCell.Tab.0.right" timestamp="1669342111795">
    <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="1236" height="607" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669342111795" />
    <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>
@@ -405,19 +387,9 @@
      <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="1669279002690" />
    <state x="332" y="155" width="774" height="490" key="find.popup" timestamp="1669341753355">
    <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 x="332" y="155" width="774" height="490" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669341753355" />
  </component>
  <component name="XDebuggerManager">
    <watches-manager>
      <configuration name="app">
        <watch expression="tvDeviceName.getText()" language="JAVA" />
        <watch expression="bundle.getString(&quot;titleText&quot;)" language="JAVA" />
        <watch expression="bundle" language="JAVA" />
        <watch expression="deviceListBean.name" 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>
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/DeviceDetailMainFragment.java
@@ -229,6 +229,7 @@
    }
    public void gotoUpdatePage(FragmentActivity fragmentActivity) {
        if(true){return;}
        if (fragmentActivity == null || fragmentActivity.getSupportFragmentManager() == null) {
            return;
        }
AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java
@@ -71,8 +71,8 @@
        HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");
        HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
        HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJlNzgyZmI3NjRlODM0ZGQ5YjhmNGFlNjM1NGY5M2FhZiIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkzNDg1OTUsIm5iZiI6MTY2OTM0MTM5NX0.EAfKArNvCXCheF6_ycqenkgfWZkxMjI3rSRwre6JShNuJF2jH9YeffhvpvDV3EYHIYUPk8KRev6Ekctzjh7xm7sRPg5f_894JEbiM9HtMvdQijVdq5cV5XjLVaEYCbYXJcR121Cm6aNZt-S0EAun8aT3bPPyNC4XRfassMMSSaY");
        HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a");
        HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJiMmYwMTAzYmU4OTM0MmVkYmM0ZTNiM2ZkZGZmOGU1NSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkzNzUxMDUsIm5iZiI6MTY2OTM2NzkwNX0.GRAs6PQxyQrUswj_svLXVDKcmZ679OovaypAMtJiHr8zK6E3Y_DeBUl5S2KjyLXjMetXPgV3Qtpcg3oZqGCzvK5-koBWHwkdbas6C2Z6NVqbGYC-w5qOzY2eUm9zQg8Kz0B9f5TaZYORVeHQr0QgcVTBmrmqT11ZVCH248VxJAQ");
        HdlToLcUtils.getInstance().setSubAccessToken("St_00009ed748c2b03f4100b6ea97a37466");
//        HdlToLcUtils.getInstance().openActivity();
        HdlToLcUtils.getInstance().addCamera(new IAddCamera() {