version:4.6

fix:
update:优化订单页，增加快递详情页

app/src/main/java/com/uiuios/aios/activity/ExpressActivity.java

@@ -0,0 +1,112 @@
+package com.uiuios.aios.activity;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.databinding.DataBindingUtil;
+
+import com.trello.rxlifecycle4.RxLifecycle;
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiuios.aios.R;
+import com.uiuios.aios.base.BaseDataBindingActivity;
+import com.uiuios.aios.bean.BaseResponse;
+import com.uiuios.aios.bean.ExpressData;
+import com.uiuios.aios.bean.LogisticsTrace;
+import com.uiuios.aios.bean.LogisticsTraceDeta;
+import com.uiuios.aios.databinding.ActivityExpressBinding;
+import com.uiuios.aios.network.NetInterfaceManager;
+import com.uiuios.aios.utils.TimeUtils;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public class ExpressActivity extends BaseDataBindingActivity {
+    private static final String TAG = ExpressActivity.class.getSimpleName();
+
+    private ActivityExpressBinding mBinding;
+
+    /**
+     * 初始化视图
+     */
+    @Override
+    public void initView() {
+        mBinding = DataBindingUtil.setContentView(this, R.layout.activity_express);
+
+    }
+
+    /**
+     * 初始化数据
+     */
+    @Override
+    public void initData() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            Log.e(TAG, "initData: intent is null");
+            return;
+        }
+        String orderSn = intent.getStringExtra("order_sn");
+        String orderId = intent.getStringExtra("order_id");
+        if (TextUtils.isEmpty(orderSn) || TextUtils.isEmpty(orderId)) {
+            Log.e(TAG, "initData: orderSn is empty or orderId is empty");
+            return;
+        }
+        getOrderExpress(orderSn, orderId);
+    }
+
+    private void getOrderExpress(String orderSn, String orderId) {
+        NetInterfaceManager.getInstance()
+                .getOrderExpressObservable(orderSn, orderId)
+                .compose(RxLifecycle.bindUntilEvent(lifecycleSubject, ActivityEvent.DESTROY))
+                .subscribe(new Observer<BaseResponse<ExpressData>>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+                        Log.e("getOrderExpress", "onSubscribe: ");
+                    }
+
+                    @Override
+                    public void onNext(@NonNull BaseResponse<ExpressData> expressDataBaseResponse) {
+                        Log.e("getOrderExpress", "onNext: " + expressDataBaseResponse);
+                        if (expressDataBaseResponse.code == 200) {
+                            ExpressData expressData = expressDataBaseResponse.data;
+                            if (expressData.isSuccess()) {
+                                LogisticsTrace logisticsTrace = expressData.getLogisticsTrace();
+                                mBinding.tvExpressNo.setText(logisticsTrace.getMailNo());
+                                List<LogisticsTraceDeta> logisticsTraceDetaList = logisticsTrace.getLogisticsTraceDetailList();
+                                for (LogisticsTraceDeta logisticsTraceDeta : logisticsTraceDetaList) {
+                                    View view = LayoutInflater.from(ExpressActivity.this).inflate(R.layout.item_timeline, mBinding.timelineLayout, false);
+                                    ((TextView) view.findViewById(R.id.tv_action)).setText(logisticsTraceDeta.getDesc());
+                                    ((TextView) view.findViewById(R.id.tv_action_time)).setText(TimeUtils.transferLongToDate(logisticsTraceDeta.getTime()));
+                                    ((TextView) view.findViewById(R.id.tv_action_status)).setText(logisticsTraceDeta.getAreaName());
+                                    mBinding.timelineLayout.addView(view);
+                                }
+                                mBinding.timelineLayout.setVisibility(View.VISIBLE);
+                                mBinding.clNodata.setVisibility(View.GONE);
+                            }else {
+                                mBinding.timelineLayout.setVisibility(View.GONE);
+                                mBinding.clNodata.setVisibility(View.VISIBLE);
+                            }
+                        } else {
+                            mBinding.timelineLayout.setVisibility(View.GONE);
+                            mBinding.clNodata.setVisibility(View.VISIBLE);
+                        }
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        Log.e("getOrderExpress", "onError: " + e.getMessage());
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        Log.e("getOrderExpress", "onComplete: ");
+                    }
+                });
+    }
+}

app/src/main/java/com/uiuios/aios/activity/InformationActivity.java

@@ -38,10 +38,11 @@ import io.reactivex.rxjava3.disposables.Disposable;
 public class InformationActivity extends DataBindingActivity {
     private static final String TAG = InformationActivity.class.getSimpleName();
 
+
     @BindView(R.id.tabLayout)
     TabLayout tabLayout;
-    @BindView(R.id.root)
-    ConstraintLayout root;
+    @BindView(R.id.cl_bar)
+    ConstraintLayout cl_bar;
     @BindView(R.id.rv_video)
     RecyclerView rv_video;
     @BindView(R.id.cl_nodata)
@@ -60,7 +61,7 @@ public class InformationActivity extends DataBindingActivity {
                 .transparent()
                 .apply();
 
-        UltimateBarX.addStatusBarTopPadding(tabLayout);
+        UltimateBarX.addStatusBarTopPadding(cl_bar);
 
         mInformationAdapter = new InformationAdapter();
         LinearLayoutManager linearLayoutManager1 = new LinearLayoutManager(this);

app/src/main/java/com/uiuios/aios/activity/OrderListActivity.java

@@ -4,6 +4,7 @@ import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import android.util.Log;
+import android.view.View;
 
 import com.google.android.material.tabs.TabLayout;
 import com.trello.rxlifecycle4.RxLifecycle;
@@ -81,6 +82,12 @@ public class OrderListActivity extends BaseDataBindingActivity {
                 Log.e(TAG, "onTabReselected: " + tab.getText());
             }
         });
+        mBinding.ivExit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
     }
 
     /**
@@ -117,14 +124,22 @@ public class OrderListActivity extends BaseDataBindingActivity {
                     OrderIndexData orderIndexData = baseResponse.data;
                     List<OrderIndexBean> orderIndexBeanList = orderIndexData.getData();
                     mOrderAdapter.setOrderIndexBeans(orderIndexBeanList);
-                }else {
+                    mBinding.rvOrder.setVisibility(View.VISIBLE);
+                    mBinding.clNodata.setVisibility(View.GONE);
+                } else {
                     mOrderAdapter.setOrderIndexBeans(null);
+                    mBinding.rvOrder.setVisibility(View.GONE);
+                    mBinding.clNodata.setVisibility(View.VISIBLE);
                 }
             }
 
             @Override
             public void onError(@NonNull Throwable e) {
                 Log.e("getAllOrderListObserver", "onError: " + e.getMessage());
+                mOrderAdapter.setOrderIndexBeans(null);
+                mBinding.rvOrder.setVisibility(View.GONE);
+                mBinding.clNodata.setVisibility(View.VISIBLE);
+                onComplete();
             }
 
             @Override