From 2c92c137111035cf4b6e2e36010566baa450b6fc Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 06 十二月 2022 17:14:24 +0800 Subject: [PATCH] 应用启动分支 --- AndroidOpenDemo/.idea/workspace.xml | 269 +++++++++++------------------------------------------ 1 files changed, 55 insertions(+), 214 deletions(-) diff --git a/AndroidOpenDemo/.idea/workspace.xml b/AndroidOpenDemo/.idea/workspace.xml index 1a0cbda..76645ac 100644 --- a/AndroidOpenDemo/.idea/workspace.xml +++ b/AndroidOpenDemo/.idea/workspace.xml @@ -6,7 +6,7 @@ </shared> </component> <component name="AndroidLogFilters"> - <option name="TOOL_WINDOW_CUSTOM_FILTER" value="reqest: " /> + <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,100 +15,15 @@ </component> <component name="ChangeListManager"> <list default="true" id="7bacc5cf-316f-4ad4-b191-7f5297eb7bcf" name="Default Changelist" comment=""> - <change afterPath="$PROJECT_DIR$/../.idea/HdlToLc.iml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHMobileToolset_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_DHScanner_1_0_7_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_PullToRefreshListView_release_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_imageload4dh_jar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____DeviceAddModule_libs_lechangeSDK_jar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____third_zxing_libs_zxing_3_3_0_jar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_runtime_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_alibaba_arouter_annotation_1_0_6.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_alibaba_arouter_api_1_4_1_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_appcompat_v7_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_asynclayoutinflater_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cardview_v7_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_1_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_0.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_coordinatorlayout_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_cursoradapter_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_customview_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_design_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_documentfile_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_drawerlayout_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_interpolator_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_loader_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_localbroadcastmanager_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_print_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_recyclerview_v7_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_slidingpanelayout_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_compat_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_ui_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_core_utils_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_fragment_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_media_compat_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_v4_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_vector_drawable_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_swiperefreshlayout_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_3_0_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_2_2_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_idling_resource_3_0_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_exposed_instrumentation_api_publish_0_5_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_monitor_1_0_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_rules_0_5_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_0_5_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_test_runner_1_0_2_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_transition_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_versionedparcelable_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_viewpager_28_0_0_aar.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_annotation_javax_annotation_api_1_2.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml" afterDir="false" /> - <change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_8.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_0.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_greenrobot_eventbus_3_0_0.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/DeviceAddModule/LCAndroidSDKDemo.DeviceAddModule.iml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/modules/LCAndroidSDKDemo.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/LCAndroidSDKDemo.iml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/LCAndroidSDKDemo.app.iml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/third-zxing/LCAndroidSDKDemo.third-zxing.iml" afterDir="false" /> <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/LCDeviceEngine.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/LCDeviceEngine.java" 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/HttpClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/DeviceAddModule/src/main/java/com/mm/android/deviceaddmodule/openapi/HttpClient.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$/app/src/main/java/com/hdl/HdlToLc.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/hdl/HdlToLc.java" 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/DeviceListActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceListActivity.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/res/layout/activity_device_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_device_list.xml" 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/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.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[M7BBB18B19152766]" /> <component name="ExternalProjectsData"> <projectState path="$PROJECT_DIR$"> <ProjectState /> @@ -140,6 +55,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" /> @@ -191,43 +119,39 @@ <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$/app/src/main/res/layout" /> + <property name="memory.settings.postsync.last.time.stamp" value="1670203339524" /> <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="MoveClassesOrPackagesDialog.RECENTS_KEY"> - <recent name="com" /> - </key> - <key name="CopyClassDialog.RECENTS_KEY"> - <recent name="com.mm.android.deviceaddmodule.utils" /> - </key> <key name="CopyFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/app/src/main/res/layout" /> <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"> + <component name="RunManager" selected="Gradle.AndroidOpenDemo:app [assembleRelease]"> <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit"> <option name="TEST_OBJECT" value="class" /> <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> @@ -243,6 +167,7 @@ <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" /> @@ -250,6 +175,7 @@ <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="" /> @@ -308,7 +234,9 @@ </option> <option name="vmOptions" /> </ExternalSystemSettings> - <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> <method v="2" /> </configuration> <configuration name="AndroidOpenDemo:DeviceAddModule [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> @@ -327,7 +255,9 @@ </option> <option name="vmOptions" /> </ExternalSystemSettings> - <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> <method v="2" /> </configuration> <configuration name="AndroidOpenDemo:app [assembleDebug]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> @@ -346,7 +276,9 @@ </option> <option name="vmOptions" /> </ExternalSystemSettings> - <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> <method v="2" /> </configuration> <configuration name="AndroidOpenDemo:app [assembleRelease]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> @@ -365,13 +297,15 @@ </option> <option name="vmOptions" /> </ExternalSystemSettings> - <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> <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"> @@ -384,20 +318,22 @@ </option> <option name="vmOptions" /> </ExternalSystemSettings> - <GradleScriptDebugEnabled>true</GradleScriptDebugEnabled> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> <method v="2" /> </configuration> <recent_temporary> <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> - <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" /> + <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="false" /> <component name="SvnConfiguration"> <configuration /> </component> @@ -428,111 +364,16 @@ <path value="$PROJECT_DIR$" /> </ignored-roots> </component> - <component name="WindowStateProjectService"> - <state width="462" height="480" key="DebuggerActiveHint" timestamp="1669096140301"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="462" height="480" key="DebuggerActiveHint/0.0.1280.800@0.0.1280.800" timestamp="1669096140301" /> - <state width="462" height="480" key="DebuggerActiveHint/0.23.1280.777@0.23.1280.777" timestamp="1669094959255" /> - <state width="1236" height="288" key="GridCell.Tab.0.bottom" timestamp="1669096558156"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.0.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669096558156" /> - <state width="1236" height="206" key="GridCell.Tab.0.bottom/0.23.1280.777@0.23.1280.777" timestamp="1669007123738" /> - <state width="1236" height="288" key="GridCell.Tab.0.center" timestamp="1669096558153"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.0.center/0.0.1280.800@0.0.1280.800" timestamp="1669096558153" /> - <state width="1236" height="206" key="GridCell.Tab.0.center/0.23.1280.777@0.23.1280.777" timestamp="1669007123735" /> - <state width="1236" height="288" key="GridCell.Tab.0.left" timestamp="1669096558151"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.0.left/0.0.1280.800@0.0.1280.800" timestamp="1669096558151" /> - <state width="1236" height="206" key="GridCell.Tab.0.left/0.23.1280.777@0.23.1280.777" timestamp="1669007123734" /> - <state width="1236" height="288" key="GridCell.Tab.0.right" timestamp="1669096558154"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.0.right/0.0.1280.800@0.0.1280.800" timestamp="1669096558154" /> - <state width="1236" height="206" key="GridCell.Tab.0.right/0.23.1280.777@0.23.1280.777" timestamp="1669007123736" /> - <state width="1236" height="288" key="GridCell.Tab.1.bottom" timestamp="1669096558161"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.1.bottom/0.0.1280.800@0.0.1280.800" timestamp="1669096558161" /> - <state width="1236" height="288" key="GridCell.Tab.1.center" timestamp="1669096558159"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.1.center/0.0.1280.800@0.0.1280.800" timestamp="1669096558159" /> - <state width="1236" height="288" key="GridCell.Tab.1.left" timestamp="1669096558158"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.1.left/0.0.1280.800@0.0.1280.800" timestamp="1669096558158" /> - <state width="1236" height="288" key="GridCell.Tab.1.right" timestamp="1669096558160"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state width="1236" height="288" key="GridCell.Tab.1.right/0.0.1280.800@0.0.1280.800" timestamp="1669096558160" /> - <state x="332" y="155" width="769" height="518" key="find.popup" timestamp="1669086559935"> - <screen x="0" y="0" width="1280" height="800" /> - </state> - <state x="332" y="155" width="769" height="518" key="find.popup/0.0.1280.800@0.0.1280.800" timestamp="1669086559935" /> - </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/lechange/demo/ui/DeviceLocalRecordListFragment.java</url> - <line>295</line> - <option name="timeStamp" value="47" /> - </line-breakpoint> - <line-breakpoint enabled="true" suspend="THREAD" type="java-line"> - <url>file://$PROJECT_DIR$/app/src/main/java/com/lechange/demo/ui/DeviceLocalRecordListFragment.java</url> - <line>301</line> - <option name="timeStamp" value="48" /> - </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>148</line> - <option name="timeStamp" value="71" /> - </line-breakpoint> - </breakpoints> - </breakpoint-manager> <watches-manager> <configuration name="app"> - <watch expression="LCDeviceEngine.newInstance().subAccessToken" language="JAVA" /> + <watch expression="openApi" language="JAVA" /> + <watch expression="new Gson().fromJson(openApi,JsonObject.class);" language="JAVA" /> + <watch expression="e.getMessage()" language="JAVA" /> + <watch expression="exception" language="JAVA" /> + <watch expression="jsonResult.get("msg").getAsString()" language="JAVA" /> + <watch expression="jsonObject" language="JAVA" /> + <watch expression="jsonResult.get("code").getAsString()" language="JAVA" /> </configuration> </watches-manager> </component> -- Gitblit v1.8.0