Browse Source

1 图片展示问题解决;引入新的库photoView;

LiuJie 9 years ago
parent
commit
6536585c79
53 changed files with 289 additions and 3439 deletions
  1. BIN
      .gradle/2.4/taskArtifacts/cache.properties.lock
  2. BIN
      .gradle/2.4/taskArtifacts/fileHashes.bin
  3. BIN
      .gradle/2.4/taskArtifacts/fileSnapshots.bin
  4. BIN
      .gradle/2.4/taskArtifacts/outputFileStates.bin
  5. BIN
      .gradle/2.4/taskArtifacts/taskArtifacts.bin
  6. 12 0
      .idea/libraries/PhotoView_1_2_5.xml
  7. 2 2
      .idea/libraries/recyclerview_v7_22_2_0.xml
  8. 11 0
      .idea/libraries/support_annotations_23_2_1.xml
  9. 13 0
      .idea/libraries/support_v4_23_2_1.xml
  10. 28 3196
      .idea/workspace.xml
  11. 6 2
      WeiChat/WeiChat.iml
  12. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/fragment/LinksManFragment.class
  13. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/CommonUtil.class
  14. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$1.class
  15. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$2.class
  16. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$3.class
  17. BIN
      WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity.class
  18. BIN
      WeiChat/build/intermediates/dex/debug/classes.dex
  19. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/MPAndroidChart/unspecified/jars/classes.jar
  20. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libedittextformlibrary/unspecified/jars/classes.jar
  21. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libfloatingactionbutton/unspecified/jars/classes.jar
  22. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libpsectionlistview/unspecified/jars/classes.jar
  23. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/materialdialogs/unspecified/jars/classes.jar
  24. BIN
      WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/pullToRefershLibraryMy/unspecified/jars/classes.jar
  25. 0 24
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/AndroidManifest.xml
  26. 0 24
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aapt/AndroidManifest.xml
  27. 0 18
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/MediaMetadataCompat.aidl
  28. 0 18
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/RatingCompat.aidl
  29. 0 20
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/MediaSessionCompat.aidl
  30. 0 18
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/ParcelableVolumeInfo.aidl
  31. 0 18
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/PlaybackStateCompat.aidl
  32. BIN
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/annotations.zip
  33. BIN
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/classes.jar
  34. BIN
      WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/libs/internal_impl-22.2.0.jar
  35. 0 0
      WeiChat/build/intermediates/incremental/mergeAssets/debug/merger.xml
  36. 0 0
      WeiChat/build/intermediates/incremental/mergeResourcesdebug/merger.xml
  37. BIN
      WeiChat/build/intermediates/pre-dexed/debug/support-annotations-22.2.0-70ba567356d3f4e70248bb87208265e9c5e15549.jar
  38. 1 1
      WeiChat/build/intermediates/res/merged/debug/layout/activity_single_image_preview.xml
  39. BIN
      WeiChat/build/intermediates/res/resources-debug-androidTest.ap_
  40. BIN
      WeiChat/build/intermediates/res/resources-debug.ap_
  41. 19 16
      WeiChat/build/outputs/logs/manifest-merger-debug-report.txt
  42. 26 0
      WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java
  43. 67 0
      WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java
  44. 17 3
      WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java
  45. 1 1
      WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java
  46. 1 1
      WeiChat/src/main/res/layout/activity_single_image_preview.xml
  47. 84 77
      build/intermediates/dex-cache/cache.xml
  48. 1 0
      materialdialogs/materialdialogs.iml
  49. BIN
      pullToRefershLibraryMy/build/intermediates/bundles/debug/classes.jar
  50. BIN
      pullToRefershLibraryMy/build/intermediates/bundles/release/classes.jar
  51. BIN
      pullToRefershLibraryMy/build/intermediates/res/resources-debug-androidTest.ap_
  52. BIN
      pullToRefershLibraryMy/build/outputs/aar/pullToRefershLibraryMy-debug.aar
  53. BIN
      pullToRefershLibraryMy/build/outputs/aar/pullToRefershLibraryMy-release.aar

BIN
.gradle/2.4/taskArtifacts/cache.properties.lock


BIN
.gradle/2.4/taskArtifacts/fileHashes.bin


BIN
.gradle/2.4/taskArtifacts/fileSnapshots.bin


BIN
.gradle/2.4/taskArtifacts/outputFileStates.bin


BIN
.gradle/2.4/taskArtifacts/taskArtifacts.bin


