语言检漏 提交 冲突

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

@@ -5,61 +5,147 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingDetailActivity">
+   <RelativeLayout
+       android:id="@+id/rv_top"
+       android:layout_width="match_parent"
+       android:layout_height="wrap_content"
+       android:layout_alignParentTop="true">
+       <LinearLayout
+           android:id="@+id/ll_left"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:padding="15dp"
+           android:orientation="vertical">
+
+           <ImageView
+               android:layout_width="70dp"
+               android:layout_height="70dp"
+               android:src="@drawable/defaultpic" />
+           <TextView
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content" 
+               android:padding="5dp"
+               android:gravity="center"
+               android:text="@string/me"/>
+       </LinearLayout>
+
+       <ImageView
+          android:layout_toRightOf="@+id/ll_left"
+           android:layout_toLeftOf="@+id/ll_right"
+           android:layout_width="match_parent"
+           android:layout_height="wrap_content"
+           android:layout_centerInParent="true"
+           android:background="@drawable/icon_jujue" />
+       <LinearLayout
+           android:id="@+id/ll_right"
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           android:layout_alignParentRight="true"
+           android:padding="15dp"
+           android:orientation="vertical"
+          >
+           <ImageView
+               android:id="@+id/imageView4"
+               android:layout_width="70dp"
+               android:layout_height="70dp"
+               android:layout_alignParentTop="true"
+               android:src="@drawable/defaultpic" />
+           <TextView
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:padding="5dp"
+               android:gravity="center"
+               android:text="@string/me"/>
+       </LinearLayout>
+       
+   </RelativeLayout>
+    
+    
+<LinearLayout
+    android:layout_below="@+id/rv_top"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:layout_margin="15dp"
+    android:orientation="vertical">
     <LinearLayout
-        android:id="@+id/item_common_docui_res_and_del_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@color/bg_main"
-        android:paddingBottom="5dp"
-        android:visibility="gone"
-        >
-
-        <LinearLayout
-            android:id="@+id/common_docui_resubmit_ll"
-            android:layout_weight="1"
-            android:layout_width="0dp"
+        android:padding="7dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" 
+            android:layout_marginLeft="20dp"
+            android:text="时间："/>
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
-            <TextView
-                android:id="@+id/common_docui_resubmit_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
-                android:layout_marginTop="10dp"
-                android:paddingBottom="10dp"
-                android:text="重新提交"
-                />
-
-        </LinearLayout>
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/black"
+            android:text="19:10"/>
+    </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="7dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:text="时间："/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/black"
+            android:text="19:10"/>
+    </LinearLayout>
 
-        <View
-            android:layout_width="1dp"
-            android:layout_height="20dp"
-            android:background="@color/item_line"
-            android:layout_gravity="center_vertical"
-            />
-        <LinearLayout
-            android:id="@+id/common_docui_delete_ll"
-            android:layout_weight="1"
-            android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="7dp"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:text="内容："/>
+        <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:background="@drawable/selector_me_menu_item_bg">
-            <TextView
-                android:id="@+id/common_docui_delete_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textSize="18sp"
-                android:textColor="@color/titleBlue"
-                android:layout_marginTop="10dp"
-                android:paddingBottom="10dp"
-                android:text="删除"
-                />
-        </LinearLayout>
+            android:layout_marginLeft="10dp"
+            android:textColor="@color/black"
+            android:text="###########################################"/>
+    </LinearLayout>
 
+    <ImageView
+        android:layout_width="70dp"
+        android:layout_height="70dp"
+        android:layout_gravity="right"
+        android:src="@drawable/icon_jujue1" />
+</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:weightSum="2"
+        android:layout_alignParentBottom="true">
+        <Button
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:text="@string/me"
+            android:background="@drawable/select_weixin_list_item"
+            android:layout_weight="1"/>
+        <view
+          style="@style/app_line_v_1dp"></view>
+        <Button
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/select_weixin_list_item"
+            android:text="@string/me"
+            android:layout_weight="1"/>
     </LinearLayout>
 </RelativeLayout>