本地代码提交002

.idea/workspace.xml

@@ -110,7 +110,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="3d3f13aa-a503-4063-9891-3d4721be952b" name="Default" comment="1 图片展示问题解决；引入新的库photoView；">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_23_2_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_23_2_1.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/SelectCardActivity$1.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/SelectCardActivity$2.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/SelectCardActivity$3.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/SelectCardActivity$ListViewAdapter.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/classes/debug/com/sk/weichat/ui/message/SelectCardActivity.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/res/merged/debug/layout/activity_select_card.xml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/WeiChat/build/intermediates/res/merged/debug/layout/row_select_card.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="SkWeiChat-Baidu.iws" />
@@ -176,8 +182,8 @@
       <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/WeiChat/src/main/AndroidManifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-14.734657">
-              <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.5433213">
+              <caret line="376" column="28" selection-start-line="376" selection-start-column="28" selection-end-line="376" selection-end-column="28" />
               <folding />
             </state>
           </provider>
@@ -7114,7 +7120,13 @@
       <option name="project" value="LOCAL" />
       <updated>1459136848406</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="1 图片展示问题解决；引入新的库photoView；">
+      <created>1459218550971</created>
+      <option name="number" value="00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1459218550971</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -7593,8 +7605,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/WeiChat/src/main/AndroidManifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-14.734657">
-          <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.5433213">
+          <caret line="376" column="28" selection-start-line="376" selection-start-column="28" selection-end-line="376" selection-end-column="28" />
           <folding />
         </state>
       </provider>

WeiChat/build/intermediates/res/merged/debug/layout/activity_select_card.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.sk.weichat.ui.message.SelectCardActivity">
+
+    <ListView
+        android:id="@+id/list_view"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@+id/added_layout"
+        android:cacheColorHint="#00000000"
+        android:gravity="fill"
+        android:scrollbars="none" />
+
+    <RelativeLayout
+        android:visibility="gone"
+        android:id="@+id/added_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="55dp"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/mmfooter_bg_white"
+        android:paddingBottom="7dp"
+        android:paddingLeft="7dp"
+        android:paddingRight="1dp"
+        android:paddingTop="7dp" >
+
+        <Button
+            android:id="@+id/ok_btn"
+            style="@style/IMButton.Orange"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:focusable="true"
+            android:gravity="center"
+            android:minHeight="40dp"
+            android:minWidth="75.0dip"
+            android:padding="5dp"
+            android:text="@string/add_chat_ok_btn"
+            android:textColor="@color/white"
+            android:textSize="@dimen/NormalTextSize" />
+
+<!--当前单选   当需要多选的时候启用-->
+        <!--<com.sk.weichat.view.HorizontalListView-->
+            <!--xmlns:widget="http://schemas.android.com/apk/res-auto"-->
+            <!--android:id="@+id/horizontal_list_view"-->
+            <!--android:layout_width="fill_parent"-->
+            <!--android:layout_height="37dp"-->
+            <!--android:layout_centerVertical="true"-->
+            <!--android:layout_toLeftOf="@id/ok_btn"-->
+            <!--android:divider="@color/transparent"-->
+            <!--widget:dividerWidth="5dp" />-->
+    </RelativeLayout>
+</RelativeLayout>
+<!-- From: file:/C:/Project/Studio/SkWeiChat-Baidu/WeiChat/src/main/res/layout/activity_select_card.xml -->

WeiChat/build/intermediates/res/merged/debug/layout/row_select_card.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_selector_background"
+    android:descendantFocusability="blocksDescendants"
+    android:minHeight="64dp"
+    android:paddingLeft="15dp"
+    android:paddingRight="15dp" >
+
+    <FrameLayout
+        android:id="@+id/head_area"
+        android:layout_width="57dp"
+        android:layout_height="64dp"
+        android:layout_centerVertical="true" >
+
+        <ImageView
+            android:id="@+id/avatar_img"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/avatar_normal" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/user_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@+id/check_box"
+        android:layout_toRightOf="@id/head_area"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="@color/black"
+        android:textSize="16.0dip" />
+
+
+
+</RelativeLayout><!-- From: file:/C:/Project/Studio/SkWeiChat-Baidu/WeiChat/src/main/res/layout/row_select_card.xml -->