+ 12 - 0
.idea/libraries/PhotoView_1_2_5.xml

@@ -0,0 +1,12 @@
+<component name="libraryTable">
+  <library name="PhotoView-1.2.5">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.commit451/PhotoView/1.2.5/res" />
+      <root url="jar://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.commit451/PhotoView/1.2.5/jars/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.commit451/PhotoView/1.2.5/63d6393fdd432176a5869a51f64706c6c22bc370/PhotoView-1.2.5-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 2 - 2
.idea/libraries/recyclerview_v7_22_2_0.xml

@@ -1,8 +1,8 @@
 <component name="libraryTable">
 <component name="libraryTable">
   <library name="recyclerview-v7-22.2.0">
   <library name="recyclerview-v7-22.2.0">
     <CLASSES>
     <CLASSES>
-      <root url="file://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/res" />
-      <root url="jar://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/materialdialogs/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/res" />
+      <root url="jar://$PROJECT_DIR$/materialdialogs/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars/classes.jar!/" />
     </CLASSES>
     </CLASSES>
     <JAVADOC />
     <JAVADOC />
     <SOURCES>
     <SOURCES>

+ 11 - 0
.idea/libraries/support_annotations_23_2_1.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-annotations-23.2.1">
+    <CLASSES>
+      <root url="jar://C:/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.2.1/support-annotations-23.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://C:/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.2.1/support-annotations-23.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

+ 13 - 0
.idea/libraries/support_v4_23_2_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="support-v4-23.2.1">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/libs/internal_impl-23.2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://C:/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.2.1/support-v4-23.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

File diff suppressed because it is too large
+ 28 - 3196
.idea/workspace.xml


+ 6 - 2
WeiChat/WeiChat.iml

@@ -71,6 +71,9 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.commit451/PhotoView/1.2.5/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,9 +91,10 @@
     </content>
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" />
     <orderEntry type="library" exported="" name="ormlite-android-4.48" level="project" />
     <orderEntry type="library" exported="" name="pinyin4j-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="pinyin4j-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="PhotoView-1.2.5" level="project" />
     <orderEntry type="library" exported="" name="flexjson-2.1" level="project" />
     <orderEntry type="library" exported="" name="flexjson-2.1" level="project" />
     <orderEntry type="library" exported="" name="cyberplayer-sdk" level="project" />
     <orderEntry type="library" exported="" name="cyberplayer-sdk" level="project" />
     <orderEntry type="library" exported="" name="xutils" level="project" />
     <orderEntry type="library" exported="" name="xutils" level="project" />
@@ -100,9 +104,9 @@
     <orderEntry type="library" exported="" name="android-async-http-1.4.5" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.5" level="project" />
     <orderEntry type="library" exported="" name="nineoldandroids" level="project" />
     <orderEntry type="library" exported="" name="nineoldandroids" level="project" />
     <orderEntry type="library" exported="" name="asmack" level="project" />
     <orderEntry type="library" exported="" name="asmack" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="org.xbill.dns_2.1.6" level="project" />
     <orderEntry type="library" exported="" name="org.xbill.dns_2.1.6" level="project" />
     <orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
     <orderEntry type="library" exported="" name="ormlite-core-4.48" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="volley" level="project" />
     <orderEntry type="library" exported="" name="volley" level="project" />
     <orderEntry type="library" exported="" name="httpmime-4.2" level="project" />
     <orderEntry type="library" exported="" name="httpmime-4.2" level="project" />

BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/fragment/LinksManFragment.class


BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/erp/util/CommonUtil.class


BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$1.class


BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$2.class


BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity$3.class


BIN
WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/tool/SingleImagePreviewActivity.class


BIN
WeiChat/build/intermediates/dex/debug/classes.dex


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/MPAndroidChart/unspecified/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libedittextformlibrary/unspecified/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libfloatingactionbutton/unspecified/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/libpsectionlistview/unspecified/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/materialdialogs/unspecified/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/SkWeiChat-Baidu/pullToRefershLibraryMy/unspecified/jars/classes.jar


+ 0 - 24
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.support.v4" >
-
-    <uses-sdk android:minSdkVersion="4" />
-
-    <application />
-
-</manifest>

+ 0 - 24
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aapt/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.support.v4" >
-
-    <uses-sdk android:minSdkVersion="4" />
-
-    <application />
-
-</manifest>

+ 0 - 18
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/MediaMetadataCompat.aidl

@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.support.v4.media;
-
-parcelable MediaMetadataCompat;

