1

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -218,6 +218,11 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
                             takePhoto();
                         } else {
                             selectPhoto(); //TODO 新写一个可以一次选择多张照片的方法
+//                            Intent intent = new Intent(SendShuoshuoActivity.this,
+//                                    ImageBucketChooseActivity.class);
+//                            intent.putExtra(IntentConstants.EXTRA_CAN_ADD_IMAGE_SIZE,
+//                                    getAvailableSize());
+//                            startActivity(intent);
                         }
                         dialog.dismiss();
                     }

WeiChat/src/main/res/layout/activity_location_search.xml

@@ -40,7 +40,47 @@
         android:layout_height="0dp"
         android:layout_weight="3"
         android:clickable="false" />
-
+    <LinearLayout
+        android:id="@+id/qzone_map_ll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:visibility="gone">
+        <TextView
+            android:id="@+id/hidden_location_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:padding="5dp"
+            android:text="不显示位置"
+            android:textSize="@dimen/text_main"
+            android:textColor="@color/titleBlue"
+            android:visibility="visible"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="8dp"
+            android:background="@color/light_gray"
+            android:visibility="visible"/>
+        <TextView
+            android:id="@+id/location_city_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginBottom="5dp"
+            android:padding="5dp"
+            android:text=""
+            android:textSize="@dimen/text_main"
+            />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/line"
+            android:layout_marginTop="8dp"
+            android:background="@color/light_gray"
+            />
+    </LinearLayout>
     <ListView
         android:id="@+id/listview"
         android:layout_width="match_parent"