1.修改物流参数

app/src/main/AndroidManifest.xml

@@ -467,7 +467,7 @@
         <activity
             android:name=".ui.activity.bat.work.WorkContactsOpenTicketActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="开票管理"
+            android:label="开票单"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -475,7 +475,7 @@
         <activity
             android:name=".ui.activity.bat.work.WorkContactsReceiveTicketActivity"
             android:configChanges="keyboardHidden|orientation"
-            android:label="收票管理"
+            android:label="收票单"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
@@ -2294,6 +2294,14 @@
             android:screenOrientation="portrait"
             android:theme="@style/Work.Base"
             android:windowSoftInputMode="adjustPan" />
+        <activity
+            android:name=".ui.activity.bat.work.ContactsLogisticsActivity"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:label="开票单"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            android:theme="@style/Work.Base"
+            android:windowSoftInputMode="adjustPan" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.wd.workoffice.fileprovider"

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/ContactsLogisticsActivity.java

+package com.wd.workoffice.ui.activity.bat.work;
+
+import android.view.View;
+
+import com.alibaba.fastjson.JSON;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.scwang.smartrefresh.layout.SmartRefreshLayout;
+import com.wd.workoffice.R;
+import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.app.WorkBaseActivity;
+import com.wd.workoffice.app.WorkToolBarActivity;
+import com.wd.workoffice.bean.LogisticBean;
+import com.wd.workoffice.bean.event.CheckLogisticEvent;
+import com.wd.workoffice.retrofit.RtfUtils;
+import com.wd.workoffice.retrofit.WorkObserver;
+import com.wd.workoffice.ui.adapter.WorkLogisticAdapter;
+import com.wd.workoffice.util.WorkUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import flexible.xd.android_base.network.rtfhttp.Transformer;
+import io.reactivex.disposables.Disposable;
+
+
+/**
+ * author : flexible
+ * email : lgd19940421@163.com
+ * github: https://github.com/FlexibleXd
+ **/
+public class ContactsLogisticsActivity extends WorkToolBarActivity {
+
+    @BindView(R.id.rv_data)
+    RecyclerView rvData;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
+    private int page = 1;
+    private Map<String, Object> param;
+    private WorkLogisticAdapter dataAdapter;
+    private List<LogisticBean.RecordsBean> dataList;
+
+    @Override
+    protected void initView() {
+        ButterKnife.bind(this);
+        rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
+    }
+
+
+    @Override
+    protected void initData() {
+        param = WorkUtils.pageKey();
+        param.put("status", 1);
+        page = 1;
+        param.put("current", page);
+        param.put("logisticsId", getIntent().getStringExtra("id"));
+        dataList = new ArrayList<>();
+        dataAdapter = new WorkLogisticAdapter(R.layout.item_logistics, dataList);
+        dataAdapter.bindToRecyclerView(rvData);
+        dataAdapter.setEmptyView(R.layout.view_empty_content, rvData);
+        getData();
+    }
+
+
+    private void getData() {
+        RtfUtils.getRtf().logistic(param).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+                hideLoading();
+                toast(errorMsg);
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                hideLoading();
+                if (data.getCode() != 0) {
+                    toast(data.getMessage());
+                    return;
+                }
+                List<LogisticBean.RecordsBean> getList = JSON.parseObject(data.getData().toString(), LogisticBean.class).getRecords();
+
+                if (page == 1) {
+                    srlRefresh.finishRefresh();
+                    dataList.clear();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                    dataAdapter.loadMoreComplete();
+                } else {
+                    dataAdapter.loadMoreComplete();
+                    dataList.addAll(getList);
+                    dataAdapter.notifyDataSetChanged();
+                }
+                if (getList.size() == 0) {
+                    dataAdapter.loadMoreEnd();
+                } else {
+                    page++;
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void initEvent() {
+        srlRefresh.setOnRefreshListener(refreshLayout -> {
+            page = 1;
+            param.put("current", page);
+            getData();
+        });
+        dataAdapter.setOnLoadMoreListener(() -> {
+            param.put("current", page);
+            getData();
+        }, rvData);
+        dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
+                startActivity(WorkLogisticsDetailActivity.class, "info",JSON.toJSONString(dataList.get(position)));
+            }
+        });
+    }
+
+
+    @Override
+    protected int layoutId() {
+        return R.layout.fg_work_contacts;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe
+    public void refresh(CheckLogisticEvent event) {
+        page = 1;
+        param.put("current", page);
+        getData();
+    }
+}

