9.03 1、lalamove獲取交通工具接口服務器問題 2、冷鏈圖標

Signed-off-by: Wyh <1239658231>

base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java

@@ -94,9 +94,9 @@ public class HttpsConstans {
     public static String ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL;// = isFormal ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
 
     //默認url，配置這個值修改環境
-    public static String ROOT_SERVER_ADDRESS_FORMAL = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH;
+    public static String ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_FORMAL + PATH;
 
-    public static String ROOT_SERVER = isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK;
+    public static String ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL;
 
     //修改這個值，配置外賣接單環境
     public static String ROOT_URL;// = isFormal ? ROOT_FORMAL_URL : ROOT_HK_TEST_URL;//正式：ROOT_FORMAL_URL   測試：ROOT_HK_TEST_URL
@@ -126,6 +126,7 @@ public class HttpsConstans {
                 REPORT_SERVER_ADDRESS = REPORT_FORMAL_ADDRESS + REPORT_PATH;
                 WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_FORMAL_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
                 SYSTEM_URL = HTTP_ADDRESS_URL_FORMAL + SYSTEM_PATH;
+                ROOT_SERVER = HTTP_ADDRESS_URL_FORMAL;
                 break;
             case 1:
                 _SERVER_ADDRESS = "http://a.ricepon.com:61177" + "/member-web/api/";
@@ -135,6 +136,7 @@ public class HttpsConstans {
                 REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS + REPORT_PATH;
                 WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
                 SYSTEM_URL = ROOT_HK_TEST_URL + SYSTEM_PATH;
+                ROOT_SERVER = HTTP_ADDRESS_URL_HK;
                 break;
             case 2:
                 _SERVER_ADDRESS = ROOT_SERVER_ZHI_WANG_HK + "/member-web/api/";

delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OrderDetailsActivity.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
+import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Observer
@@ -59,6 +60,9 @@ class OrderDetailsActivity : BaseActivity() {
     lateinit var skeletonScreen: ViewSkeletonScreen
     var restaurantId: Int = -1
 
+    lateinit var rvThirdExpenses: RecyclerView
+
+    lateinit var thirdExpensesLayout: LinearLayout
     lateinit var btnBuilder: BtnBuilder
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -67,6 +71,9 @@ class OrderDetailsActivity : BaseActivity() {
         btnBuilder = BtnBuilder.getInstance(functionByResModule)
 
         val rootView = findViewById<View>(R.id.scroll_order_info)
+        thirdExpensesLayout = findViewById(R.id.layout_third_expenses)
+        rvThirdExpenses = findViewById(R.id.rv_third_expenses)
+
         skeletonScreen = Skeleton.bind(rootView)
                 .load(R.layout.activity_order_details_loading)
                 .shimmer(true)
@@ -82,6 +89,7 @@ class OrderDetailsActivity : BaseActivity() {
         isRead = intent.getIntExtra("isRead", -1)//是否已讀訂單
         state = intent.getIntExtra("orderStatus", -1)//訂單狀態
         isTimeOut = intent.getBooleanExtra("isTimeOut", false)//接單是否超時
+
         pageViewModel = ViewModelProvider(this, InjectorUtil.getWeatherModelFactory())[PageViewModel::class.java].apply {
             if (isRead == 0) {
                 //如果是未讀，調用設為已讀接口
@@ -102,7 +110,6 @@ class OrderDetailsActivity : BaseActivity() {
     private fun PageViewModel.getOrderDetails(orderId: String, binding: ActivityOrderDetailsBinding) {
         getShipanyAndOrderInfo(restaurantId, orderId)
         getAdditionalByOrderId(orderId)
-
         orderDetails.observe(this@OrderDetailsActivity, Observer { it ->
             skeletonScreen.hide()//隱藏骨架屏
             if (it?.data != null && it.data!!.isNotEmpty()) {
@@ -287,7 +294,7 @@ class OrderDetailsActivity : BaseActivity() {
                             showLoading()
                             getIsUpdateTransportation(restaurantId) {
                                 cancelDialogForLoading()
-                                if (it == null) {
+                                if (it == null || it.isEmpty()) {
                                     ToastUtils.show(this@OrderDetailsActivity, "未獲取到交通工具")
                                 } else {
                                     showSelectTransportation(it, orderDetails, false)
@@ -374,12 +381,20 @@ class OrderDetailsActivity : BaseActivity() {
                 }
             }
         })
+//        getAdditionalByOrderId(orderId) {
+//            if (it != null && it.data.isNotEmpty()) {
+//                thirdExpensesLayout.visibility = View.VISIBLE
+//                it.data.add(0, ServiceChargeRecordBean.DataX(0, 0, 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0, "", ""))
+//                rvThirdExpenses.adapter = ThirdExpensesAdapter(it.data)
+//                rvThirdExpenses.layoutManager = LinearLayoutManager(this@OrderDetailsActivity)
+//            }
+//        }
         serviceChargeRecordBeans.observe(this@OrderDetailsActivity, Observer {
             if (it != null && it.data.isNotEmpty()) {
-                layout_third_expenses?.visibility = View.VISIBLE
+                thirdExpensesLayout.visibility = View.VISIBLE
                 it.data.add(0, ServiceChargeRecordBean.DataX(0, 0, 0, 0, 0, 0, 0.0, 0, 0, 0, 0, 0, "", ""))
-                rv_third_expenses?.adapter = ThirdExpensesAdapter(it.data)
-                rv_third_expenses?.layoutManager = LinearLayoutManager(this@OrderDetailsActivity)
+                rvThirdExpenses.adapter = ThirdExpensesAdapter(it.data)
+                rvThirdExpenses.layoutManager = LinearLayoutManager(this@OrderDetailsActivity)
             }
         })
     }
@@ -647,6 +662,5 @@ class OrderDetailsActivity : BaseActivity() {
     override fun onDestroy() {
         super.onDestroy()
         DialogUtils.staticDismiss()
-        pageViewModel.serviceChargeRecordBeans.removeObservers(this@OrderDetailsActivity)
     }
 }

delivery_pick_mode/src/main/res/layout/layout_delivery_order_item.xml

@@ -252,8 +252,8 @@
                                 android:id="@+id/ic_vehicle"
                                 android:layout_width="@dimen/dp_26"
                                 android:layout_height="@dimen/dp_26"
-                                android:layout_marginLeft="@dimen/dp_5"
-                                android:layout_marginRight="@dimen/dp_5"
+                                android:layout_marginLeft="@dimen/dp_2"
+                                android:layout_marginRight="@dimen/dp_2"
                                 android:src="@{vehicle}"
                                 android:visibility="@{vehicle== null?View.GONE:View.VISIBLE}" />
                         </LinearLayout>
@@ -325,11 +325,11 @@
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="@dimen/dp_2"
                                     android:gravity="center_horizontal"
                                     android:text="@{@string/amount_unit + data.paymentValue}"
                                     android:textColor="@color/red_600"
                                     android:textSize="@dimen/sp_10"
+                                    android:layout_marginRight="@dimen/dp_2"
                                     app:layout_constraintHorizontal_weight="1"
                                     app:layout_constraintLeft_toRightOf="@id/tv_address"
                                     app:layout_constraintRight_toRightOf="parent"

main-module/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java

@@ -18,7 +18,7 @@ public class ComponentMain implements IComponent {
                 new FModule("main/order/delivery",  R.drawable.ic_delivery_mode,R.drawable.ic_delivery_mode_close) ,
                 new FModule("main/order/takeaway",  R.drawable.ic_outsourcing_model,R.drawable.ic_outsourcing_model_close),
                 new FModule("main/order/preorder",  R.drawable.ic_pre_order_mode,R.drawable.ic_pre_order_mode_close),
-                new FModule("main/order/coldChain",  R.drawable.ic_pre_order_mode,R.drawable.ic_pre_order_mode_close),
+                new FModule("main/order/coldChain",  R.drawable.ic_cold_chain,R.drawable.ic_pre_order_mode_close),
         };
         /**首頁- 管理*/
         public static final FModule [] manager = {