Skip to content

W
workoffice
提交 0ea88127 authored 作者: lgd's avatar lgd
浏览文件
操作

1.搜索 

2.//TODO erp用户激活，忘记密码测试，搜索调试，产品下单，产品两个弹窗详情，bat，mes，消息，我的，刷新token
上级 f0068b42
显示空白字符变更
内嵌 并排
正在显示 包含 128 行增加 和 41 行删除
app/src/main/java/com/wd/workoffice/ui/activity/bat/InsideOrderSearchActivity.java
浏览文件 @ 0ea88127
package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
......@@ -34,8 +35,6 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.iv_search)
ImageView ivSearch;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
......@@ -53,15 +52,27 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
saleSalePresenter = new SaleSalePresenter();
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
protected void initData() {
identity=getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this,RecyclerView.VERTICAL,false));
identity = getIntent().getStringExtra("identity");
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
orderList = new ArrayList<>();
orderAdapter = new SaleInsideAdapter(R.layout.item_sale_inside, orderList);
orderAdapter.bindToRecyclerView(rvData);
orderAdapter.setEmptyView(R.layout.view_empty_order,rvData);
param = WorkUtils.pageKey();
param.put("current", page);
param.put("identity", identity);
......@@ -87,7 +98,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@OnClick(R.id.iv_search)
public void onViewClicked() {
String key = etKey.getText().toString();
if (TextUtils.isEmpty(key)){
if (TextUtils.isEmpty(key)) {
toast("请输入搜索关键字");
return;
}
......@@ -107,6 +118,7 @@ public class InsideOrderSearchActivity extends WorkBaseActivity implements SaleS
@Override
public void insideList(List<SaleOrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/OutOrderSearchActivity.java
浏览文件 @ 0ea88127
package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
......@@ -36,8 +37,6 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.iv_search)
ImageView ivSearch;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
......@@ -56,6 +55,17 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
saleSalePresenter = new SaleSalePresenter();
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
......@@ -67,9 +77,11 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleOutAdapter(R.layout.item_sale_out, orderList);
saleAdapter.bindToRecyclerView(rvData);
saleAdapter.setEmptyView(R.layout.view_empty_order,rvData);
} else {
proAdapter = new ProOutAdapter(R.layout.item_sale_out, orderList);
proAdapter.bindToRecyclerView(rvData);
proAdapter.setEmptyView(R.layout.view_empty_order,rvData);
}
param = WorkUtils.pageKey();
......@@ -113,7 +125,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
return;
}
param.put("searchValue", key);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getOutOrder(param);
}
@Override
......@@ -123,6 +135,7 @@ public class OutOrderSearchActivity extends WorkBaseActivity implements SaleSale
@Override
public void outList(List<SaleOrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SaleOrderSearchActivity.java
浏览文件 @ 0ea88127
package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
......@@ -37,8 +38,6 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.iv_search)
ImageView ivSearch;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
......@@ -57,6 +56,17 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
saleSalePresenter = new SaleSalePresenter();
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
......@@ -68,9 +78,11 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleSaleAdapter(R.layout.item_sale, orderList);
saleAdapter.bindToRecyclerView(rvData);
saleAdapter.setEmptyView(R.layout.view_empty_order,rvData);
} else {
proAdapter = new ProSaleAdapter(R.layout.item_sale, orderList);
proAdapter.bindToRecyclerView(rvData);
proAdapter.setEmptyView(R.layout.view_empty_order,rvData);
}
param = WorkUtils.pageKey();
......@@ -85,7 +97,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getOrder(param);
}
}, rvData);
} else {
......@@ -93,7 +105,7 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getOrder(param);
}
}, rvData);
}
......@@ -114,16 +126,12 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
return;
}
param.put("searchValue", key);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getOrder(param);
}
@Override
public void saleList(List<SaleOrderBean> dataList) {
}
@Override
public void outList(List<SaleOrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -156,6 +164,11 @@ public class SaleOrderSearchActivity extends WorkBaseActivity implements SaleSal
}
}
@Override
public void outList(List<SaleOrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
......
app/src/main/java/com/wd/workoffice/ui/activity/bat/SupplierOrderSearchActivity.java
浏览文件 @ 0ea88127
package com.wd.workoffice.ui.activity.bat;
import android.text.TextUtils;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.ImageView;
......@@ -37,8 +38,6 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@BindView(R.id.et_key)
EditText etKey;
@BindView(R.id.iv_search)
ImageView ivSearch;
@BindView(R.id.tb_title)
Toolbar tbTitle;
@BindView(R.id.rv_data)
......@@ -57,6 +56,17 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
saleSalePresenter = new SaleSalePresenter();
saleSalePresenter.onAttach(this);
setSupportActionBar(tbTitle);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
@Override
......@@ -68,9 +78,11 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
if (TextUtils.equals(identity, "1")) {
saleAdapter = new SaleSupplierAdapter(R.layout.item_sale_supplier, orderList);
saleAdapter.bindToRecyclerView(rvData);
saleAdapter.setEmptyView(R.layout.view_empty_order,rvData);
} else {
proAdapter = new ProSupplierAdapter(R.layout.item_sale_supplier, orderList);
proAdapter.bindToRecyclerView(rvData);
proAdapter.setEmptyView(R.layout.view_empty_order,rvData);
}
param = WorkUtils.pageKey();
......@@ -85,7 +97,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getSupplierOrder(param);
}
}, rvData);
} else {
......@@ -93,7 +105,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
public void onLoadMoreRequested() {
param.put("current", page);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getSupplierOrder(param);
}
}, rvData);
}
......@@ -113,7 +125,7 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
return;
}
param.put("searchValue", key);
saleSalePresenter.getInsideOrder(param);
saleSalePresenter.getSupplierOrder(param);
}
@Override
......@@ -123,6 +135,17 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
@Override
public void outList(List<SaleOrderBean> dataList) {
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
toast("加载成功");
if (page == 1) {
orderList.clear();
orderList.addAll(dataList);
......@@ -154,14 +177,4 @@ public class SupplierOrderSearchActivity extends WorkBaseActivity implements Sal
page++;
}
}
@Override
public void insideList(List<SaleOrderBean> dataList) {
}
@Override
public void supplierList(List<SaleOrderBean> dataList) {
}
}
app/src/main/res/layout/activity_order_serarch.xml
浏览文件 @ 0ea88127
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
......@@ -9,12 +10,19 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Light">
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:contentInsetEnd="0mm"
app:contentInsetEndWithActions="0mm"
app:contentInsetLeft="0mm"
app:contentInsetRight="0mm"
app:contentInsetStart="0mm"
app:contentInsetStartWithNavigation="0mm">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingVertical="4mm">
android:gravity="center"
android:paddingVertical="5mm">
<EditText
......@@ -22,15 +30,19 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_marginVertical="3mm"
android:paddingHorizontal="3mm"
android:textSize="14sp"
android:background="@drawable/shape_client_search" />
<ImageView
<TextView
android:id="@+id/iv_search"
android:layout_width="30mm"
android:layout_height="30mm"
android:layout_marginHorizontal="5mm"
android:src="@mipmap/search"
android:text="搜索" />
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingHorizontal="8mm"
android:text="搜索"
/>
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
......
app/src/main/res/layout/view_empty_order.xml 0 → 100644
浏览文件 @ 0ea88127
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@android:color/white"
android:orientation="vertical"
android:layout_height="match_parent"
android:gravity="center">
<ImageView
android:layout_width="150mm"
android:layout_height="150mm"
android:src="@mipmap/empty_order" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="暂时没有数据"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:textColor="@color/flexible_text_sup"
android:text="请稍后再试试"/>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论