zhou.xiaoning hace 4 años
padre
commit
fb56dfbe09

+ 2 - 2
RMA/app/src/main/java/cn/muchinfo/rma/view/base/app/Constant.kt

@@ -9,10 +9,10 @@ object Constant {
     /**
      * 获取基础url的接口
      */
-    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
+//    const val baseurl = "http://103.40.249.127:28280/cfg?key=mtp_20"
 //    const val baseurl = "http://192.168.30.125:8080/cfg?key=test_125"
 //    const val baseurl = "http://192.168.31.114:8080/cfg?key=test_114" // shenzhen01  123123
-//      const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
+      const val baseurl = "http://192.168.31.220:8080/cfg?key=test_220"//李倩
 //      const val baseurl = "http://192.168.30.211:8080/cfg?key=test_211"// 瑶姐
 
     /**

+ 17 - 15
RMA/app/src/main/res/layout/order_detail.xml

@@ -60,22 +60,24 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:paddingStart="15dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/id_order_button_area"
         app:layout_constraintTop_toBottomOf="@+id/id_order_relation_head" />
     
-<!--    <LinearLayout-->
-<!--        android:id="@+id/id_order_button_area"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="48dp"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        android:orientation="horizontal">-->
+    <LinearLayout
+        android:id="@+id/id_order_button_area"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="horizontal">
 
-<!--        <TextView-->
-<!--            android:layout_width="260dp"-->
-<!--            android:layout_height="39dp"-->
-<!--            android:background="@mipmap/rma_submit_bg"-->
-<!--            android:gravity="center"-->
-<!--            android:text="@string/str_order_close"-->
-<!--            android:textColor="@color/white" />-->
-<!--    </LinearLayout>-->
+        <TextView
+            android:id="@+id/id_order_close"
+            android:layout_width="260dp"
+            android:layout_height="39dp"
+            android:background="@mipmap/rma_submit_bg"
+            android:gravity="center"
+            android:text="@string/str_order_close"
+            android:textColor="@color/white" />
+    </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>