app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkContactsDetailActivity.java

@@ -48,6 +48,10 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
         if (TextUtils.equals("客户", getIntent().getStringExtra("partTypeNames"))) {
             llReceiveTicket.setVisibility(View.GONE);
             llPay.setVisibility(View.GONE);
+        } else if (TextUtils.equals("物流公司", getIntent().getStringExtra("partTypeNames"))) {
+            llReceive.setVisibility(View.GONE);
+            llReceiveTicket.setVisibility(View.GONE);
+            llClient.setVisibility(View.GONE);
         } else {
             llReceive.setVisibility(View.GONE);
             llClient.setVisibility(View.GONE);
@@ -77,41 +81,45 @@ public class WorkContactsDetailActivity extends WorkToolBarActivity {
                 startActivity(WorkContactsInfoActivity.class, "id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_receive:
-                if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())){
+                if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())) {
                     toast(R.string.permission);
                     return;
                 }
-                startActivity(WorkContactsMoneyActivity.class, "type","1","id", getIntent().getStringExtra("id"));
+                startActivity(WorkContactsMoneyActivity.class, "type", "1", "id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_pay:
                 if (TextUtils.equals("物流公司", getIntent().getStringExtra("partTypeNames"))) {
-                    if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())){
+                    if (!WorkUtils.hasPermission(PagePermissionType.LOGISTICS_PAGE.getPermission())) {
                         toast(R.string.permission);
                         return;
                     }
-                    startActivity(WorkContactsMoneyActivity.class, "type","3","id", getIntent().getStringExtra("id"));
-                }else {
-                    startActivity(WorkContactsMoneyActivity.class, "type","2","id", getIntent().getStringExtra("id"));
+                    startActivity(WorkContactsMoneyActivity.class, "type", "3", "id", getIntent().getStringExtra("id"));
+                } else {
+                    startActivity(WorkContactsMoneyActivity.class, "type", "2", "id", getIntent().getStringExtra("id"));
                 }
                 break;
             case R.id.ll_live:
-                startActivity(WorkContactsLiveStockActivity.class, "title","现场库","sign","SEND","id", getIntent().getStringExtra("id"));
+                startActivity(WorkContactsLiveStockActivity.class, "title", "现场库", "sign", "SEND", "id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_settle:
-                startActivity(WorkContactsLiveStockActivity.class, "title","未结算库","sign","USED","id", getIntent().getStringExtra("id"));
+                startActivity(WorkContactsLiveStockActivity.class, "title", "未结算库", "sign", "USED", "id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_receive_ticket:
                 startActivity(WorkContactsReceiveTicketActivity.class, "id", getIntent().getStringExtra("id"));
                 break;
             case R.id.ll_open_ticket:
-                startActivity(WorkContactsOpenTicketActivity.class, "id", getIntent().getStringExtra("id"));
+                if (TextUtils.equals("物流公司", getIntent().getStringExtra("partTypeNames"))) {
+                    startActivity(ContactsLogisticsActivity.class, "id", getIntent().getStringExtra("id"));
+                } else {
+                    startActivity(WorkContactsOpenTicketActivity.class, "id", getIntent().getStringExtra("id"));
+                }
                 break;
             case R.id.ll_order:
                 toast("功能正在开发中哦！");
                 break;
             case R.id.ll_return:
-                startActivity(ContactsReturnActivity.class,"id", getIntent().getStringExtra("id"),
-                        _TITLE,getIntent().getStringExtra("title"));
+                startActivity(ContactsReturnActivity.class, "id", getIntent().getStringExtra("id"),
+                        _TITLE, getIntent().getStringExtra("title"));
                 break;
         }
     }