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
7e36a03a
提交
7e36a03a
authored
4月 16, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.审批
2.//TODO erp用户是否选择新部门为空,质检接口数据无对应问题,内部交易订单审核,审核规则,领用申请列表/退件列表/参数,权限,坩埚下单,mes,刷新token
上级
ceec7bdb
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
37 行增加
和
5 行删除
+37
-5
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+24
-1
AddCrucibleConfirmActivity.java
...ice/ui/activity/bat/order/AddCrucibleConfirmActivity.java
+2
-1
StoreSaleConfirmActivity.java
...ffice/ui/activity/bat/store/StoreSaleConfirmActivity.java
+3
-2
StoreTradingConfirmActivity.java
...ce/ui/activity/bat/store/StoreTradingConfirmActivity.java
+2
-1
StoreCarAdapter.java
...in/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java
+3
-0
TradingConfimProAdapter.java
...com/wd/workoffice/ui/adapter/TradingConfimProAdapter.java
+3
-0
没有找到文件。
app/src/main/AndroidManifest.xml
浏览文件 @
7e36a03a
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"com.wd.workoffice"
>
<uses-permission
android:name=
"com.qdredsoft.ylh.permission.JPUSH_MESSAGE"
/>
<uses-permission
android:name=
"android.permission.RECEIVE_USER_PRESENT"
/>
<uses-permission
android:name=
"android.permission.MOUNT_UNMOUNT_FILESYSTEMS"
/>
<!-- Optional. Required for location feature -->
<uses-permission
android:name=
"android.permission.ACCESS_BACKGROUND_LOCATION"
/>
<uses-permission
android:name=
"android.permission.SYSTEM_ALERT_WINDOW"
/>
<!-- 用于开启 debug 版本的应用在 6.0 系统上的层叠窗口权限 -->
<uses-permission
android:name=
"android.permission.GET_TASKS"
/>
<uses-permission
android:name=
"android.permission.VIBRATE"
/>
<uses-permission
android:name=
"android.permission.MODIFY_AUDIO_SETTINGS"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.WRITE_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.GET_TASKS"
/>
<uses-permission
android:name=
"android.permission.CAMERA"
/>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_PHONE_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_LOGS"
/>
<!--允许程序访问CellID或WiFi热点来获取粗略的位置-->
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"
/>
<uses-permission
android:name=
"android.permission.CHANGE_WIFI_STATE"
/>
<uses-permission
android:name=
"android.permission.RECORD_AUDIO"
/>
<application
android:name=
".app.WorkApp"
android:allowBackup=
"true"
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/AddCrucibleConfirmActivity.java
浏览文件 @
7e36a03a
...
...
@@ -333,7 +333,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
if
(
Matisse
.
obtainResult
(
data
).
size
()
!=
0
)
{
showLoading
();
File
file
=
WorkUtils
.
uriToFile
(
Matisse
.
obtainResult
(
data
).
get
(
0
),
this
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
multipart/form-data
"
),
file
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
image/png
"
),
file
);
RtfHelper
.
getInstance
().
getApiService
(
ApiService
.
class
).
upload
(
MultipartBody
.
Part
.
createFormData
(
"newUploadImgs"
,
file
.
getName
(),
requestFile
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
JSONObject
>()
{
...
...
@@ -358,6 +358,7 @@ public class AddCrucibleConfirmActivity extends WorkToolBarActivity {
toast
(
"上传成功"
);
proList
.
get
(
choosePosition
).
setUrl
(
jsonObject
.
getString
(
"data"
));
coverProInfo
(
proList
);
proAdapter
.
notifyDataSetChanged
();
}
});
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreSaleConfirmActivity.java
浏览文件 @
7e36a03a
...
...
@@ -354,7 +354,7 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
if
(
Matisse
.
obtainResult
(
data
).
size
()
!=
0
)
{
showLoading
();
File
file
=
WorkUtils
.
uriToFile
(
Matisse
.
obtainResult
(
data
).
get
(
0
),
this
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
multipart/form-data
"
),
file
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
image/png
"
),
file
);
RtfHelper
.
getInstance
().
getApiService
(
ApiService
.
class
).
upload
(
MultipartBody
.
Part
.
createFormData
(
"newUploadImgs"
,
file
.
getName
(),
requestFile
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
JSONObject
>()
{
...
...
@@ -372,13 +372,14 @@ public class StoreSaleConfirmActivity extends WorkToolBarActivity {
@Override
public
void
onSuccess
(
JSONObject
jsonObject
)
{
hideLoading
();
if
(
jsonObject
.
getInteger
(
"
status
"
)
!=
0
)
{
if
(
jsonObject
.
getInteger
(
"
code
"
)
!=
0
)
{
toast
(
jsonObject
.
getString
(
"msg"
));
return
;
}
toast
(
"上传成功"
);
proList
.
get
(
choosePosition
).
setUrl
(
jsonObject
.
getString
(
"data"
));
coverProInfo
(
proList
);
proAdapter
.
notifyDataSetChanged
();
}
});
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/store/StoreTradingConfirmActivity.java
浏览文件 @
7e36a03a
...
...
@@ -385,7 +385,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
if
(
Matisse
.
obtainResult
(
data
).
size
()
!=
0
)
{
showLoading
();
File
file
=
WorkUtils
.
uriToFile
(
Matisse
.
obtainResult
(
data
).
get
(
0
),
this
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
multipart/form-data
"
),
file
);
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"
image/png
"
),
file
);
RtfHelper
.
getInstance
().
getApiService
(
ApiService
.
class
).
upload
(
MultipartBody
.
Part
.
createFormData
(
"newUploadImgs"
,
file
.
getName
(),
requestFile
)).
compose
(
Transformer
.
schedule
()).
subscribe
(
new
WorkObserver
<
JSONObject
>()
{
...
...
@@ -410,6 +410,7 @@ public class StoreTradingConfirmActivity extends WorkToolBarActivity {
toast
(
"上传成功"
);
proList
.
get
(
choosePosition
).
setUrl
(
jsonObject
.
getString
(
"data"
));
coverProInfo
(
proList
);
proAdapter
.
notifyDataSetChanged
();
}
});
}
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/StoreCarAdapter.java
浏览文件 @
7e36a03a
...
...
@@ -53,6 +53,9 @@ public class StoreCarAdapter extends BaseQuickAdapter<ProductBean.RecordsBean, B
if
(!
TextUtils
.
isEmpty
(
item
.
getFactoryName
()))
{
helper
.
setText
(
R
.
id
.
tv_choose_dep
,
item
.
getFactoryName
());
}
if
(!
TextUtils
.
isEmpty
(
item
.
getUrl
())){
helper
.
setText
(
R
.
id
.
tv_upload
,
"已上传,点击替换"
);
}
}
else
if
(
type
==
2
){
helper
.
addOnClickListener
(
R
.
id
.
tv_delete
);
AddAndReduceView
num
=
helper
.
getView
(
R
.
id
.
ar_num
);
...
...
app/src/main/java/com/wd/workoffice/ui/adapter/TradingConfimProAdapter.java
浏览文件 @
7e36a03a
...
...
@@ -38,6 +38,9 @@ public class TradingConfimProAdapter extends BaseQuickAdapter<ProductBean.Record
helper
.
setText
(
R
.
id
.
tv_num
,
String
.
valueOf
(
item
.
getCarNum
()));
helper
.
setText
(
R
.
id
.
tv_all_price
,
MathUtils
.
multiply
(
item
.
getCarNum
()
+
""
,
item
.
getInternalPrice
()
+
""
,
2
));
helper
.
addOnClickListener
(
R
.
id
.
rl_upload
);
if
(!
TextUtils
.
isEmpty
(
item
.
getUrl
())){
helper
.
setText
(
R
.
id
.
tv_upload
,
"已上传,点击替换"
);
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论