+ 0 - 18
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/RatingCompat.aidl

@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.support.v4.media;
-
-parcelable RatingCompat;

+ 0 - 20
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/MediaSessionCompat.aidl

@@ -1,20 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.support.v4.media.session;
-
-parcelable MediaSessionCompat.Token;
-parcelable MediaSessionCompat.QueueItem;
-parcelable MediaSessionCompat.ResultReceiverWrapper;

+ 0 - 18
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/ParcelableVolumeInfo.aidl

@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.support.v4.media.session;
-
-parcelable ParcelableVolumeInfo;

+ 0 - 18
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/aidl/android/support/v4/media/session/PlaybackStateCompat.aidl

@@ -1,18 +0,0 @@
-/* Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.support.v4.media.session;
-
-parcelable PlaybackStateCompat;

BIN
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/annotations.zip


BIN
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/classes.jar


BIN
WeiChat/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars/libs/internal_impl-22.2.0.jar


File diff suppressed because it is too large
+ 0 - 0
WeiChat/build/intermediates/incremental/mergeAssets/debug/merger.xml


File diff suppressed because it is too large
+ 0 - 0
WeiChat/build/intermediates/incremental/mergeResourcesdebug/merger.xml


BIN
WeiChat/build/intermediates/pre-dexed/debug/support-annotations-22.2.0-70ba567356d3f4e70248bb87208265e9c5e15549.jar


+ 1 - 1
WeiChat/build/intermediates/res/merged/debug/layout/activity_single_image_preview.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
         android:contentDescription="@string/app_name"
         android:contentDescription="@string/app_name"
-        android:scaleType="centerInside" />
+        android:scaleType="fitCenter" />
 
 
     <ProgressBar
     <ProgressBar
         android:id="@+id/progress_bar"
         android:id="@+id/progress_bar"

BIN
WeiChat/build/intermediates/res/resources-debug-androidTest.ap_


BIN
WeiChat/build/intermediates/res/resources-debug.ap_


+ 19 - 16
WeiChat/build/outputs/logs/manifest-merger-debug-report.txt

@@ -18,24 +18,26 @@ ADDED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xm
 MERGED from [SkWeiChat-Baidu:pullToRefershLibraryMy:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:pullToRefershLibraryMy:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:recyclerview-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:recyclerview-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [SkWeiChat-Baidu:MPAndroidChart:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:MPAndroidChart:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [SkWeiChat-Baidu:libedittextformlibrary:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libedittextformlibrary\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:libedittextformlibrary:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libedittextformlibrary\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [SkWeiChat-Baidu:libfloatingactionbutton:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:libfloatingactionbutton:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [SkWeiChat-Baidu:libpsectionlistview:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libpsectionlistview\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [SkWeiChat-Baidu:libpsectionlistview:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libpsectionlistview\unspecified\AndroidManifest.xml:7:5-9:41
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:20:5-43
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
+MERGED from [com.commit451:PhotoView:1.2.5] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.commit451\PhotoView\1.2.5\AndroidManifest.xml:8:5-10:41
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:20:5-43
 	android:targetSdkVersion
 	android:targetSdkVersion
 		ADDED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xml:9:9-38
 		ADDED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xml:9:9-38
 		INJECTED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xml
 		INJECTED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xml
@@ -185,21 +187,22 @@ ADDED from C:\Project\Studio\SkWeiChat-Baidu\WeiChat\src\main\AndroidManifest.xm
 MERGED from [SkWeiChat-Baidu:pullToRefershLibraryMy:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\AndroidManifest.xml:11:5-20
 MERGED from [SkWeiChat-Baidu:pullToRefershLibraryMy:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\AndroidManifest.xml:11:5-20
 MERGED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 MERGED from [SkWeiChat-Baidu:MPAndroidChart:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [SkWeiChat-Baidu:MPAndroidChart:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 MERGED from [SkWeiChat-Baidu:libfloatingactionbutton:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [SkWeiChat-Baidu:libfloatingactionbutton:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\AndroidManifest.xml:11:5-15:19
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
 MERGED from [com.android.support:appcompat-v7:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\AndroidManifest.xml:22:5-20
-MERGED from [com.android.support:support-v4:22.2.0] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
+MERGED from [com.android.support:support-v4:23.2.1] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\AndroidManifest.xml:22:5-20
 	android:supportsRtl
 	android:supportsRtl
 		ADDED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:14:9-35
 		ADDED from [SkWeiChat-Baidu:materialdialogs:unspecified] C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\AndroidManifest.xml:14:9-35
 	android:label
 	android:label

+ 26 - 0
WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java

@@ -17,6 +17,9 @@ import android.text.InputFilter;
 import android.text.TextUtils;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView;
@@ -57,6 +60,7 @@ import com.sk.weichat.ui.erp.activity.CompanyContactsActivity;
 import com.sk.weichat.ui.erp.view.ListViewInScroller;
 import com.sk.weichat.ui.erp.view.ListViewInScroller;
 import com.sk.weichat.ui.message.ChatActivity;
 import com.sk.weichat.ui.message.ChatActivity;
 import com.sk.weichat.ui.message.NewFriendActivity;
 import com.sk.weichat.ui.message.NewFriendActivity;
+import com.sk.weichat.ui.nearby.UserSearchActivity;
 import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.StringUtils;
 import com.sk.weichat.util.StringUtils;
 import com.sk.weichat.util.ToastUtil;
 import com.sk.weichat.util.ToastUtil;
@@ -147,6 +151,13 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         return R.layout.fragment_friend;
         return R.layout.fragment_friend;
     }
     }
 
 
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
     @Override
     @Override
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
     protected void onCreateView(Bundle savedInstanceState, boolean createView) {
         if (createView) {
         if (createView) {
@@ -651,4 +662,19 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
 
 
 
 
 
 
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_nearby, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.search) {
+            startActivity(new Intent(getActivity(), UserSearchActivity.class));
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
 }
 }

+ 67 - 0
WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java

@@ -12,6 +12,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
 import android.graphics.Matrix;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo;
@@ -19,6 +20,8 @@ import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.DisplayMetrics;
 import android.util.Patterns;
 import android.util.Patterns;
 
 
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.assist.ImageScaleType;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
 import com.sk.weichat.R;
 import com.sk.weichat.bean.Friend;
 import com.sk.weichat.bean.Friend;
@@ -45,6 +48,70 @@ public class CommonUtil {
 
 
     private final static String AppShareName = "setting";
     private final static String AppShareName = "setting";
 
 
+    //计算图片的缩放值
+    public static int calculateInSampleSize(BitmapFactory.Options options,int reqWidth, int reqHeight) {
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+            final int heightRatio = Math.round((float) height/ (float) reqHeight);
+            final int widthRatio = Math.round((float) width / (float) reqWidth);
+            inSampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
+        }
+        return inSampleSize;
+    }
+
+    // 根据路径获得图片并压缩,返回bitmap用于显示
+    public static Bitmap getSmallBitmap(String filePath) {
+        final BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(filePath, options);
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, 300, 300);
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+        return BitmapFactory.decodeFile(filePath, options);
+    }
+
+
+    // 根据路径获得图片并压缩,返回bitmap用于显示
+    public static BitmapFactory.Options getBitmapOptions() {
+        final BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, 300, 300);
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+        return options;
+    }
+
+
+
+    /**
+     * 显示图片的所有配置
+     * @return
+     */
+    private DisplayImageOptions getWholeOptions() {
+        DisplayImageOptions options = new DisplayImageOptions.Builder()
+//                .showImageOnLoading(R.drawable.loading) //设置图片在下载期间显示的图片
+//                .showImageForEmptyUri(R.drawable.ic_launcher)//设置图片Uri为空或是错误的时候显示的图片
+//                .showImageOnFail(R.drawable.error)  //设置图片加载/解码过程中错误时候显示的图片
+                .cacheInMemory(true)//设置下载的图片是否缓存在内存中
+                .cacheOnDisc(true)
+                .considerExifParams(true)  //是否考虑JPEG图像EXIF参数(旋转,翻转)
+                .imageScaleType(ImageScaleType.IN_SAMPLE_INT)//设置图片以如何的编码方式显示
+                .bitmapConfig(Bitmap.Config.RGB_565)//设置图片的解码类型
+                        //.decodingOptions(BitmapFactory.Options decodingOptions)//设置图片的解码配置
+                .delayBeforeLoading(0)//int delayInMillis为你设置的下载前的延迟时间
+                        //设置图片加入缓存前,对bitmap进行设置
+                        //.preProcessor(BitmapProcessor preProcessor)
+                .resetViewBeforeLoading(true)//设置图片在下载前是否重置,复位
+                .build();//构建完成
+        return options;
+    }
+
+
     public static String getRandomAccount() {
     public static String getRandomAccount() {
         String val = "";
         String val = "";
         Random random = new Random();
         Random random = new Random();

+ 17 - 3
WeiChat/src/main/java/com/sk/weichat/ui/tool/SingleImagePreviewActivity.java

@@ -4,6 +4,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.View;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.ProgressBar;
@@ -19,6 +20,8 @@ import com.sk.weichat.util.Scheme;
 
 
 import java.io.File;
 import java.io.File;
 
 
+import uk.co.senab.photoview.PhotoViewAttacher;
+
 /**
 /**
  * 单张图片预览
  * 单张图片预览
  * 
  * 
@@ -33,7 +36,7 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 	private ProgressBar mProgressBar;
 	private ProgressBar mProgressBar;
 	@SuppressWarnings("unused")
 	@SuppressWarnings("unused")
 	private TextView mProgressTextTv;
 	private TextView mProgressTextTv;
-
+	PhotoViewAttacher mAttacher;
 	@Override
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		super.onCreate(savedInstanceState);
@@ -48,12 +51,15 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 
 
 	private void initView() {
 	private void initView() {
 		mImageView = (ImageView) findViewById(R.id.image_view);
 		mImageView = (ImageView) findViewById(R.id.image_view);
+
 		mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
 		mProgressBar = (ProgressBar) findViewById(R.id.progress_bar);
 		mProgressTextTv = (TextView) findViewById(R.id.progress_text_tv);
 		mProgressTextTv = (TextView) findViewById(R.id.progress_text_tv);
 
 
 		boolean showProgress = false;
 		boolean showProgress = false;
 		// init status
 		// init status
+		Log.i("wang","mImageUri:"+mImageUri);
 		Scheme scheme = Scheme.ofUri(mImageUri);
 		Scheme scheme = Scheme.ofUri(mImageUri);
+		Log.i("wang","scheme:"+scheme);
 		switch (scheme) {
 		switch (scheme) {
 		case HTTP:
 		case HTTP:
 		case HTTPS:// 需要网络加载的
 		case HTTPS:// 需要网络加载的
@@ -76,11 +82,13 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 			// 其他 drawable asset类型不处理
 			// 其他 drawable asset类型不处理
 			break;
 			break;
 		}
 		}
-
+		Log.i("wang","end mImageUri:"+mImageUri);
 		if (showProgress) {
 		if (showProgress) {
 			ImageLoader.getInstance().displayImage(mImageUri, mImageView, mImageLoadingListener);
 			ImageLoader.getInstance().displayImage(mImageUri, mImageView, mImageLoadingListener);
 		} else {
 		} else {
-			ImageLoader.getInstance().displayImage(mImageUri, mImageView);
+			ImageLoader.getInstance().displayImage(mImageUri, mImageView, mImageLoadingListener);
+//			mAttacher=new PhotoViewAttacher(mImageView);
+//			mAttacher.update();
 		}
 		}
 
 
 		mImageView.setOnClickListener(new View.OnClickListener() {
 		mImageView.setOnClickListener(new View.OnClickListener() {
@@ -119,6 +127,8 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 		@Override
 		@Override
 		public void onLoadingComplete(String arg0, View arg1, Bitmap arg2) {
 		public void onLoadingComplete(String arg0, View arg1, Bitmap arg2) {
 			mProgressBar.setVisibility(View.GONE);
 			mProgressBar.setVisibility(View.GONE);
+			mAttacher=new PhotoViewAttacher((ImageView) arg1);
+			mAttacher.update();
 		}
 		}
 
 
 		@Override
 		@Override
@@ -127,4 +137,8 @@ public class SingleImagePreviewActivity extends ActionBackActivity {
 		}
 		}
 	};
 	};
 
 
+
+
+
+
 }
 }

+ 1 - 1
WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java

@@ -306,7 +306,7 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
                         return VIEW_FROM_ME_CARD;
                         return VIEW_FROM_ME_CARD;
                 }
                 }
             } else {
             } else {
-                switch (messageType) {
+                switch (messageType) {//接收消息
                     case XmppMessage.TYPE_TEXT:
                     case XmppMessage.TYPE_TEXT:
                         return VIEW_TO_ME_TEXT;
                         return VIEW_TO_ME_TEXT;
                     case XmppMessage.TYPE_IMAGE:
                     case XmppMessage.TYPE_IMAGE:

+ 1 - 1
WeiChat/src/main/res/layout/activity_single_image_preview.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
         android:contentDescription="@string/app_name"
         android:contentDescription="@string/app_name"
-        android:scaleType="centerInside" />
+        android:scaleType="fitCenter" />
 
 
     <ProgressBar
     <ProgressBar
         android:id="@+id/progress_bar"
         android:id="@+id/progress_bar"

+ 84 - 77
build/intermediates/dex-cache/cache.xml

@@ -2,137 +2,130 @@
 <items version="2" >
 <items version="2" >
 
 
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\flexjson-2.1.jar"
-        jumboMode="false"
-        revision="22.0.1"
-        sha1="8c7f1b58acdd98d8af02c2d5db653dfcba272d26">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\flexjson-2.1-6ef0a608965cd360c49d096bbcbf9fcb53d4684e.jar" />
-    </item>
-    <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\22.2.0\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\universal-image-loader-1.9.0.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="5b37cf49773f7f17aca9830efd3053b0cac56728">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-ebda11bc156a3b8877a94e20350d075e5d8a3d3b.jar" />
+        sha1="f667a2f4f27542fe11a6781f5f7ac572d27afcec">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\universal-image-loader-1.9.0-9d0332fa65613a549bb476615376993a3cfed1ae.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\xutils.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\cyberplayer-sdk.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="184b366777742230dddf66ae9f4849a95a783ad5">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\xutils-53de3df7e394dd93375724cc9731db14be412174.jar" />
+        sha1="412f0f2ebc711540ef966d931418e8320783146c">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\cyberplayer-sdk-b247a53586691fcc1e079f00d0645349358652d4.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\ormlite-core-4.48.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\httpmime-4.2.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="e579bd2905d0399af5029aaaf9817d5fa0ca88a5">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\ormlite-core-4.48-c9cc4bc7d068d52625ea271cb1cd7dc937989043.jar" />
+        sha1="6acbb2ba813e406f946d33dc14150e24c00b2c57">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\httpmime-4.2-abbd9b7f8d6e1d73bb17d6cb4ee462455e45ef10.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\android-async-http-1.4.5.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="7182521842a542ee7e280394adcbe52ba3ec90c8">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-803bb6b14b7bb226077e85ed529602cb62ee4ca3.jar" />
+        sha1="77bf7cacf9cefe19dc105e5425d2eb1bb5285881">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\android-async-http-1.4.5-d94aeb676ca0007244b06de9d8861bdbb7212c3b.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\cyberplayer-sdk.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\volley.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="412f0f2ebc711540ef966d931418e8320783146c">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\cyberplayer-sdk-b247a53586691fcc1e079f00d0645349358652d4.jar" />
+        sha1="f1a4c4ec9af6a75c246f48becbc661dbe8ae704b">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\volley-d0b96e6c5abd3e90573db924d69bdf6405d27c9d.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\android-async-http-1.4.5.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="77bf7cacf9cefe19dc105e5425d2eb1bb5285881">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\android-async-http-1.4.5-d94aeb676ca0007244b06de9d8861bdbb7212c3b.jar" />
+        sha1="3be474b1b21b31cf2fa93fe6bd641ae108d96452">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-45a301eaf7fc2f9c0e1a3fad5c45742830f1b5aa.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\pinyin4j-2.5.0.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\asmack.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="ae353005f973da1cd8545b54354504c2503f6865">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\pinyin4j-2.5.0-8315d53c40196b47bcfeacfcde6ac661cbc6cfc9.jar" />
+        sha1="a712dd7110edeae17f26919275737ef4e97db5c4">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\asmack-4f9f9407c133efaab6a2bea8f015e87f63f346aa.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\volley.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\xutils.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="f1a4c4ec9af6a75c246f48becbc661dbe8ae704b">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\volley-d0b96e6c5abd3e90573db924d69bdf6405d27c9d.jar" />
+        sha1="184b366777742230dddf66ae9f4849a95a783ad5">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\xutils-53de3df7e394dd93375724cc9731db14be412174.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.commit451\PhotoView\1.2.5\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="73753982da6bde518f3a4c6b372749981d14d1a0">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-144e4294cc3d4ae0314f1dfb0c2a74ede1d4f6d0.jar" />
+        sha1="526e8a982e8d1453c548b8d3a63968ee61667a15">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-fe223cd3ec9ea35a96c8acfd421eed3798c2846b.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\nineoldandroids.jar"
+        jar="C:\Android\sdk\extras\android\m2repository\com\android\support\support-annotations\23.2.1\support-annotations-23.2.1.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="2013a8ecb330caa20405436640f34b9d426eeef1">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\nineoldandroids-085afb9ec4e724ff86a4502d257f62890571c1b6.jar" />
+        sha1="ccb693bc0774fcb637246f7360de25b4af7df318">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\support-annotations-23.2.1-a56e9dd4c90bf7079c075061d78cff57c1577e98.jar" />
     </item>
     </item>
     <item
     <item
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libedittextformlibrary\unspecified\jars\classes.jar"
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libedittextformlibrary\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="31b9eb0365b955dcade1d666452573fcfadbbea3">
+        sha1="2df700e0f9a65fc9982186f1d4f6514389ad2cba">
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-ebc340d0a9932bb75e1d8351e9e55ac1e8cbe904.jar" />
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-ebc340d0a9932bb75e1d8351e9e55ac1e8cbe904.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\httpmime-4.2.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="6acbb2ba813e406f946d33dc14150e24c00b2c57">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\httpmime-4.2-abbd9b7f8d6e1d73bb17d6cb4ee462455e45ef10.jar" />
+        sha1="3b31c626ef7e2907dd9019c00060e3bfcca27ac5">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-1dba0e49cee9e1b5e3810ebee23d07230c862c87.jar" />
     </item>
     </item>
     <item
     <item
-        jar="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"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="57f2ab85c164ff1676ec64dee787981c046fab79">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\internal_impl-22.2.0-b0137434dc331910879ddf9b04f81ee1eebab460.jar" />
+        sha1="2264c2d2fe203a2d71f469defce6fb602141e749">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-5ffc49b8ddd89fd908db41acbf64c8c701a8814a.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Android\sdk\extras\android\m2repository\com\android\support\support-annotations\22.2.0\support-annotations-22.2.0.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\pinyin4j-2.5.0.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="66b42a1f3eb7676070b7ef7f14b603483aecbee1">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\support-annotations-22.2.0-70ba567356d3f4e70248bb87208265e9c5e15549.jar" />
+        sha1="ae353005f973da1cd8545b54354504c2503f6865">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\pinyin4j-2.5.0-8315d53c40196b47bcfeacfcde6ac661cbc6cfc9.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\universal-image-loader-1.9.0.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\appcompat-v7\22.2.0\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="f667a2f4f27542fe11a6781f5f7ac572d27afcec">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\universal-image-loader-1.9.0-9d0332fa65613a549bb476615376993a3cfed1ae.jar" />
+        sha1="73753982da6bde518f3a4c6b372749981d14d1a0">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-144e4294cc3d4ae0314f1dfb0c2a74ede1d4f6d0.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\org.xbill.dns_2.1.6.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\fastjson-1.1.41.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="c181799179cbd3aad85439268ec65ddb0b0c96f8">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\org.xbill.dns_2.1.6-c839bb037a0229188dea16d45ce11e57ae2b4806.jar" />
+        sha1="a244aa752b9e0210d0e50b5c1e11319711ed9290">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\fastjson-1.1.41-fc4b0b7756ec2d322277219ce0bb98a799de4e03.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\materialdialogs\unspecified\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\nineoldandroids.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="d30aa892aab02afd8b2b5d7102cdd38d0895569e">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-1dba0e49cee9e1b5e3810ebee23d07230c862c87.jar" />
+        sha1="2013a8ecb330caa20405436640f34b9d426eeef1">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\nineoldandroids-085afb9ec4e724ff86a4502d257f62890571c1b6.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libpsectionlistview\unspecified\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="8c28453d38a70933a842d8be57e607c24e9aae7d">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-f5fa11bbe3ce2cb8544143915bfc7e0cdd27a9e8.jar" />
+        sha1="8a9d189582a8801e6574caee020481f472ee1440">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-3887ee97fb164f1432a5183fdf2fd531da1dda89.jar" />
     </item>
     </item>
     <item
     <item
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\ormlite-android-4.48.jar"
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\ormlite-android-4.48.jar"
@@ -142,32 +135,46 @@
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\ormlite-android-4.48-6355f4ad736a39d5c5ed4c581599919105106c96.jar" />
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\ormlite-android-4.48-6355f4ad736a39d5c5ed4c581599919105106c96.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\pullToRefershLibraryMy\unspecified\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\ormlite-core-4.48.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="10595b60fc31791d56eb458380d39c1c7148a22b">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-3887ee97fb164f1432a5183fdf2fd531da1dda89.jar" />
+        sha1="e579bd2905d0399af5029aaaf9817d5fa0ca88a5">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\ormlite-core-4.48-c9cc4bc7d068d52625ea271cb1cd7dc937989043.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\22.2.0\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libfloatingactionbutton\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="1ee588ff2c4daf7b97c1cbf922a6c7f027285c2f">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-423534ece2a518021015630099f62dec0531caa6.jar" />
+        sha1="8225789a8d51c6b5b2c36c45b88b5d637d877338">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-803bb6b14b7bb226077e85ed529602cb62ee4ca3.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\asmack.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\support-v4\23.2.1\jars\libs\internal_impl-23.2.1.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="a712dd7110edeae17f26919275737ef4e97db5c4">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\asmack-4f9f9407c133efaab6a2bea8f015e87f63f346aa.jar" />
+        sha1="607a3d0b8013b4ccbfeb0b7cb293351994e021fb">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\internal_impl-23.2.1-ef4efb863fe5f44768291d01bc4b022316c5badd.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\MPAndroidChart\unspecified\jars\classes.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\SkWeiChat-Baidu\libpsectionlistview\unspecified\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="31148529f18961b77889ed256619e88548351497">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-5ffc49b8ddd89fd908db41acbf64c8c701a8814a.jar" />
+        sha1="a7208fe90ca4836bbd600570909ee2afaea10879">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-f5fa11bbe3ce2cb8544143915bfc7e0cdd27a9e8.jar" />
+    </item>
+    <item
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\pushservice-4.5.5.77.jar"
+        jumboMode="false"
+        revision="22.0.1"
+        sha1="84fe0a98d03ddd5fc159e00fe5466af75ae007f1">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\pushservice-4.5.5.77-2a7047c030595d1a86af2a43a8c52bf94104a647.jar" />
+    </item>
+    <item
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\org.xbill.dns_2.1.6.jar"
+        jumboMode="false"
+        revision="22.0.1"
+        sha1="c181799179cbd3aad85439268ec65ddb0b0c96f8">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\org.xbill.dns_2.1.6-c839bb037a0229188dea16d45ce11e57ae2b4806.jar" />
     </item>
     </item>
     <item
     <item
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\BaiduLBS_Android.jar"
         jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\BaiduLBS_Android.jar"
@@ -177,18 +184,18 @@
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\BaiduLBS_Android-d46fd461a46c270a25afcf4c9808f5db4747a7e0.jar" />
         <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\BaiduLBS_Android-d46fd461a46c270a25afcf4c9808f5db4747a7e0.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\pushservice-4.5.5.77.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\flexjson-2.1.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="84fe0a98d03ddd5fc159e00fe5466af75ae007f1">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\pushservice-4.5.5.77-2a7047c030595d1a86af2a43a8c52bf94104a647.jar" />
+        sha1="8c7f1b58acdd98d8af02c2d5db653dfcba272d26">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\flexjson-2.1-6ef0a608965cd360c49d096bbcbf9fcb53d4684e.jar" />
     </item>
     </item>
     <item
     <item
-        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\libs\fastjson-1.1.41.jar"
+        jar="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\exploded-aar\com.android.support\recyclerview-v7\22.2.0\jars\classes.jar"
         jumboMode="false"
         jumboMode="false"
         revision="22.0.1"
         revision="22.0.1"
-        sha1="a244aa752b9e0210d0e50b5c1e11319711ed9290">
-        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\fastjson-1.1.41-fc4b0b7756ec2d322277219ce0bb98a799de4e03.jar" />
+        sha1="5b37cf49773f7f17aca9830efd3053b0cac56728">
+        <dex dex="C:\Project\Studio\SkWeiChat-Baidu\WeiChat\build\intermediates\pre-dexed\debug\classes-ebda11bc156a3b8877a94e20350d075e5d8a3d3b.jar" />
     </item>
     </item>
 
 
 </items>
 </items>

+ 1 - 0
materialdialogs/materialdialogs.iml

@@ -72,6 +72,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />

BIN
pullToRefershLibraryMy/build/intermediates/bundles/debug/classes.jar


BIN
pullToRefershLibraryMy/build/intermediates/bundles/release/classes.jar


BIN
pullToRefershLibraryMy/build/intermediates/res/resources-debug-androidTest.ap_


BIN
pullToRefershLibraryMy/build/outputs/aar/pullToRefershLibraryMy-debug.aar


BIN
pullToRefershLibraryMy/build/outputs/aar/pullToRefershLibraryMy-release.aar


Some files were not shown because too many files changed in this diff