From 950d89112665bead13fa79ae7e37b8addc188ca8 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 13 十月 2020 10:47:43 +0800
Subject: [PATCH] isTriggerByPreSdk set 0:非触发，1：必要触发，2：非必要触发
---
.idea/workspace.xml | 104 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 17 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b625e8f..bd274bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="becdd117-1021-4e06-af58-0f70d982f4ee" name="Default Changelist" comment="">
+<<<<<<< HEAD
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/sdk.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sdk.pb.go" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/sdk.proto" beforeDir="false" afterPath="$PROJECT_DIR$/sdk.proto" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/sysset.pb.go" beforeDir="false" afterPath="$PROJECT_DIR$/sysset.pb.go" afterDir="false" />
+=======
<change beforePath="$PROJECT_DIR$/protomsg.proto" beforeDir="false" afterPath="$PROJECT_DIR$/protomsg.proto" afterDir="false" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -24,12 +31,12 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
- <entry key="proto" value="309" />
+ <entry key="proto" value="352" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
- <entry key="PROTO" value="309" />
+ <entry key="PROTO" value="352" />
</counts>
</usages-collector>
<usages-collector id="statistics.lifecycle.project">
@@ -45,12 +52,20 @@
</session>
</component>
<component name="FileEditorManager">
+<<<<<<< HEAD
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+ <file pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/sdk.proto">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="258">
+ <caret line="75" column="42" lean-forward="true" selection-start-line="75" selection-start-column="42" selection-end-line="75" selection-end-column="42" />
+=======
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="281">
- <caret line="187" column="14" selection-start-line="187" selection-start-column="8" selection-end-line="187" selection-end-column="14" />
+ <state relative-caret-position="319">
+ <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" />
</state>
</provider>
</entry>
@@ -60,16 +75,27 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="8" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
+ <entry file="file://$PROJECT_DIR$/sdk.pb.go">
+=======
<entry file="file://$PROJECT_DIR$/.gitignore">
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
+ <entry file="file://$PROJECT_DIR$/protomsg.proto">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="343">
+ <caret line="180" column="30" selection-start-line="180" selection-start-column="30" selection-end-line="180" selection-end-column="30" />
+=======
<entry file="file://$PROJECT_DIR$/videoperson.proto">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
@@ -81,8 +107,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/protomsg.pb.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="41515">
- <caret line="2192" column="13" selection-start-line="2192" selection-start-column="13" selection-end-line="2192" selection-end-column="13" />
+ <state relative-caret-position="41667">
+ <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" />
<folding>
<element signature="e#96#237#0" expanded="true" />
</folding>
@@ -125,6 +151,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="8" column="27" lean-forward="true" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</state>
</provider>
</entry>
@@ -153,6 +180,9 @@
<option value="$PROJECT_DIR$/videoperson.proto" />
<option value="$PROJECT_DIR$/es.proto" />
<option value="$PROJECT_DIR$/protomsg.proto" />
+<<<<<<< HEAD
+ <option value="$PROJECT_DIR$/sdk.proto" />
+=======
</list>
</option>
</component>
@@ -169,12 +199,13 @@
<option value="$PROJECT_DIR$/.idea/vcs.xml" />
<option value="$PROJECT_DIR$/.idea/misc.xml" />
<option value="$PROJECT_DIR$/.idea/modules.xml" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</list>
</option>
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-448" />
- <option name="y" value="37" />
+ <option name="x" value="8" />
+ <option name="y" value="83" />
<option name="width" value="1678" />
<option name="height" value="1047" />
</component>
@@ -183,6 +214,20 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+<<<<<<< HEAD
+ <pane id="ProjectPane">
+ <subPane>
+ <expand>
+ <path>
+ <item name="protomsg" type="b2602c69:ProjectViewProjectNode" />
+ <item name="protomsg" type="462c0819:PsiDirectoryNode" />
+ </path>
+ </expand>
+ <select />
+ </subPane>
+ </pane>
+=======
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
@@ -208,6 +253,7 @@
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
+ <property name="settings.editor.selected.configurable" value="go.vgo" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
@@ -237,18 +283,22 @@
<workItem from="1564968876353" duration="2244000" />
<workItem from="1565313761365" duration="597000" />
<workItem from="1565337974976" duration="1231000" />
- <workItem from="1565955759598" duration="6515000" />
+ <workItem from="1565955759598" duration="7348000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="35671000" />
+ <option name="totallyTimeSpent" value="36504000" />
</component>
<component name="ToolWindowManager">
- <frame x="-448" y="37" width="1678" height="1047" extended-state="0" />
+ <frame x="8" y="83" width="1678" height="1047" extended-state="0" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31211373" />
+<<<<<<< HEAD
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20064378" />
+=======
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31211373" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
@@ -263,7 +313,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
- <window_info anchor="bottom" id="Terminal" order="8" visible="true" weight="0.3457207" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.30405405" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -280,12 +330,31 @@
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
+<<<<<<< HEAD
+ <component name="VgoProject">
+ <integration-enabled>true</integration-enabled>
+=======
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</component>
<component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/protomsg.proto">
+ <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
+ <state relative-caret-position="343">
+ <caret line="180" column="30" selection-start-line="180" selection-start-column="30" selection-end-line="180" selection-end-column="30" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/sdk.pb.go">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
<entry file="file://$PROJECT_DIR$/sdk.proto">
<provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="258">
+ <caret line="75" column="42" lean-forward="true" selection-start-line="75" selection-start-column="42" selection-end-line="75" selection-end-column="42" />
+=======
<state relative-caret-position="1311">
<caret line="69" column="25" selection-start-line="69" selection-start-column="25" selection-end-line="69" selection-end-column="25" />
</state>
@@ -310,8 +379,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/protomsg.pb.go">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="41515">
- <caret line="2192" column="13" selection-start-line="2192" selection-start-column="13" selection-end-line="2192" selection-end-column="13" />
+ <state relative-caret-position="41667">
+ <caret line="2200" column="13" selection-start-line="2200" selection-start-column="13" selection-end-line="2200" selection-end-column="13" />
<folding>
<element signature="e#96#237#0" expanded="true" />
</folding>
@@ -351,8 +420,9 @@
</entry>
<entry file="file://$PROJECT_DIR$/protomsg.proto">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="281">
- <caret line="187" column="14" selection-start-line="187" selection-start-column="8" selection-end-line="187" selection-end-column="14" />
+ <state relative-caret-position="319">
+ <caret line="195" column="18" selection-start-line="195" selection-start-column="18" selection-end-line="195" selection-end-column="18" />
+>>>>>>> 307d7f825aedebd6e6e5d705c5193c3d1e5116e6
</state>
</provider>
</entry>
--
Gitblit v1.8.0