提交分类 功能完善

提交内容 商家设置-座位设置联动效果

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Dec 11 16:07:47 CST 2017
-debugName=115
+#Wed Dec 13 08:52:55 CST 2017
+debugName=122
 versionName=618
-debugCode=115
+debugCode=122
 versionCode=157

app_core/common/src/main/res/layout/bsetting_activity.xml

@@ -3,342 +3,353 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-    <RelativeLayout
-        android:id="@+id/image_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="形象照片"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-        <TextView
-            android:id="@+id/image_setting_new"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_alignTop="@+id/tv_oa"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="10dp"
-            android:layout_alignParentRight="true"
-            android:background="@drawable/hongdian"
-            android:textColor="@android:color/white"
-            android:textSize="10.0dip"
-            android:visibility="gone"/>
-    </RelativeLayout>
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scrollbars="none">
 
-    <RelativeLayout
-        android:id="@+id/keshi_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:visibility="gone">
-        <View
-            android:layout_alignParentBottom="true"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="科室设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            android:orientation="vertical">
+            <RelativeLayout
+                android:id="@+id/image_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="形象照片"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                <TextView
+                    android:id="@+id/image_setting_new"
+                    android:layout_width="10dp"
+                    android:layout_height="10dp"
+                    android:layout_alignTop="@+id/tv_oa"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:layout_alignParentRight="true"
+                    android:background="@drawable/hongdian"
+                    android:textColor="@android:color/white"
+                    android:textSize="10.0dip"
+                    android:visibility="gone"/>
+            </RelativeLayout>
 
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/people_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="人员设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/keshi_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:visibility="gone">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="科室设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-    <RelativeLayout
-        android:id="@+id/batchplace_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置服务/场地/房间"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/people_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="人员设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-        <RelativeLayout
-            style="@style/IMTbleLine"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_marginBottom="118dp"
-            android:layout_marginEnd="11dp"
-            android:layout_marginRight="11dp"
-            android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
+            <RelativeLayout
+                android:id="@+id/batchplace_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置服务/场地/房间"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
+                <RelativeLayout
+                    style="@style/IMTbleLine"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginBottom="118dp"
+                    android:layout_marginEnd="11dp"
+                    android:layout_marginRight="11dp"
+                    android:background="@drawable/selector_me_menu_item_bg"
+                    android:visibility="gone">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:gravity="center"
-                android:text="员工休息日设置"
-                android:textColor="@color/black"
-                android:textSize="14sp" />
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/line"
+                        android:layout_alignParentBottom="true"
+                        android:background="@color/item_line" />
 
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:gravity="center"
+                        android:text="员工休息日设置"
+                        android:textColor="@color/black"
+                        android:textSize="14sp" />
 
-        </RelativeLayout>
+                    <ImageView
+                        android:layout_width="@dimen/next_width"
+                        android:layout_height="@dimen/next_height"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/oa_next"
+                        android:contentDescription="@string/app_name" />
 
-    </RelativeLayout>
+                </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/employeerest_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置员工休息日"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/employeerest_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置员工休息日"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
 
-    <RelativeLayout
-        android:id="@+id/companyrest_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置企业休息日"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/business_hours_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置营业时间"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-        Business hours
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/booking_timetype_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置预约时间类型"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/companyrest_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置企业休息日"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/room_type_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="设置包房预订类型"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/table_setting_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="桌位设置"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
-    <RelativeLayout
-        android:id="@+id/business_introduction_rl"
-        style="@style/IMTbleLine"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true">
-        <View
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:background="@color/item_line" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:gravity="center"
-            android:text="商家详情"
-            android:textColor="@color/black"
-            android:textSize="14sp" />
-        <ImageView
-            android:layout_width="@dimen/next_width"
-            android:layout_height="@dimen/next_height"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/oa_next"
-            android:contentDescription="@string/app_name" />
-    </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/business_hours_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置营业时间"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+                Business hours
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/booking_timetype_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置预约时间类型"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/room_type_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="设置包房预订类型"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/table_setting_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="桌位设置"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+            <RelativeLayout
+                android:id="@+id/business_introduction_rl"
+                style="@style/IMTbleLine"
+                android:background="@drawable/selector_me_menu_item_bg"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="商家详情"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+                <ImageView
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/oa_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/TableSetActivity.java

@@ -78,7 +78,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             TableMode model = new TableMode();
             model.setAs_deskcode("");
             model.setAs_number("");
-            model.setAs_type("大桌");
+            model.setAs_type("");
             model.setAs_remark("");
 //            model.setAs_id("0");
             model.setAs_companyid(as_companyid);
@@ -132,7 +132,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                 TableMode model = new TableMode();
                 model.setAs_deskcode("");
                 model.setAs_number("");
-                model.setAs_type("大桌");
+                model.setAs_type("");
                 model.setAs_remark("");
                 model.setAs_id("0");
                 model.setAs_companyid(as_companyid);
@@ -294,7 +294,7 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
             tableView.deskcode_et.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    doInput(1,position);
+//                    doInput(1,position);
                 }
             });
             tableView.number_et.setOnClickListener(new View.OnClickListener() {
@@ -432,14 +432,22 @@ public class TableSetActivity extends BaseActivity implements View.OnClickListen
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         String ttype = null;
+                        String code = null;
                         if (which == 0) {
                             ttype =  "大桌";
+                            code = "A";
                         }else if (which == 1){
                             ttype =  "中桌";
+                            code = "B";
                         }else {
                             ttype =  "小桌";
+                            code = "C";
                         }
-
+                       if (JSON.toJSONString(tableList).contains(code)){
+                            ToastMessage("桌位不可重复设置");
+                            return;
+                       }
+                        tableList.get(position).setAs_deskcode(code);
                         tableList.get(position).setAs_type(ttype);
                         myAdapter.notifyDataSetChanged();
                         dialog.dismiss();

app_modular/appme/src/main/res/layout/table_item.xml

@@ -56,7 +56,6 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:background="@null"
-            android:hint="@string/common_input"
             android:textSize="15sp"
             android:gravity="center_vertical|right"
             android:maxLength="10"