Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
e46756f5
提交
e46756f5
authored
3月 22, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.产品搜索弹窗,上下架需要在调试
2.//TODO erp用户激活,忘记密码测试,产品详情数据调整,搜索具体调试,产品下单,,bat,mes,消息,我的,刷新token
上级
217c3b4e
显示空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
284 行增加
和
4 行删除
+284
-4
WorkProSearchActivity.java
...orkoffice/ui/activity/bat/work/WorkProSearchActivity.java
+88
-2
DialogUtils.java
app/src/main/java/com/wd/workoffice/util/DialogUtils.java
+10
-0
shape_dialog_pro_cancel.xml
app/src/main/res/drawable/shape_dialog_pro_cancel.xml
+7
-0
shape_dialog_pro_ok.xml
app/src/main/res/drawable/shape_dialog_pro_ok.xml
+7
-0
activity_work_pro_details.xml
app/src/main/res/layout/activity_work_pro_details.xml
+5
-2
view_pro_modify_price.xml
app/src/main/res/layout/view_pro_modify_price.xml
+101
-0
view_pro_on_sale.xml
app/src/main/res/layout/view_pro_on_sale.xml
+66
-0
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/work/WorkProSearchActivity.java
浏览文件 @
e46756f5
...
...
@@ -2,6 +2,7 @@ package com.wd.workoffice.ui.activity.bat.work;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.MenuItem
;
import
android.view.View
;
import
android.widget.EditText
;
...
...
@@ -25,6 +26,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.Map
;
import
androidx.appcompat.app.AlertDialog
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.recyclerview.widget.LinearLayoutManager
;
import
androidx.recyclerview.widget.RecyclerView
;
...
...
@@ -126,6 +128,19 @@ public class WorkProSearchActivity extends WorkBaseActivity implements WorkProCo
}
});
workProductAdapter
.
setOnItemChildClickListener
(
new
BaseQuickAdapter
.
OnItemChildClickListener
()
{
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
btn_modify
:
openModify
(
dataList
.
get
(
position
).
getId
());
break
;
case
R
.
id
.
btn_on_sale
:
openOnSale
(
dataList
.
get
(
position
));
break
;
}
}
});
}
@Override
...
...
@@ -170,12 +185,83 @@ public class WorkProSearchActivity extends WorkBaseActivity implements WorkProCo
@Override
public
void
modify
(
String
msg
)
{
page
=
1
;
workProPresenter
.
getPro
(
param
);
toast
(
msg
);
}
@Override
public
void
onSale
(
String
msg
)
{
toast
(
msg
);
}
/**
* 修改弹窗
*
* @param id
*/
private
void
openModify
(
int
id
)
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
this
);
View
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
view_pro_modify_price
,
null
);
TextView
tvOk
=
view
.
findViewById
(
R
.
id
.
tv_ok
);
TextView
tvCancel
=
view
.
findViewById
(
R
.
id
.
tv_cancel
);
EditText
etPrice
=
view
.
findViewById
(
R
.
id
.
et_price
);
EditText
etRemark
=
view
.
findViewById
(
R
.
id
.
et_remark
);
builder
.
setView
(
view
);
AlertDialog
addCartDialog
=
builder
.
create
();
tvOk
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
if
(
TextUtils
.
isEmpty
(
etPrice
.
getText
().
toString
()))
{
toast
(
"请填写内部价格"
);
return
;
}
if
(
TextUtils
.
isEmpty
(
etRemark
.
getText
().
toString
()))
{
toast
(
"请填写备注"
);
return
;
}
workProPresenter
.
modify
(
id
,
etPrice
.
getText
().
toString
(),
etRemark
.
getText
().
toString
());
addCartDialog
.
dismiss
();
}
});
tvCancel
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
addCartDialog
.
dismiss
();
}
});
addCartDialog
.
show
();
}
/**
* 修改上下架
*
* @param data
*/
private
void
openOnSale
(
ProductBean
.
RecordsBean
data
)
{
AlertDialog
.
Builder
builder
=
new
AlertDialog
.
Builder
(
this
);
View
view
=
LayoutInflater
.
from
(
this
).
inflate
(
R
.
layout
.
view_pro_on_sale
,
null
);
TextView
tvOk
=
view
.
findViewById
(
R
.
id
.
tv_ok
);
TextView
tvCancel
=
view
.
findViewById
(
R
.
id
.
tv_cancel
);
TextView
tvTitle
=
view
.
findViewById
(
R
.
id
.
tv_title
);
TextView
tvPrice
=
view
.
findViewById
(
R
.
id
.
tv_price
);
TextView
tvName
=
view
.
findViewById
(
R
.
id
.
tv_name
);
tvPrice
.
setText
(
String
.
valueOf
(
data
.
getInternalPrice
()).
concat
(
"/"
).
concat
(
data
.
getUnit
()));
tvName
.
setText
(
data
.
getName
());
builder
.
setView
(
view
);
AlertDialog
addCartDialog
=
builder
.
create
();
tvOk
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
workProPresenter
.
onSale
(
data
.
getId
(),
"down"
);
addCartDialog
.
dismiss
();
}
});
tvCancel
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
addCartDialog
.
dismiss
();
}
});
addCartDialog
.
show
();
}
}
app/src/main/java/com/wd/workoffice/util/DialogUtils.java
浏览文件 @
e46756f5
package
com
.
wd
.
workoffice
.
util
;
import
android.content.Context
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.TextView
;
import
com.qmuiteam.qmui.widget.dialog.QMUIDialog
;
import
com.wd.workoffice.R
;
import
com.wd.workoffice.bean.ProductBean
;
import
androidx.appcompat.app.AlertDialog
;
/**
* author : flexible
...
...
@@ -18,4 +27,5 @@ public class DialogUtils {
QMUIDialog
.
MessageDialogBuilder
dialog
=
new
QMUIDialog
.
MessageDialogBuilder
(
context
);
return
dialog
;
}
}
app/src/main/res/drawable/shape_dialog_pro_cancel.xml
0 → 100644
浏览文件 @
e46756f5
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<stroke
android:color=
"@color/divider"
android:width=
"1dp"
/>
<!--<solid android:color="#F8F8F8"/>-->
<corners
android:radius=
"3dp"
/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_dialog_pro_ok.xml
0 → 100644
浏览文件 @
e46756f5
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<stroke
android:color=
"@color/red"
android:width=
"1dp"
/>
<!--<solid android:color="@color/red"/>-->
<corners
android:radius=
"3dp"
/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_work_pro_details.xml
浏览文件 @
e46756f5
...
...
@@ -301,6 +301,8 @@
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_on_sale"
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
...
...
@@ -329,7 +331,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"20mm"
android:text=
"所
屬
流程"
android:text=
"所
属
流程"
android:textSize=
"16sp"
/>
<TextView
...
...
@@ -364,6 +366,8 @@
</LinearLayout>
<LinearLayout
android:id=
"@+id/ll_dep"
android:visibility=
"gone"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
...
...
@@ -395,7 +399,6 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:paddingHorizontal=
"20mm"
android:text=
"图号TH82739857"
android:textColor=
"@color/black"
android:textSize=
"16sp"
/>
...
...
app/src/main/res/layout/view_pro_modify_price.xml
0 → 100644
浏览文件 @
e46756f5
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#d1f8f8f8"
android:orientation=
"vertical"
>
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"20mm"
android:gravity=
"center"
android:text=
"修改内部价格"
android:textSize=
"17sp"
android:textStyle=
"bold"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"30mm"
android:orientation=
"horizontal"
android:paddingHorizontal=
"20mm"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:gravity=
"center"
android:text=
"内部单价(单价)"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"17sp"
/>
<EditText
android:id=
"@+id/et_price"
android:layout_width=
"match_parent"
android:layout_height=
"30mm"
android:layout_marginLeft=
"10mm"
android:background=
"@null"
android:gravity=
"right|center_vertical"
android:hint=
"输入金额"
android:inputType=
"numberDecimal"
android:paddingHorizontal=
"10mm"
android:paddingVertical=
"4mm"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"16sp"
/>
</LinearLayout>
<EditText
android:id=
"@+id/et_remark"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_add_cart"
android:gravity=
"left|top"
android:hint=
"备注"
android:layout_marginTop=
"8mm"
android:layout_marginHorizontal=
"20mm"
android:minLines=
"5"
android:paddingHorizontal=
"10mm"
android:paddingVertical=
"4mm"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"16sp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"30mm"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:paddingVertical=
"15mm"
android:text=
"取消"
android:textColor=
"#007AFF"
android:textSize=
"17sp"
/>
<View
android:layout_width=
"1dp"
android:layout_height=
"match_parent"
android:background=
"#D8DCE6"
/>
<TextView
android:id=
"@+id/tv_ok"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:gravity=
"center"
android:paddingVertical=
"15mm"
android:text=
"确定"
android:textColor=
"#007AFF"
android:textSize=
"17sp"
/>
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/view_pro_on_sale.xml
0 → 100644
浏览文件 @
e46756f5
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"#d1f8f8f8"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
android:paddingBottom=
"20mm"
>
<TextView
android:id=
"@+id/tv_title"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"20mm"
android:gravity=
"center"
android:text=
"确认上架?"
android:textSize=
"17sp"
android:textStyle=
"bold"
/>
<TextView
android:id=
"@+id/tv_name"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:gravity=
"center"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"15sp"
/>
<TextView
android:id=
"@+id/tv_price"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:gravity=
"center"
android:textColor=
"@color/flexible_text_sup"
android:textSize=
"15sp"
/>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"10mm"
android:gravity=
"center_horizontal"
>
<TextView
android:id=
"@+id/tv_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginRight=
"25mm"
android:background=
"@drawable/shape_dialog_pro_cancel"
android:paddingHorizontal=
"15mm"
android:paddingVertical=
"5mm"
android:text=
"取消"
/>
<TextView
android:id=
"@+id/tv_ok"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@drawable/shape_dialog_pro_ok"
android:paddingHorizontal=
"15mm"
android:paddingVertical=
"5mm"
android:text=
"上架"
android:textColor=
"@color/red"
/>
</LinearLayout>
</LinearLayout>
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论