|
|
@@ -101,7 +101,44 @@
|
|
|
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="LoginErp" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="3d3f13aa-a503-4063-9891-3d4721be952b" name="Default" comment="">
|
|
|
+ <list default="true" id="3d3f13aa-a503-4063-9891-3d4721be952b" name="Default" comment="1: 通知公告 红点提示; 2:屏蔽群消息,取消屏蔽消息; ">
|
|
|
+ <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\skWeiChatBaidu\src\main\java\com\sk\weichat\volley\TestGit.java" afterPath="" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$12.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$12.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$13.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$13.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$14.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$14.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$15.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$15.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$16.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$16.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$17.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$17.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$18.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$18.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$19.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$19.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$20.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$20.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$21.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$21.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$22.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$22.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$23.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$23.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$24.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$24.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$GridViewAdapter$1.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$GridViewAdapter$1.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$GridViewAdapter.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity$GridViewAdapter.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity.class" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/classes/debug/com/sk/weichat/ui/message/RoomInfoActivity.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/cache.properties.lock" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/dex/debug/classes.dex" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/intermediates/dex/debug/classes.dex" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileHashes.bin" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/fileSnapshots.bin" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug-unaligned.apk" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug-unaligned.apk" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug.apk" afterPath="$PROJECT_DIR$/skWeiChatBaidu/build/outputs/apk/skWeiChatBaidu-debug.apk" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.4/taskArtifacts/taskArtifacts.bin" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/MPAndroidChart/MPAndroidChart.iml" afterPath="$PROJECT_DIR$/MPAndroidChart/MPAndroidChart.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java" afterPath="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_22_2_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_22_2_0.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libedittextformlibrary/libedittextformlibrary.iml" afterPath="$PROJECT_DIR$/libedittextformlibrary/libedittextformlibrary.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libfloatingactionbutton/libfloatingactionbutton.iml" afterPath="$PROJECT_DIR$/libfloatingactionbutton/libfloatingactionbutton.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libpsectionlistview/libpsectionlistview.iml" afterPath="$PROJECT_DIR$/libpsectionlistview/libpsectionlistview.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/librarymenudrawer/librarymenudrawer.iml" afterPath="$PROJECT_DIR$/librarymenudrawer/librarymenudrawer.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/materialdialogs/materialdialogs.iml" afterPath="$PROJECT_DIR$/materialdialogs/materialdialogs.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/recyclerview_v7_22_2_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/recyclerview_v7_22_2_0.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/skWeiChatBaidu/skWeiChatBaidu.iml" afterPath="$PROJECT_DIR$/skWeiChatBaidu/skWeiChatBaidu.iml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_22_2_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_22_2_0.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
</list>
|
|
|
<ignored path="SkWeiChat-Baidu.iws" />
|
|
|
@@ -132,46 +169,6 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
- <file leaf-file-name="RoomInfoActivity.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="777" column="46" selection-start-line="777" selection-start-column="46" selection-end-line="777" selection-end-column="46" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="TestGit.java" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/volley/TestGit.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.29649594">
|
|
|
- <caret line="5" column="20" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="Friend.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/bean/Friend.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="44" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="DataDownloadActivity.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/account/DataDownloadActivity.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="56" column="45" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
<file leaf-file-name="MessageFragment.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -182,37 +179,41 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="MucChatActivity.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="248" column="49" selection-start-line="248" selection-start-column="49" selection-end-line="248" selection-end-column="49" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="GroupChatFragment.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/groupchat/GroupChatFragment.java">
|
|
|
+ <file leaf-file-name="RoomInfoActivity.java" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="210" column="45" selection-start-line="210" selection-start-column="45" selection-end-line="210" selection-end-column="65" />
|
|
|
- <folding />
|
|
|
+ <state vertical-scroll-proportion="0.52124643">
|
|
|
+ <caret line="357" column="17" selection-start-line="357" selection-start-column="17" selection-end-line="357" selection-end-column="17" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#9976#10197#0" expanded="true" />
|
|
|
+ <element signature="e#10196#10197#0" expanded="true" />
|
|
|
+ <element signature="e#14592#14772#0" expanded="true" />
|
|
|
+ <element signature="e#27228#27457#0" expanded="true" />
|
|
|
+ <element signature="e#27456#27457#0" expanded="true" />
|
|
|
+ <element signature="e#28768#28997#0" expanded="true" />
|
|
|
+ <element signature="e#28996#28997#0" expanded="true" />
|
|
|
+ <element signature="e#30747#30989#0" expanded="true" />
|
|
|
+ <element signature="e#30988#30989#0" expanded="true" />
|
|
|
+ <element signature="e#36077#36306#0" expanded="true" />
|
|
|
+ <element signature="e#36305#36306#0" expanded="true" />
|
|
|
+ <element signature="e#37733#37962#0" expanded="true" />
|
|
|
+ <element signature="e#37961#37962#0" expanded="true" />
|
|
|
+ <element signature="e#39750#39979#0" expanded="true" />
|
|
|
+ <element signature="e#39978#39979#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
- <component name="FileTemplateManagerImpl">
|
|
|
- <option name="RECENT_TEMPLATES">
|
|
|
- <list>
|
|
|
- <option value="Class" />
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
|
+ <map>
|
|
|
+ <entry key="$PROJECT_DIR$" value="master" />
|
|
|
+ </map>
|
|
|
+ </option>
|
|
|
<push-targets>
|
|
|
<push-target-info repo="$PROJECT_DIR$" source="master" target-remote="origin" target-branch="developer" />
|
|
|
</push-targets>
|
|
|
@@ -230,40 +231,40 @@
|
|
|
<value>
|
|
|
<list>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":materialdialogs" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/materialdialogs" />
|
|
|
+ <option name="name" value=":libedittextformlibrary" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/libedittextformlibrary" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":pullToRefershLibraryMy" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/pullToRefershLibraryMy" />
|
|
|
+ <option name="name" value=":libfloatingactionbutton" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/libfloatingactionbutton" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
<option name="name" value=":skWeiChatBaidu" />
|
|
|
<option name="path" value="$PROJECT_DIR$/skWeiChatBaidu" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":libpsectionlistview" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/libpsectionlistview" />
|
|
|
+ <option name="name" value=":librarymenudrawer" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/librarymenudrawer" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":MPAndroidChart" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/MPAndroidChart" />
|
|
|
+ <option name="name" value="SkWeiChat-Baidu" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":libfloatingactionbutton" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/libfloatingactionbutton" />
|
|
|
+ <option name="name" value=":pullToRefershLibraryMy" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/pullToRefershLibraryMy" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":librarymenudrawer" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/librarymenudrawer" />
|
|
|
+ <option name="name" value=":MPAndroidChart" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/MPAndroidChart" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value="SkWeiChat-Baidu" />
|
|
|
- <option name="path" value="$PROJECT_DIR$" />
|
|
|
+ <option name="name" value=":libpsectionlistview" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/libpsectionlistview" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value=":libedittextformlibrary" />
|
|
|
- <option name="path" value="$PROJECT_DIR$/libedittextformlibrary" />
|
|
|
+ <option name="name" value=":materialdialogs" />
|
|
|
+ <option name="path" value="$PROJECT_DIR$/materialdialogs" />
|
|
|
</ExternalProjectPojo>
|
|
|
</list>
|
|
|
</value>
|
|
|
@@ -5396,12 +5397,11 @@
|
|
|
</option>
|
|
|
<option name="modificationStamps">
|
|
|
<map>
|
|
|
- <entry key="C:\Project\Studio\SkWeiChat-Baidu" value="14550826484832" />
|
|
|
<entry key="$PROJECT_DIR$/../BGABadgeView-Android" value="5803436119678" />
|
|
|
<entry key="$PROJECT_DIR$/../FloatingActionButton" value="7255014793815" />
|
|
|
<entry key="$PROJECT_DIR$/../FlycoDialog_Master" value="5830786541982" />
|
|
|
<entry key="$PROJECT_DIR$/../cheesesquare" value="4355613519431" />
|
|
|
- <entry key="D:\android\SkWeiChat-Baidu" value="14588778829821" />
|
|
|
+ <entry key="C:\Project\Studio\SkWeiChat-Baidu" value="14550826484832" />
|
|
|
</map>
|
|
|
</option>
|
|
|
<option name="projectBuildClasspath">
|
|
|
@@ -6422,9 +6422,8 @@
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
<option name="x" value="-8" />
|
|
|
- <option name="y" value="-8" />
|
|
|
- <option name="width" value="1382" />
|
|
|
- <option name="height" value="754" />
|
|
|
+ <option name="width" value="1378" />
|
|
|
+ <option name="height" value="728" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
|
<OptionsSetting value="true" id="Add" />
|
|
|
@@ -6449,28 +6448,6 @@
|
|
|
<sortByType />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="AndroidView">
|
|
|
- <subPane>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="SkWeiChat-Baidu" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="SkWeiChat-Baidu" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="skWeiChatBaidu" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- </subPane>
|
|
|
- </pane>
|
|
|
- <pane id="PackagesPane" />
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<PATH>
|
|
|
@@ -6743,7 +6720,29 @@
|
|
|
</PATH>
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="PackagesPane" />
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="Scratches" />
|
|
|
+ <pane id="AndroidView">
|
|
|
+ <subPane>
|
|
|
+ <PATH>
|
|
|
+ <PATH_ELEMENT>
|
|
|
+ <option name="myItemId" value="SkWeiChat-Baidu" />
|
|
|
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
+ </PATH_ELEMENT>
|
|
|
+ </PATH>
|
|
|
+ <PATH>
|
|
|
+ <PATH_ELEMENT>
|
|
|
+ <option name="myItemId" value="SkWeiChat-Baidu" />
|
|
|
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
+ </PATH_ELEMENT>
|
|
|
+ <PATH_ELEMENT>
|
|
|
+ <option name="myItemId" value="skWeiChatBaidu" />
|
|
|
+ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
+ </PATH_ELEMENT>
|
|
|
+ </PATH>
|
|
|
+ </subPane>
|
|
|
+ </pane>
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
@@ -6973,48 +6972,48 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1458783594327</updated>
|
|
|
</task>
|
|
|
- <task id="LOCAL-00002" summary="1: 协作开发,修改bug 3-24">
|
|
|
- <created>1458887684987</created>
|
|
|
+ <task id="LOCAL-00002" summary="1: 通知公告 红点提示; 2:屏蔽群消息,取消屏蔽消息; ">
|
|
|
+ <created>1458874607139</created>
|
|
|
<option name="number" value="00002" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
- <updated>1458887684987</updated>
|
|
|
+ <updated>1458874607139</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="3" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-8" y="-8" width="1382" height="754" extended-state="6" />
|
|
|
+ <frame x="-8" y="0" width="1378" height="728" extended-state="0" />
|
|
|
<editor active="false" />
|
|
|
<layout>
|
|
|
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37017545" sideWeight="0.47268587" order="12" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32998326" sideWeight="0.18003026" order="8" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32998326" sideWeight="0.8199697" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32935154" sideWeight="0.4969743" order="10" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4403509" sideWeight="0.8778452" order="2" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
|
|
|
+ <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32982457" sideWeight="0.8201821" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.11760243" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17192982" sideWeight="0.4969651" order="3" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32982457" sideWeight="0.1798179" order="8" side_tool="true" content_ui="tabs" />
|
|
|
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
|
|
|
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32935154" sideWeight="0.4969743" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3267776" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
|
|
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37017545" sideWeight="0.47268587" order="12" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16691957" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.17192982" sideWeight="0.4969651" order="3" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27314112" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4403509" sideWeight="0.8778452" order="2" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="806" y="685" width="256" height="41" />
|
|
|
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22280702" sideWeight="0.4969743" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
|
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" x="806" y="685" width="256" height="41" />
|
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22280702" sideWeight="0.4969743" order="1" side_tool="false" content_ui="tabs" />
|
|
|
</layout>
|
|
|
</component>
|
|
|
<component name="Vcs.Log.UiProperties">
|
|
|
@@ -7030,38 +7029,14 @@
|
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="1: 协作开发,修改bug 3-24" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="1: 协作开发,修改bug 3-24" />
|
|
|
+ <MESSAGE value="1: 通知公告 红点提示; 2:屏蔽群消息,取消屏蔽消息; " />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="1: 通知公告 红点提示; 2:屏蔽群消息,取消屏蔽消息; " />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
- <breakpoint-manager>
|
|
|
- <option name="time" value="1" />
|
|
|
- </breakpoint-manager>
|
|
|
+ <breakpoint-manager />
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="248" column="49" selection-start-line="248" selection-start-column="49" selection-end-line="248" selection-end-column="49" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/groupchat/GroupChatFragment.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="210" column="45" selection-start-line="210" selection-start-column="45" selection-end-line="210" selection-end-column="65" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/res/raw/shiku.db">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-3.3160813">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/MyApplication.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="-0.1349353">
|
|
|
@@ -7098,6 +7073,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/java/lang/String.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.6666667">
|
|
|
+ <caret line="887" column="15" selection-start-line="887" selection-start-column="15" selection-end-line="887" selection-end-column="15" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/db/SQLiteRawUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.33333334">
|
|
|
@@ -7176,15 +7158,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/res/layout/fragment_friend.xml">
|
|
|
- <provider editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.5830986">
|
|
|
<caret line="9" column="48" selection-start-line="9" selection-start-column="48" selection-end-line="9" selection-end-column="48" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/base/XutilsFragment.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -7194,15 +7176,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/res/layout/row_nearly_message.xml">
|
|
|
- <provider selected="true" editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
<caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider selected="true" editor-type-id="android-designer">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/bean/AttentionUser.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -7211,6 +7193,17 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/android/app/Activity.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.33173078">
|
|
|
+ <caret line="3982" column="16" selection-start-line="3982" selection-start-column="16" selection-end-line="3982" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#169366#169367#0" expanded="false" />
|
|
|
+ <element signature="e#169414#169415#0" expanded="false" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/AndroidManifest.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.33173078">
|
|
|
@@ -7228,9 +7221,6 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/res/layout/activity_basic_info.xml">
|
|
|
- <provider editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="-3.5">
|
|
|
<caret line="132" column="0" selection-start-line="132" selection-start-column="0" selection-end-line="132" selection-end-column="0" />
|
|
|
@@ -7250,6 +7240,9 @@
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/bean/User.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -7272,10 +7265,18 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/android/content/ContextWrapper.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.33182845">
|
|
|
+ <caret line="536" column="19" selection-start-line="536" selection-start-column="19" selection-end-line="536" selection-end-column="19" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/model/NoticeEntity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.114285715">
|
|
|
<caret line="48" column="32" selection-start-line="48" selection-start-column="32" selection-end-line="48" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -7283,6 +7284,7 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
<caret line="168" column="26" selection-start-line="168" selection-start-column="26" selection-end-line="168" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -7338,6 +7340,7 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.803125">
|
|
|
<caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -7345,6 +7348,7 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="2.1375">
|
|
|
<caret line="97" column="65" selection-start-line="97" selection-start-column="65" selection-end-line="97" selection-end-column="65" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -7363,25 +7367,16 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="264" column="30" selection-start-line="264" selection-start-column="30" selection-end-line="264" selection-end-column="30" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/account/DataDownloadActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
+ <state vertical-scroll-proportion="0.6857671">
|
|
|
<caret line="56" column="45" selection-start-line="56" selection-start-column="45" selection-end-line="56" selection-end-column="45" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/bean/Friend.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
+ <state vertical-scroll-proportion="0.24768947">
|
|
|
<caret line="50" column="28" selection-start-line="50" selection-start-column="28" selection-end-line="50" selection-end-column="44" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
@@ -7396,7 +7391,7 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
+ <state vertical-scroll-proportion="0.42513862">
|
|
|
<caret line="248" column="49" selection-start-line="248" selection-start-column="49" selection-end-line="248" selection-end-column="49" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
@@ -7421,25 +7416,40 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/groupchat/GroupChatFragment.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
+ <state vertical-scroll-proportion="0.4177449">
|
|
|
<caret line="210" column="45" selection-start-line="210" selection-start-column="45" selection-end-line="210" selection-end-column="65" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="777" column="46" selection-start-line="777" selection-start-column="46" selection-end-line="777" selection-end-column="46" />
|
|
|
+ <caret line="264" column="30" selection-start-line="264" selection-start-column="30" selection-end-line="264" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/volley/TestGit.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.29649594">
|
|
|
- <caret line="5" column="20" selection-start-line="5" selection-start-column="20" selection-end-line="5" selection-end-column="20" />
|
|
|
- <folding />
|
|
|
+ <state vertical-scroll-proportion="0.52124643">
|
|
|
+ <caret line="357" column="17" selection-start-line="357" selection-start-column="17" selection-end-line="357" selection-end-column="17" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#9976#10197#0" expanded="true" />
|
|
|
+ <element signature="e#10196#10197#0" expanded="true" />
|
|
|
+ <element signature="e#14592#14772#0" expanded="true" />
|
|
|
+ <element signature="e#27228#27457#0" expanded="true" />
|
|
|
+ <element signature="e#27456#27457#0" expanded="true" />
|
|
|
+ <element signature="e#28768#28997#0" expanded="true" />
|
|
|
+ <element signature="e#28996#28997#0" expanded="true" />
|
|
|
+ <element signature="e#30747#30989#0" expanded="true" />
|
|
|
+ <element signature="e#30988#30989#0" expanded="true" />
|
|
|
+ <element signature="e#36077#36306#0" expanded="true" />
|
|
|
+ <element signature="e#36305#36306#0" expanded="true" />
|
|
|
+ <element signature="e#37733#37962#0" expanded="true" />
|
|
|
+ <element signature="e#37961#37962#0" expanded="true" />
|
|
|
+ <element signature="e#39750#39979#0" expanded="true" />
|
|
|
+ <element signature="e#39978#39979#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|