完善

hxb

2022-11-23 d3c787f75211fda9ea84a4709d5ab9528a0a68a6

完善

 AndroidOpenDemo/.DS_Store

Binary files differ

 AndroidOpenDemo/.idea/caches/build_file_checksums.ser

Binary files differ

 AndroidOpenDemo/.idea/workspace.xml

@@ -6,18 +6,22 @@
    </shared>
  </component>
  <component name="AndroidLogFilters">
    <option name="TOOL_WINDOW_CUSTOM_FILTER" value="HttpSend" />
    <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
    <option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
  </component>
  <component name="AutoImportSettings">
    <option name="autoReloadType" value="NONE" />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment="">
      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/callBack/IAddCamera.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/app/AndroidManifest123456.xml" beforeDir="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" />
      <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/activity_device_online_media_play.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_device_online_media_play.xml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,6 +60,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" />
@@ -117,7 +134,7 @@
    <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="memory.settings.postsync.last.time.stamp" value="1669194142378" />
    <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="project.structure.last.edited" value="Dependencies" />
    <property name="project.structure.proportion" value="0.17" />
@@ -362,51 +379,51 @@
      <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="503" height="480" key="DebuggerActiveHint" timestamp="1669195478136">
      <screen x="0" y="23" width="1280" height="777" />
    </state>
    <state width="503" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669194412110" />
    <state width="503" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669195478136" />
    <state width="1236" height="164" key="GridCell.Tab.0.bottom" timestamp="1669195789335">
      <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="287" key="GridCell.Tab.0.bottom" timestamp="1669169757071">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669169757071" />
    <state width="1236" height="164" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669195789335" />
    <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" />
    <state width="1236" height="287" key="GridCell.Tab.0.center" timestamp="1669169757070">
    <state width="1236" height="164" key="GridCell.Tab.0.center" timestamp="1669195789334">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669169757070" />
    <state width="1236" height="164" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669195789333" />
    <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" />
    <state width="1236" height="287" key="GridCell.Tab.0.left" timestamp="1669169757069">
    <state width="1236" height="164" key="GridCell.Tab.0.left" timestamp="1669195789333">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669169757069" />
    <state width="1236" height="164" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669195789333" />
    <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" />
    <state width="1236" height="287" key="GridCell.Tab.0.right" timestamp="1669169757070">
    <state width="1236" height="164" key="GridCell.Tab.0.right" timestamp="1669195789334">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state width="1236" height="287" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669169757070" />
    <state width="1236" height="164" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669195789334" />
    <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="1669169757073">
    <state width="1236" height="164" key="GridCell.Tab.1.bottom" timestamp="1669195789336">
      <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="1669169757073" />
    <state width="1236" height="287" key="GridCell.Tab.1.center" timestamp="1669169757072">
    <state width="1236" height="164" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
    <state width="1236" height="164" key="GridCell.Tab.1.center" timestamp="1669195789336">
      <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="1669169757072" />
    <state width="1236" height="287" key="GridCell.Tab.1.left" timestamp="1669169757071">
    <state width="1236" height="164" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
    <state width="1236" height="164" key="GridCell.Tab.1.left" timestamp="1669195789335">
      <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="1669169757071" />
    <state width="1236" height="287" key="GridCell.Tab.1.right" timestamp="1669169757072">
    <state width="1236" height="164" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669195789335" />
    <state width="1236" height="164" key="GridCell.Tab.1.right" timestamp="1669195789336">
      <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="1669169757072" />
    <state x="215" y="44" width="1065" height="629" key="find.popup" timestamp="1669110842331">
    <state width="1236" height="164" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669195789336" />
    <state x="215" y="44" width="1065" height="629" key="find.popup" timestamp="1669195142751">
      <screen x="0" y="0" width="1280" height="800" />
    </state>
    <state x="215" y="44" width="1065" height="629" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669110842331" />
    <state x="215" y="44" width="1065" height="629" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669195142751" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
@@ -452,19 +469,14 @@
          <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>
        <line-breakpoint enabled="true" suspend="THREAD" type="java-line">
          <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceRecordListActivity.java</url>
          <line>36</line>
          <option name="timeStamp" value="94" />
        </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>410</line>
          <option name="timeStamp" value="98" />
          <line>411</line>
          <option name="timeStamp" value="103" />
        </line-breakpoint>
      </breakpoints>
    </breakpoint-manager>

 AndroidOpenDemo/app/AndroidManifest123456.xml

File was deleted

 AndroidOpenDemo/app/src/main/java/com/.DS_Store

Binary files differ

 AndroidOpenDemo/app/src/main/java/com/lechange/demo/.DS_Store

Binary files differ

 AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java

