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
8410b4df
提交
8410b4df
authored
6月 29, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.图片显示
上级
b4c0a2ba
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
52 行增加
和
13 行删除
+52
-13
CrucibleOrderDetailActivity.java
...ce/ui/activity/bat/order/CrucibleOrderDetailActivity.java
+6
-0
InsideOrderDetailActivity.java
...fice/ui/activity/bat/order/InsideOrderDetailActivity.java
+6
-0
OutOrderDetailActivity.java
...koffice/ui/activity/bat/order/OutOrderDetailActivity.java
+6
-0
ProductOrderDetailActivity.java
...ice/ui/activity/bat/order/ProductOrderDetailActivity.java
+6
-0
SupplierOrderDetailActivity.java
...ce/ui/activity/bat/order/SupplierOrderDetailActivity.java
+6
-0
ImageActivity.java
...java/com/wd/workoffice/ui/activity/mes/ImageActivity.java
+10
-1
HwObsUtil.java
app/src/main/java/com/wd/workoffice/util/HwObsUtil.java
+8
-5
activity_img.xml
app/src/main/res/layout/activity_img.xml
+4
-7
没有找到文件。
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/CrucibleOrderDetailActivity.java
浏览文件 @
8410b4df
...
...
@@ -22,9 +22,11 @@ import com.wd.workoffice.bean.OrderDetail;
import
com.wd.workoffice.bean.event.CheckOrderEvent
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.mes.ImageActivity
;
import
com.wd.workoffice.ui.adapter.CruibleOrderDetailProductAdapter
;
import
com.wd.workoffice.ui.adapter.OrderProcessAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.HwObsUtil
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -315,6 +317,10 @@ public class CrucibleOrderDetailActivity extends WorkToolBarActivity {
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_annex
:
if
(!
TextUtils
.
isEmpty
(
proList
.
get
(
position
).
getAnnex
()))
startActivity
(
ImageActivity
.
class
,
"url"
,
HwObsUtil
.
IMG_DOMAIN
+
proList
.
get
(
position
).
getAnnex
());
break
;
case
R
.
id
.
tv_get
:
startActivity
(
UseApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/InsideOrderDetailActivity.java
浏览文件 @
8410b4df
...
...
@@ -20,8 +20,10 @@ import com.wd.workoffice.bean.OrderDetail;
import
com.wd.workoffice.bean.event.CheckOrderEvent
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.mes.ImageActivity
;
import
com.wd.workoffice.ui.adapter.InsideOrderDetailProductAdapter
;
import
com.wd.workoffice.ui.adapter.OrderProcessAdapter
;
import
com.wd.workoffice.util.HwObsUtil
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -272,6 +274,10 @@ public class InsideOrderDetailActivity extends WorkToolBarActivity {
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_annex
:
if
(!
TextUtils
.
isEmpty
(
proList
.
get
(
position
).
getAnnex
()))
startActivity
(
ImageActivity
.
class
,
"url"
,
HwObsUtil
.
IMG_DOMAIN
+
proList
.
get
(
position
).
getAnnex
());
break
;
case
R
.
id
.
tv_get
:
startActivity
(
UseApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/OutOrderDetailActivity.java
浏览文件 @
8410b4df
...
...
@@ -25,9 +25,11 @@ import com.wd.workoffice.bean.event.CheckSendEvent;
import
com.wd.workoffice.bean.workEnum.PagePermissionType
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.mes.ImageActivity
;
import
com.wd.workoffice.ui.adapter.OrderProcessAdapter
;
import
com.wd.workoffice.ui.adapter.OutOrderDetailProductAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.HwObsUtil
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -328,6 +330,10 @@ public class OutOrderDetailActivity extends WorkToolBarActivity {
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_annex
:
if
(!
TextUtils
.
isEmpty
(
proList
.
get
(
position
).
getAnnex
()))
startActivity
(
ImageActivity
.
class
,
"url"
,
HwObsUtil
.
IMG_DOMAIN
+
proList
.
get
(
position
).
getAnnex
());
break
;
case
R
.
id
.
tv_get
:
startActivity
(
UseApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/ProductOrderDetailActivity.java
浏览文件 @
8410b4df
...
...
@@ -13,7 +13,9 @@ import com.wd.workoffice.app.WorkToolBarActivity;
import
com.wd.workoffice.bean.OrderDetail
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.mes.ImageActivity
;
import
com.wd.workoffice.ui.adapter.ProductOrderDetailProductAdapter
;
import
com.wd.workoffice.util.HwObsUtil
;
import
com.wd.workoffice.util.MathUtils
;
import
java.util.ArrayList
;
...
...
@@ -114,6 +116,10 @@ public class ProductOrderDetailActivity extends WorkToolBarActivity {
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_annex
:
if
(!
TextUtils
.
isEmpty
(
proList
.
get
(
position
).
getAnnex
()))
startActivity
(
ImageActivity
.
class
,
"url"
,
HwObsUtil
.
IMG_DOMAIN
+
proList
.
get
(
position
).
getAnnex
());
break
;
case
R
.
id
.
tv_get
:
startActivity
(
UseApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/bat/order/SupplierOrderDetailActivity.java
浏览文件 @
8410b4df
...
...
@@ -22,9 +22,11 @@ import com.wd.workoffice.bean.OrderDetail;
import
com.wd.workoffice.bean.event.CheckOrderEvent
;
import
com.wd.workoffice.retrofit.RtfUtils
;
import
com.wd.workoffice.retrofit.WorkObserver
;
import
com.wd.workoffice.ui.activity.mes.ImageActivity
;
import
com.wd.workoffice.ui.adapter.OrderProcessAdapter
;
import
com.wd.workoffice.ui.adapter.SupplierOrderDetailProductAdapter
;
import
com.wd.workoffice.util.DialogUtils
;
import
com.wd.workoffice.util.HwObsUtil
;
import
com.wd.workoffice.util.MathUtils
;
import
com.wd.workoffice.util.WorkUtils
;
...
...
@@ -288,6 +290,10 @@ public class SupplierOrderDetailActivity extends WorkToolBarActivity {
@Override
public
void
onItemChildClick
(
BaseQuickAdapter
adapter
,
View
view
,
int
position
)
{
switch
(
view
.
getId
())
{
case
R
.
id
.
ll_annex
:
if
(!
TextUtils
.
isEmpty
(
proList
.
get
(
position
).
getAnnex
()))
startActivity
(
ImageActivity
.
class
,
"url"
,
HwObsUtil
.
IMG_DOMAIN
+
proList
.
get
(
position
).
getAnnex
());
break
;
case
R
.
id
.
tv_get
:
startActivity
(
UseApplyActivity
.
class
,
"status"
,
dataBean
.
getStatus
()
+
""
,
...
...
app/src/main/java/com/wd/workoffice/ui/activity/mes/ImageActivity.java
浏览文件 @
8410b4df
...
...
@@ -9,6 +9,9 @@ import com.wd.workoffice.R;
import
com.wd.workoffice.app.WorkToolBarActivity
;
import
com.wd.workoffice.util.GlideUtils
;
import
java.net.MalformedURLException
;
import
java.net.URL
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
...
...
@@ -33,7 +36,13 @@ public class ImageActivity extends WorkToolBarActivity {
@Override
protected
void
initData
()
{
GlideUtils
.
getRequest
().
load
(
getIntent
().
getStringExtra
(
"url"
)).
diskCacheStrategy
(
DiskCacheStrategy
.
NONE
).
centerCrop
().
override
(
400
).
into
(
ivImg
);
try
{
GlideUtils
.
getRequest
().
load
(
new
URL
(
getIntent
().
getStringExtra
(
"url"
))).
fitCenter
().
into
(
ivImg
);
//
}
catch
(
MalformedURLException
e
)
{
e
.
printStackTrace
();
}
// GlideUtils.getRequest().
// load("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1593372030211&di=42cbef92719301915297debd7e1c6dd2&imgtype=0&src=http%3A%2F%2Fa3.att.hudong.com%2F14%2F75%2F01300000164186121366756803686.jpg").override(400) .centerCrop().into(ivImg);
...
...
app/src/main/java/com/wd/workoffice/util/HwObsUtil.java
浏览文件 @
8410b4df
...
...
@@ -53,7 +53,7 @@ public class HwObsUtil {
private
String
AK
=
"K2DV6W6VQ7VLVGHGCT0D"
;
public
static
String
END_POINT
=
"https://obs.cn-north-4.myhuaweicloud.com"
;
public
static
String
IMG_DOMAIN
=
" https://bat-static.obs.cn-north-4.myhuaweicloud.com"
;
public
static
String
IMG_DOMAIN
=
" https://bat-static.obs.cn-north-4.myhuaweicloud.com
/
"
;
ObsClient
obsClient
=
null
;
private
HwObsUtil
()
{
...
...
@@ -95,15 +95,18 @@ public class HwObsUtil {
new
Thread
(
new
Runnable
()
{
@Override
public
void
run
()
{
Map
<
String
,
String
>
headers
=
new
HashMap
<
String
,
String
>();
String
contentType
=
"image/*"
;
headers
.
put
(
"Content-Type"
,
contentType
);
PutObjectRequest
request
=
new
PutObjectRequest
();
request
.
setBucketName
(
"bat-static"
);
request
.
setObjectKey
(
fileName
);
request
.
setFile
(
file
);
// localfile为待上传的本地文件路径,需要指定到具体的文件名
// 设置对象访问权限为公共读
// 设置对象访问权限为公共读
request
.
setAcl
(
AccessControlList
.
REST_CANNED_PUBLIC_READ
);
ObjectMetadata
metadata
=
new
ObjectMetadata
();
metadata
.
setContentType
(
"image/
*
"
);
metadata
.
setContentType
(
"image/
png
"
);
request
.
setMetadata
(
metadata
);
PutObjectResult
response
=
obsClient
.
putObject
(
request
);
// HeaderResponse response = obsClient.putObject(, fileName, file);
...
...
@@ -112,7 +115,7 @@ public class HwObsUtil {
@Override
public
void
run
()
{
if
(
response
.
getStatusCode
()
==
200
)
{
listener
.
uploadSuccess
(
"/"
+
response
.
getObjectKey
());
listener
.
uploadSuccess
(
response
.
getObjectKey
());
}
else
{
listener
.
uploadFail
(
response
.
getObjectKey
());
}
...
...
app/src/main/res/layout/activity_img.xml
浏览文件 @
8410b4df
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/white"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
>
<ImageView
android:id=
"@+id/iv_img"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_centerInParent=
"true"
/>
</RelativeLayout>
\ No newline at end of file
/>
</LinearLayout>
\ No newline at end of file
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论