|
|
@@ -90,6 +90,14 @@
|
|
|
<option name="packageNamePattern" value="" />
|
|
|
<option name="pid" value="" />
|
|
|
</filter>
|
|
|
+ <filter>
|
|
|
+ <option name="logLevel" value="verbose" />
|
|
|
+ <option name="logMessagePattern" value="" />
|
|
|
+ <option name="logTagPattern" value="table" />
|
|
|
+ <option name="name" value="table" />
|
|
|
+ <option name="packageNamePattern" value="" />
|
|
|
+ <option name="pid" value="" />
|
|
|
+ </filter>
|
|
|
</filters>
|
|
|
</component>
|
|
|
<component name="AndroidLayouts">
|
|
|
@@ -98,30 +106,20 @@
|
|
|
</shared>
|
|
|
</component>
|
|
|
<component name="AndroidLogFilters">
|
|
|
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="wang" />
|
|
|
+ <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="table" />
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="3d3f13aa-a503-4063-9891-3d4721be952b" name="Default" comment="">
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/PhotoView_1_2_5.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/support_annotations_23_2_1.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_23_2_1.xml" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aapt\AndroidManifest.xml" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aidl\android\support\v4\media\MediaMetadataCompat.aidl" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aidl\android\support\v4\media\RatingCompat.aidl" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aidl\android\support\v4\media\session\MediaSessionCompat.aidl" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aidl\android\support\v4\media\session\ParcelableVolumeInfo.aidl" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\aidl\android\support\v4\media\session\PlaybackStateCompat.aidl" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\annotations.zip" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\jars\classes.jar" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\jars\libs\internal_impl-22.2.0.jar" afterPath="" />
|
|
|
- <change type="DELETED" beforePath="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\support-annotations-22.2.0-70ba567356d3f4e70248bb87208265e9c5e15549.jar" afterPath="" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/CommonUtil.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/CommonUtil.class" />
|
|
|
+ <list default="true" id="3d3f13aa-a503-4063-9891-3d4721be952b" name="Default" comment="1 图片展示问题解决;引入新的库photoView;">
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build.gradle" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/lint.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/ChatActivity$6.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/ChatActivity$6.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/ChatActivity.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/ChatActivity.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/bean/message/ChatMessage$1.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/bean/message/ChatMessage$1.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/bean/message/ChatMessage.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/bean/message/ChatMessage.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/db/dao/ChatMessageDao.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/db/dao/ChatMessageDao.class" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/fragment/LinksManFragment.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/fragment/LinksManFragment.class" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$1.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$1.class" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$2.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$2.class" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$3.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$3.class" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/nearby/UserSearchActivity$1.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/nearby/UserSearchActivity$1.class" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/nearby/UserSearchActivity.class" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/nearby/UserSearchActivity.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$/WeiChat/build/intermediates/dex/debug/classes.dex" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/dex/debug/classes.dex" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/MPAndroidChart/unspecified/jars/classes.jar" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/MPAndroidChart/unspecified/jars/classes.jar" />
|
|
|
@@ -141,19 +139,12 @@
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pullToRefershLibraryMy/build/intermediates/res/resources-debug-androidTest.ap_" afterPath="$PROJECT_DIR$/pullToRefershLibraryMy/build/intermediates/res/resources-debug-androidTest.ap_" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/res/resources-debug.ap_" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/res/resources-debug.ap_" />
|
|
|
<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$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/ChatMessage.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/ChatMessage.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDao.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDao.java" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/WeiChat.iml" afterPath="$PROJECT_DIR$/WeiChat/WeiChat.iml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/res/merged/debug/layout/activity_single_image_preview.xml" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/res/merged/debug/layout/activity_single_image_preview.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_single_image_preview.xml" afterPath="$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_single_image_preview.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java" afterPath="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/outputs/logs/manifest-merger-debug-report.txt" afterPath="$PROJECT_DIR$/WeiChat/build/outputs/logs/manifest-merger-debug-report.txt" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/materialdialogs/materialdialogs.iml" afterPath="$PROJECT_DIR$/materialdialogs/materialdialogs.iml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/incremental/mergeAssets/debug/merger.xml" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/incremental/mergeAssets/debug/merger.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/WeiChat/build/intermediates/incremental/mergeResourcesdebug/merger.xml" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/incremental/mergeResourcesdebug/merger.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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
</list>
|
|
|
<ignored path="SkWeiChat-Baidu.iws" />
|
|
|
@@ -175,7 +166,9 @@
|
|
|
<component name="ExternalProjectsManager">
|
|
|
<system id="GRADLE">
|
|
|
<state>
|
|
|
- <projects_view />
|
|
|
+ <projects_view>
|
|
|
+ <tree_state />
|
|
|
+ </projects_view>
|
|
|
</state>
|
|
|
</system>
|
|
|
</component>
|
|
|
@@ -184,45 +177,51 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf>
|
|
|
- <file leaf-file-name="ChatActivity.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java">
|
|
|
+ <file leaf-file-name="settings.gradle" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/settings.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-3.6">
|
|
|
- <caret line="84" column="16" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="ChatContentView.java" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java">
|
|
|
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-4.206897">
|
|
|
- <caret line="889" column="72" selection-start-line="889" selection-start-column="72" selection-end-line="889" selection-end-column="72" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="13" column="5" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="SingleImagePreviewActivity.java" pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java">
|
|
|
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-0.99014777">
|
|
|
- <caret line="96" column="25" selection-start-line="96" selection-start-column="25" selection-end-line="96" selection-end-column="25" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="2.0758123">
|
|
|
+ <caret line="50" column="49" selection-start-line="50" selection-start-column="49" selection-end-line="50" selection-end-column="49" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/build.gradle">
|
|
|
+ <file leaf-file-name="lint.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/lint.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="local.properties" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/local.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
@@ -245,7 +244,7 @@
|
|
|
</option>
|
|
|
<push-targets>
|
|
|
<push-target-info repo="$PROJECT_DIR$" source="master" target-remote="origin" target-branch="developer" />
|
|
|
- <push-target-info repo="$PROJECT_DIR$" source="developer" target-remote="origin" target-branch="master" />
|
|
|
+ <push-target-info repo="$PROJECT_DIR$" source="developer" target-remote="origin" target-branch="developer" />
|
|
|
</push-targets>
|
|
|
</component>
|
|
|
<component name="GradleLocalSettings">
|
|
|
@@ -6622,10 +6621,6 @@
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
- <option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/res/layout/activity_about.xml" />
|
|
|
- <option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/fragment/WorksFragment.java" />
|
|
|
- <option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/res/layout/fragment_contacts.xml" />
|
|
|
- <option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/cardcast/FriendFragment.java" />
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/cardcast/AttentionFragment.java" />
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/cardcast/RoomFragment.java" />
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/SelectNewContactsActivity.java" />
|
|
|
@@ -6665,12 +6660,18 @@
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/erp/activity/NoticeMenuActivity.java" />
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/MessageFragment.java" />
|
|
|
<option value="$PROJECT_DIR$/skWeiChatBaidu/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java" />
|
|
|
- <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java" />
|
|
|
- <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java" />
|
|
|
<option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java" />
|
|
|
<option value="$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_single_image_preview.xml" />
|
|
|
<option value="$PROJECT_DIR$/WeiChat/build.gradle" />
|
|
|
<option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDao.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/ChatMessage.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java" />
|
|
|
+ <option value="$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java" />
|
|
|
+ <option value="$PROJECT_DIR$/SkWeiChat-Baidu.iml" />
|
|
|
+ <option value="$PROJECT_DIR$/.idea/.name" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -7057,6 +7058,7 @@
|
|
|
<component name="ShelveChangesManager" show_recycled="false" />
|
|
|
<component name="StructuralSearchPlugin">
|
|
|
<searchConfiguration name="user defined" text="会话已断开" recursive="true" caseInsensitive="true" type="JAVA" />
|
|
|
+ <searchConfiguration name="user defined" created="1459154380018" text="extends XmppMessage" recursive="true" caseInsensitive="true" type="JAVA" history="1" />
|
|
|
<searchConfiguration name="user defined" created="1458725917206" text="DATABASE_VERSION" recursive="true" caseInsensitive="true" type="JAVA" history="1" />
|
|
|
<searchConfiguration name="user defined" created="1458703835900" text="exitMucChat" recursive="true" caseInsensitive="true" type="JAVA" history="1" />
|
|
|
<searchConfiguration name="user defined" created="1458632951739" text="transferLongToDate" recursive="true" caseInsensitive="true" type="JAVA" history="1" />
|
|
|
@@ -7108,7 +7110,13 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1458894439802</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="7" />
|
|
|
+ <task id="LOCAL-00007" summary="1 图片展示问题解决;引入新的库photoView;">
|
|
|
+ <created>1459136848406</created>
|
|
|
+ <option name="number" value="00007" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1459136848406</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="8" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
@@ -7120,28 +7128,28 @@
|
|
|
<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="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.20989761" sideWeight="0.79727685" order="7" 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.18259385" sideWeight="0.4969743" order="1" 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.005119454" sideWeight="0.8880484" 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.20989761" sideWeight="0.20272315" order="8" 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.3020478" 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="false" weight="0.29351535" sideWeight="0.11195159" 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.28156996" sideWeight="0.42662632" order="10" 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.22696246" sideWeight="0.2655068" 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="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.3686007" sideWeight="0.6966717" 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="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.02118003" 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.16641453" sideWeight="0.5" order="1" 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.24281392" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31316188" 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="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="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" />
|
|
|
</layout>
|
|
|
@@ -7149,15 +7157,15 @@
|
|
|
<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="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="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13651878" sideWeight="0.80181545" order="7" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3447099" sideWeight="0.19818456" order="8" 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.29351535" sideWeight="0.8880484" order="7" 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.29351535" sideWeight="0.11195159" order="8" side_tool="true" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28156996" sideWeight="0.42662632" order="10" 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.22696246" sideWeight="0.2655068" order="10" 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="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="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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.12178517" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24281392" 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="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" />
|
|
|
@@ -7168,9 +7176,9 @@
|
|
|
<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" />
|
|
|
<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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3020478" sideWeight="0.4969651" order="3" side_tool="false" 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="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3686007" sideWeight="0.46369138" order="12" 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.3686007" sideWeight="0.6966717" order="12" 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.16641453" sideWeight="0.5" 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="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" />
|
|
|
@@ -7194,424 +7202,457 @@
|
|
|
<MESSAGE value="1 删除测试文件" />
|
|
|
<MESSAGE value="1 RoomInfoActivity :屏蔽群消息,取消屏蔽群消息功能完成;" />
|
|
|
<MESSAGE value="1 更改module名称" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="1 更改module名称" />
|
|
|
+ <MESSAGE value="1 图片展示问题解决;引入新的库photoView;" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="1 图片展示问题解决;引入新的库photoView;" />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
- <breakpoint-manager />
|
|
|
+ <breakpoint-manager>
|
|
|
+ <breakpoints>
|
|
|
+ <line-breakpoint enabled="true" type="java-line">
|
|
|
+ <url>file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java</url>
|
|
|
+ <line>291</line>
|
|
|
+ <properties />
|
|
|
+ <option name="timeStamp" value="1" />
|
|
|
+ </line-breakpoint>
|
|
|
+ </breakpoints>
|
|
|
+ <option name="time" value="2" />
|
|
|
+ </breakpoint-manager>
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/ErpMenActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/util/Scheme.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-1.0605187">
|
|
|
- <caret line="27" column="14" selection-start-line="27" selection-start-column="14" selection-end-line="27" selection-end-column="14" />
|
|
|
+ <state vertical-scroll-proportion="0.3325">
|
|
|
+ <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticeMenuActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_circle_audio_record.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="13.566667">
|
|
|
- <caret line="121" column="34" selection-start-line="121" selection-start-column="34" selection-end-line="121" selection-end-column="34" />
|
|
|
+ <state vertical-scroll-proportion="0.33211678">
|
|
|
+ <caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/ScheduleActivity.java">
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/android/graphics/BitmapFactory.java">
|
|
|
<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" />
|
|
|
+ <state vertical-scroll-proportion="0.33213645">
|
|
|
+ <caret line="37" column="24" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/universal-image-loader-1.9.0.jar!/com/nostra13/universalimageloader/core/DisplayImageOptions.class">
|
|
|
<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" />
|
|
|
+ <state vertical-scroll-proportion="0.26086956">
|
|
|
+ <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/entity/HrorgsEntity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/ViewUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.43125">
|
|
|
- <caret line="9" column="27" selection-start-line="9" selection-start-column="27" selection-end-line="9" selection-end-column="27" />
|
|
|
+ <state vertical-scroll-proportion="0.7337526">
|
|
|
+ <caret line="154" column="0" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/account/DataDownloadActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_single_image_preview.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state vertical-scroll-proportion="0.6689038">
|
|
|
+ <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/Friend.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/AndroidManifest.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state vertical-scroll-proportion="0.38574424">
|
|
|
+ <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/groupchat/SelectContactsActivity.java">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/universal-image-loader-1.9.0.jar!/com/nostra13/universalimageloader/core/ImageLoader.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-2.090573">
|
|
|
- <caret line="73" column="0" selection-start-line="73" selection-start-column="0" selection-end-line="73" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.3546798">
|
|
|
+ <caret line="172" column="16" selection-start-line="172" selection-start-column="16" selection-end-line="172" selection-end-column="16" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/MucChatActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state vertical-scroll-proportion="0.5509554">
|
|
|
+ <caret line="133" column="17" selection-start-line="133" selection-start-column="17" selection-end-line="133" selection-end-column="17" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/FriendDao.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/helper/AvatarHelper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.4177449">
|
|
|
- <caret line="434" column="61" selection-start-line="434" selection-start-column="61" selection-end-line="434" selection-end-column="61" />
|
|
|
+ <state vertical-scroll-proportion="0.33254716">
|
|
|
+ <caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="16" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/groupchat/GroupChatFragment.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/adapter/FriendSortAdapter.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <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" />
|
|
|
+ <state vertical-scroll-proportion="0.44923857">
|
|
|
+ <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#918#919#0" expanded="false" />
|
|
|
+ <element signature="e#955#956#0" expanded="false" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/base/XutilsFragment.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" />
|
|
|
+ <state vertical-scroll-proportion="0.64788735">
|
|
|
+ <caret line="133" column="0" selection-start-line="133" selection-start-column="0" selection-end-line="133" selection-end-column="0" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#501#502#0" expanded="false" />
|
|
|
+ <element signature="e#528#529#0" expanded="false" />
|
|
|
+ <element signature="e#1927#1928#0" expanded="false" />
|
|
|
+ <element signature="e#1981#1982#0" expanded="false" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://C:/Android/sdk/sources/android-22/java/lang/Object.java">
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/android/widget/ListView.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.33179724">
|
|
|
- <caret line="203" column="19" selection-start-line="203" selection-start-column="19" selection-end-line="203" selection-end-column="19" />
|
|
|
+ <state vertical-scroll-proportion="0.33213645">
|
|
|
+ <caret line="1986" column="16" selection-start-line="1986" selection-start-column="16" selection-end-line="1986" selection-end-column="16" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#78350#78351#0" expanded="false" />
|
|
|
+ <element signature="e#78398#78399#0" expanded="false" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_room_info.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.8440594">
|
|
|
- <caret line="270" column="48" selection-start-line="270" selection-start-column="48" selection-end-line="270" selection-end-column="48" />
|
|
|
+ <state vertical-scroll-proportion="0.6913043">
|
|
|
+ <caret line="103" column="32" selection-start-line="103" selection-start-column="32" selection-end-line="103" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-7.5333333">
|
|
|
- <caret line="357" column="34" selection-start-line="357" selection-start-column="34" selection-end-line="357" selection-end-column="34" />
|
|
|
+ <state vertical-scroll-proportion="0.1800643">
|
|
|
+ <caret line="596" column="38" selection-start-line="596" selection-start-column="38" selection-end-line="596" selection-end-column="38" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/WeiChat.iml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/PushNetMessageReceiver.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <caret line="78" column="27" selection-start-line="78" selection-start-column="27" selection-end-line="78" selection-end-column="27" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/lint.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <caret line="504" column="24" selection-start-line="504" selection-start-column="24" selection-end-line="504" selection-end-column="24" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/SkWeiChat-Baidu.iml">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/ormlite-android-4.48.jar!/com/j256/ormlite/android/apptools/OpenHelperManager.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.71267605">
|
|
|
- <caret line="11" column="22" selection-start-line="11" selection-start-column="22" selection-end-line="11" selection-end-column="22" />
|
|
|
+ <state vertical-scroll-proportion="0.3552941">
|
|
|
+ <caret line="42" column="69" selection-start-line="42" selection-start-column="69" selection-end-line="42" selection-end-column="69" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/settings.gradle">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/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="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
|
|
|
+ <state vertical-scroll-proportion="1.2978057">
|
|
|
+ <caret line="278" column="13" selection-start-line="278" selection-start-column="13" selection-end-line="278" selection-end-column="13" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/local.properties">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/ormlite-android-4.48.jar!/com/j256/ormlite/android/DatabaseTableConfigUtil.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.35882354">
|
|
|
+ <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/import-summary.txt">
|
|
|
+ <entry file="file://C:/Android/sdk/sources/android-22/android/os/Parcelable.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
|
|
|
+ <state vertical-scroll-proportion="0.37432188">
|
|
|
+ <caret line="56" column="7" selection-start-line="56" selection-start-column="4" selection-end-line="56" selection-end-column="7" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/gradlew.bat">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/XmppMessage.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.16636528">
|
|
|
+ <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/gradlew">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/NewFriendMessage.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <caret line="24" column="38" selection-start-line="24" selection-start-column="38" selection-end-line="24" selection-end-column="38" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/build.gradle">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/SQLiteRawUtil.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.51830983">
|
|
|
- <caret line="8" column="1" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/layout_list_empty_view.xml">
|
|
|
- <provider editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.33333334">
|
|
|
+ <caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider selected="true" editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/layout_pullrefresh_list.xml">
|
|
|
- <provider editor-type-id="text-editor">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
+ <caret line="720" column="30" selection-start-line="720" selection-start-column="30" selection-end-line="720" selection-end-column="30" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ <element signature="e#24442#24443#0" expanded="true" />
|
|
|
+ <element signature="e#24480#24481#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider selected="true" editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
|
|
|
+ <caret line="518" column="55" selection-start-line="518" selection-start-column="55" selection-end-line="518" selection-end-column="55" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/menu/menu_nearby.xml">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/ormlite-core-4.48.jar!/com/j256/ormlite/table/DatabaseTable.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.45352113">
|
|
|
- <caret line="7" column="46" selection-start-line="7" selection-start-column="46" selection-end-line="7" selection-end-column="46" />
|
|
|
- <folding>
|
|
|
- <element signature="e#350#366#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="0.43601894">
|
|
|
+ <caret line="14" column="18" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="18" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/fragment_friend.xml">
|
|
|
- <provider editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="3" column="39" selection-start-line="3" selection-start-column="39" selection-end-line="3" selection-end-column="39" />
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/ormlite-core-4.48.jar!/com/j256/ormlite/dao/BaseDaoImpl.class">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.3270142">
|
|
|
+ <caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider selected="true" editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
- <entry file="jar://C:/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.0/support-v4-22.2.0-sources.jar!/android/support/v4/app/Fragment.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDaoImpl.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.5915493">
|
|
|
- <caret line="821" column="22" selection-start-line="821" selection-start-column="22" selection-end-line="821" selection-end-column="22" />
|
|
|
+ <state vertical-scroll-proportion="0.20444444">
|
|
|
+ <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/nearby/NearbyFragment.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/ChatMessage.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.54647887">
|
|
|
- <caret line="81" column="32" selection-start-line="81" selection-start-column="4" selection-end-line="81" selection-end-column="32" />
|
|
|
+ <state vertical-scroll-proportion="-1.4482758">
|
|
|
+ <caret line="23" column="3" selection-start-line="23" selection-start-column="3" selection-end-line="23" selection-end-column="3" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/PullDownListView.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/ChatMessageDao.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="80" column="16" selection-start-line="80" selection-start-column="16" selection-end-line="80" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <element signature="e#2339#2340#0" expanded="true" />
|
|
|
- <element signature="e#2380#2381#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <caret line="119" column="28" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/values/ids.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/dao/FriendDao.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.16517055">
|
|
|
- <caret line="4" column="16" selection-start-line="4" selection-start-column="16" selection-end-line="4" selection-end-column="16" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="63" column="29" selection-start-line="63" selection-start-column="29" selection-end-line="63" selection-end-column="29" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/chat_to_item_image.xml">
|
|
|
- <provider editor-type-id="text-editor">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/db/UnlimitDaoManager.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <caret line="70" column="20" selection-start-line="70" selection-start-column="20" selection-end-line="70" selection-end-column="20" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider selected="true" editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/bean/message/ChatMessage.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.7037702">
|
|
|
- <caret line="51" column="26" selection-start-line="51" selection-start-column="26" selection-end-line="51" selection-end-column="26" />
|
|
|
- <folding>
|
|
|
- <element signature="e#2799#2800#0" expanded="true" />
|
|
|
- <element signature="e#2820#2821#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="-9.171111">
|
|
|
+ <caret line="8" column="28" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/util/Scheme.java">
|
|
|
+ <entry file="jar://$PROJECT_DIR$/WeiChat/libs/ormlite-core-4.48.jar!/com/j256/ormlite/dao/DaoManager.class">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.3325">
|
|
|
- <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
|
|
|
+ <state vertical-scroll-proportion="-2.5357144">
|
|
|
+ <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="24" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_circle_audio_record.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/SkWeiChat-Baidu.iml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.33211678">
|
|
|
- <caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
|
|
|
+ <state vertical-scroll-proportion="0.041292638">
|
|
|
+ <caret line="1" column="45" selection-start-line="1" selection-start-column="45" selection-end-line="1" selection-end-column="51" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="34" column="14" selection-start-line="34" selection-start-column="14" selection-end-line="34" selection-end-column="14" />
|
|
|
+ <folding>
|
|
|
+ <marker date="1459159088378" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
+ <marker date="1459159088378" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
+ <marker date="1459159088378" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
+ <marker date="1459159088378" expanded="true" signature="-1:-1" placeholder="..." />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://C:/Android/sdk/sources/android-22/android/graphics/BitmapFactory.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/vcs.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.33213645">
|
|
|
- <caret line="37" column="24" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="jar://$PROJECT_DIR$/WeiChat/libs/universal-image-loader-1.9.0.jar!/com/nostra13/universalimageloader/core/DisplayImageOptions.class">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/runConfigurations.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.26086956">
|
|
|
- <caret line="18" column="19" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/modules.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="1.6016772">
|
|
|
- <caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" />
|
|
|
- <folding>
|
|
|
- <element signature="e#13023#13055#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="5" column="101" selection-start-line="5" selection-start-column="101" selection-end-line="5" selection-end-column="101" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/util/ViewUtil.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/librarymenudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.7337526">
|
|
|
- <caret line="154" column="0" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
|
|
|
+ <state vertical-scroll-proportion="0.3313783">
|
|
|
+ <caret line="95" column="59" selection-start-line="95" selection-start-column="59" selection-end-line="95" selection-end-column="59" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/res/layout/activity_single_image_preview.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/.name">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.6689038">
|
|
|
- <caret line="13" column="16" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="9" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="15" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider editor-type-id="android-designer">
|
|
|
- <state />
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/WeiChat.iml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state vertical-scroll-proportion="0.13489737">
|
|
|
+ <caret line="2" column="15" selection-start-line="2" selection-start-column="15" selection-end-line="2" selection-end-column="15" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.26280624">
|
|
|
- <caret line="168" column="17" selection-start-line="168" selection-start-column="17" selection-end-line="168" selection-end-column="17" />
|
|
|
- <folding>
|
|
|
- <element signature="e#6175#6176#0" expanded="true" />
|
|
|
- <element signature="e#6240#6241#0" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="0.47214076">
|
|
|
+ <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/encodings.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-4.206897">
|
|
|
- <caret line="889" column="72" selection-start-line="889" selection-start-column="72" selection-end-line="889" selection-end-column="72" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/AndroidManifest.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/.idea/gradle.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.38574424">
|
|
|
- <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
|
|
|
+ <state vertical-scroll-proportion="-0.16422288">
|
|
|
+ <caret line="9" column="31" selection-start-line="9" selection-start-column="31" selection-end-line="9" selection-end-column="31" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/build.gradle">
|
|
|
+ <entry file="file://$PROJECT_DIR$/local.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state vertical-scroll-proportion="0.0">
|
|
|
- <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/librarymenudrawer/src/main/java/net/simonvt/menudrawer/compat/ActionBarHelperCompat.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/settings.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.3313783">
|
|
|
- <caret line="95" column="59" selection-start-line="95" selection-start-column="59" selection-end-line="95" selection-end-column="59" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-3.6">
|
|
|
- <caret line="84" column="16" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="13" column="5" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="jar://$PROJECT_DIR$/WeiChat/libs/universal-image-loader-1.9.0.jar!/com/nostra13/universalimageloader/core/ImageLoader.class">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/lint.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="0.3546798">
|
|
|
- <caret line="172" column="16" selection-start-line="172" selection-start-column="16" selection-end-line="172" selection-end-column="16" />
|
|
|
+ <state vertical-scroll-proportion="0.0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/WeiChat/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state vertical-scroll-proportion="-0.99014777">
|
|
|
- <caret line="96" column="25" selection-start-line="96" selection-start-column="25" selection-end-line="96" selection-end-column="25" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state vertical-scroll-proportion="2.0758123">
|
|
|
+ <caret line="50" column="49" selection-start-line="50" selection-start-column="49" selection-end-line="50" selection-end-column="49" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|