From 6d4270227ca513f74d3fccc4ee3a0c0633e707d4 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期三, 23 十一月 2022 10:24:41 +0800 Subject: [PATCH] 打包库前 --- AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java | 3 + AndroidOpenDemo/.idea/workspace.xml | 53 ++++++++++++++++---------- AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java | 2 AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java | 11 +++++ 4 files changed, 47 insertions(+), 22 deletions(-) diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml index 3079c58..19293bc 100644 --- a/AndroidOpenDemo/.idea/workspace.xml +++ b/AndroidOpenDemo/.idea/workspace.xml @@ -6,7 +6,6 @@ </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" /> </component> @@ -15,8 +14,8 @@ </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/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/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> @@ -355,6 +354,10 @@ <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="276" width="628" height="256" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes" timestamp="1669169928930"> + <screen x="0" y="0" width="1280" height="800" /> + </state> + <state x="326" y="276" width="628" height="256" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.classes/0.0.1280.800@0.0.1280.800" timestamp="1669169928930" /> <state x="326" y="288" key="#com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesDialog.packages" timestamp="1669107461906"> <screen x="0" y="0" width="1280" height="800" /> </state> @@ -364,46 +367,46 @@ </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="287" key="GridCell.Tab.0.bottom" timestamp="1669169757071"> <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="287" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669169757071" /> <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="287" key="GridCell.Tab.0.center" timestamp="1669169757070"> <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="287" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669169757070" /> <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="287" key="GridCell.Tab.0.left" timestamp="1669169757069"> <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="287" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669169757069" /> <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="287" key="GridCell.Tab.0.right" timestamp="1669169757070"> <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="287" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669169757070" /> <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="287" key="GridCell.Tab.1.bottom" timestamp="1669169757073"> <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"> + <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"> <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"> + <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"> <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"> + <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"> <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"> + <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"> <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" /> + <state x="215" y="44" width="1065" height="629" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669110842331" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -453,6 +456,16 @@ <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-breakpoint> </breakpoints> </breakpoint-manager> <watches-manager> diff --git a/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java b/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java new file mode 100644 index 0000000..e2b4b94 --- /dev/null +++ b/AndroidOpenDemo/app/src/main/java/com/callBack/IAddCamera.java @@ -0,0 +1,11 @@ +package com.callBack; + +public interface IAddCamera { + void success(String deviceId); + /** + * 閿欒鍥炶皟 + * + * @param errMsg + */ + void onError(String errMsg); +} diff --git a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java index ffe7386..0b65c32 100644 --- a/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java +++ b/AndroidOpenDemo/app/src/main/java/com/lechange/demo/ui/EnvGuideActivity.java @@ -74,7 +74,7 @@ HdlToLcUtils.getInstance().setSubAccessToken("St_00003ee84eda32b14126af958052f20a"); //HdlToLcUtils.getInstance().openActivity(); - //HdlToLcUtils.getInstance().AddCamera(); + //HdlToLcUtils.getInstance().addCamera(); HdlToLcUtils.getInstance().play("8F05F83AAG05B3A"); } diff --git a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java index fce5f7a..602d5f4 100644 --- a/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java +++ b/AndroidOpenDemo/app/src/main/java/com/utils/HdlToLcUtils.java @@ -8,6 +8,7 @@ import android.support.v4.app.ActivityCompat; import android.widget.Toast; +import com.callBack.IAddCamera; import com.common.openapi.ClassInstanceManager; import com.lechange.demo.tools.MediaPlayHelper; import com.mm.android.deviceaddmodule.CommonParam; @@ -90,7 +91,7 @@ } } - public void addCamera() { + public void addCamera(IAddCamera iAddCamera) { //寮�鍚坊鍔犻〉闈� activity.startActivity(new Intent(activity.getApplication(), DeviceAddActivity.class)); } -- Gitblit v1.8.0