@@ -70,10 +70,10 @@
        HdlToLcUtils.getInstance().initData(this, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "https://test-gz.hdlcontrol.com");

        HdlToLcUtils.getInstance().setHomeId("1547099040465408002");
        HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiIxYTNiZjA4M2I3ZTc0NDJjYjM0Y2RhMGFhOGViZTFhOSIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkxMTcwMDcsIm5iZiI6MTY2OTEwOTgwN30.bwBRv568IiwkmdRJSt6aRYny5cd3eMqLXP8gal03z1d8O6FPsrLwlTi7VXIBeulg6Qie1GKUUI28cGrEuGWpWwOiJFsoYl1r04ycCuGf2NqbCOOM8hxbUkhehY7H91v9b_mCF0zQDIQXowT6BvcOMoMsqIWVIz-QMRG8OQICB7k");
        HdlToLcUtils.getInstance().setToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI0YTJhNzZiYTUxNzU0ZmFmODZlYjhhNDZiODUzZWRjMCIsImNvbXBhbnlJZCI6IjIwMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiJ3eHIiLCJ0ZW5hbnRJZCI6IjIwIiwidXNlclR5cGUiOiJVU0VSX0IiLCJ0b2tlblR5cGUiOiJhY2Nlc3NfdG9rZW4iLCJ1c2VyTmFtZSI6Ind4ciIsIm9wZW5BcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzOTIwMzU1NjgyMDQ0MjMxNjkiLCJleHAiOjE2NjkyMDEzODYsIm5iZiI6MTY2OTE5NDE4Nn0.jlXwyCbdy41f4tkObmnKup6r2xGRzk5fLtHfNgaNSdJ6deyzKFVLQcDH3FMW_AntAo2ghkTQLZGnMXt8k7uoC0fa6XLHA8bTNYvjx4-2X1ky2FMcvv_sDTmmPMo6EbqOeRNkCoiLly2iTB4Ch6FJRSQo0UFkpOJtJJuCCo92B5c");
        HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a");

        //HdlToLcUtils.getInstance().openActivity();
//        HdlToLcUtils.getInstance().openActivity();
        //HdlToLcUtils.getInstance().addCamera();
        HdlToLcUtils.getInstance().play("8F05F83AAG05B3A");


 AndroidOpenDemo/app/src/main/java/com/utils/DeviceUtils.java

@@ -28,7 +28,7 @@
    public DeviceUtils(String deviceId){
        this.deviceId=deviceId;
    }
    private List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();
    private static List<DeviceDetailListData.ResponseData.DeviceListBean> datas = new ArrayList<>();

    private void getDeviceList() {
        DeviceSubAccountListService deviceSubAccountListService = ClassInstanceManager.newInstance().getDeviceSubAccountListService();
@@ -36,22 +36,21 @@
    }

    public void play() {
        if (datas.size() == 0) {
            getDeviceList();
        } else {
            for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
                if (deviceListBean.deviceId.equals(deviceId)) {
                    if (!deviceListBean.status.equals("online")) {
                        return;
                    }
                    Bundle bundle = new Bundle();
                    bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                    Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                    intent.putExtras(bundle);
                    HdlToLcUtils.getInstance().getActivity().startActivity(intent);
        for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
            if (deviceListBean.deviceId.equals(deviceId)) {
                if (!deviceListBean.status.equals("online")) {
                    return;
                }
                Bundle bundle = new Bundle();
                bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                intent.putExtras(bundle);
                HdlToLcUtils.getInstance().getActivity().startActivity(intent);

                return;
            }
        }
        getDeviceList();
    }
    @Override
    public void DeviceList(DeviceDetailListData.Response responseData) {
@@ -73,7 +72,20 @@

        datas.addAll(responseData.data.deviceList);

        play();
        for (DeviceDetailListData.ResponseData.DeviceListBean deviceListBean : datas) {
            if (deviceListBean.deviceId.equals(deviceId)) {
                if (!deviceListBean.status.equals("online")) {
                    return;
                }
                Bundle bundle = new Bundle();
                bundle.putSerializable(MethodConst.ParamConst.deviceDetail, deviceListBean);
                Intent intent = new Intent(HdlToLcUtils.getInstance().getActivity(), DeviceOnlineMediaPlayActivity.class);
                intent.putExtras(bundle);
                HdlToLcUtils.getInstance().getActivity().startActivity(intent);

                return;
            }
        }
    }
    @Override
    public void onError(Throwable throwable) {

 AndroidOpenDemo/app/src/main/res/.DS_Store

Binary files differ

 AndroidOpenDemo/app/src/main/res/layout/activity_device_online_media_play.xml

@@ -338,6 +338,7 @@
    </LinearLayout>



    <FrameLayout

        android:visibility="gone"

        android:layout_below="@id/ll_controller"

        android:id="@+id/fr_record"

        android:layout_width="match_parent"