Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0a7085fa
authored
Dec 25, 2023
by
wukun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1225
parent
7a202982
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
51 additions
and
42 deletions
baseSDK/src/main/res/layout/activity_webview.xml
orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
orderCenter/src/main/res/layout/fragment_multi_detail.xml
userCenter/src/main/res/layout/fragment_home_user.xml
userCenter/src/main/res/values/styles.xml
baseSDK/src/main/res/layout/activity_webview.xml
View file @
0a7085fa
...
...
@@ -25,7 +25,7 @@
android:id=
"@+id/tv_right_title"
style=
"@style/title_right_text"
android:textSize=
"15sp"
android:
visibility=
"gone
"
/>
android:
text=
"下载
"
/>
</RelativeLayout>
<ImageView
style=
"@style/card_line"
/>
...
...
orderCenter/src/main/java/com/dayu/order/ui/activity/PdfWebViewActivity.java
View file @
0a7085fa
...
...
@@ -9,6 +9,7 @@ import android.net.Uri;
import
android.os.Build
;
import
android.os.Environment
;
import
android.text.TextUtils
;
import
android.view.View
;
import
android.webkit.DownloadListener
;
import
android.webkit.URLUtil
;
import
android.webkit.WebChromeClient
;
...
...
@@ -48,6 +49,16 @@ public class PdfWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
String
title
=
getIntent
().
getStringExtra
(
OrderConstant
.
TITLE
);
mBind
.
tvTitle
.
setText
(
title
);
initWebView
();
mBind
.
tvRightTitle
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
);
intent
.
setData
(
Uri
.
parse
(
docPath
));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity
(
intent
);
}
});
}
private
void
initWebView
()
{
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
View file @
0a7085fa
package
com
.
dayu
.
order
.
ui
.
fragment
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.View
;
...
...
@@ -35,11 +34,13 @@ import com.dayu.order.api.protocol.bean.GreenPersionSiteInfo;
import
com.dayu.order.api.protocol.bean.OrderToolsBean
;
import
com.dayu.order.api.protocol.data.AddDialRecordData
;
import
com.dayu.order.common.OperatePhoneEvent
;
import
com.dayu.order.common.OrderConstant
;
import
com.dayu.order.databinding.FragmentMultiDetailBinding
;
import
com.dayu.order.databinding.FragmentOrderDatailsBinding
;
import
com.dayu.order.databinding.ItemAccessoriesLayoutBinding
;
import
com.dayu.order.databinding.ItemDetailDeviceCountBinding
;
import
com.dayu.order.databinding.ItemDetailServerInfoBinding
;
import
com.dayu.order.ui.activity.PdfWebViewActivity
;
import
com.dayu.order.ui.view.ToolImageDialog
;
import
com.dayu.provider.event.TakeOrderSuccessEvent
;
import
com.dayu.provider.router.RouterPath
;
...
...
@@ -165,22 +166,18 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mFujianAdapter
.
setOnItemClickListener
(
new
OnItemClickListener
<
OrderDetail
.
Accessories
,
ItemAccessoriesLayoutBinding
>()
{
@Override
public
void
OnItemClick
(
OrderDetail
.
Accessories
item
,
ItemAccessoriesLayoutBinding
bind
)
{
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent);
// } else {
// ToastUtils.showShortToast(R.string.error_service_file);
// }
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
);
intent
.
setData
(
Uri
.
parse
(
item
.
getUrl
()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity
(
intent
);
if
(
item
.
getUrl
().
contains
(
"png"
)
||
item
.
getUrl
().
contains
(
"PNG"
)
||
item
.
getUrl
().
contains
(
"jpg"
)
||
item
.
getUrl
().
contains
(
"JPG"
)
||
item
.
getUrl
().
contains
(
"jpeg"
)
||
item
.
getUrl
().
contains
(
"JPEG"
))
{
imgMax
(
item
.
getUrl
());
}
else
if
(
item
.
getUrl
().
contains
(
".pdf"
))
{
Intent
intent
=
new
Intent
(
mActivity
,
PdfWebViewActivity
.
class
);
intent
.
putExtra
(
Constants
.
PICURL
,
item
.
getUrl
());
intent
.
putExtra
(
OrderConstant
.
TITLE
,
item
.
getName
());
startActivity
(
intent
);
}
else
{
ToastUtils
.
showShortToast
(
R
.
string
.
error_service_file
);
}
}
});
mBind
.
orderRemark
.
post
(()
->
{
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
View file @
0a7085fa
package
com
.
dayu
.
order
.
ui
.
fragment
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -18,12 +17,15 @@ import com.dayu.event.UserInfo;
import
com.dayu.location.base.LocationUtils
;
import
com.dayu.order.R
;
import
com.dayu.order.api.protocol.OrderDetail
;
import
com.dayu.order.common.OrderConstant
;
import
com.dayu.order.databinding.FragmentOrderDatailsBinding
;
import
com.dayu.order.databinding.ItemAccessoriesLayoutBinding
;
import
com.dayu.order.ui.activity.EditeDetailActivity
;
import
com.dayu.order.ui.activity.PdfWebViewActivity
;
import
com.dayu.order.ui.activity.ServerInstructionActivity
;
import
com.dayu.provider.router.RouterPath
;
import
com.dayu.utils.GlideImageLoader
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.UIUtils
;
import
com.dayu.utils.UserManager
;
import
com.dayu.widgets.CustomDialog
;
...
...
@@ -137,22 +139,18 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mAdapter
.
setOnItemClickListener
(
new
OnItemClickListener
<
OrderDetail
.
Accessories
,
ItemAccessoriesLayoutBinding
>()
{
@Override
public
void
OnItemClick
(
OrderDetail
.
Accessories
item
,
ItemAccessoriesLayoutBinding
bind
)
{
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent);
// } else {
// ToastUtils.showShortToast(R.string.error_pdf);
// }
Intent
intent
=
new
Intent
(
Intent
.
ACTION_VIEW
);
intent
.
setData
(
Uri
.
parse
(
item
.
getUrl
()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity
(
intent
);
if
(
item
.
getUrl
().
contains
(
"png"
)
||
item
.
getUrl
().
contains
(
"PNG"
)
||
item
.
getUrl
().
contains
(
"jpg"
)
||
item
.
getUrl
().
contains
(
"JPG"
)
||
item
.
getUrl
().
contains
(
"jpeg"
)
||
item
.
getUrl
().
contains
(
"JPEG"
))
{
imgMax
(
item
.
getUrl
());
}
else
if
(
item
.
getUrl
().
contains
(
".pdf"
))
{
Intent
intent
=
new
Intent
(
mActivity
,
PdfWebViewActivity
.
class
);
intent
.
putExtra
(
Constants
.
PICURL
,
item
.
getUrl
());
intent
.
putExtra
(
OrderConstant
.
TITLE
,
item
.
getName
());
startActivity
(
intent
);
}
else
{
ToastUtils
.
showShortToast
(
R
.
string
.
error_pdf
);
}
}
});
}
...
...
orderCenter/src/main/res/layout/fragment_multi_detail.xml
View file @
0a7085fa
...
...
@@ -835,7 +835,8 @@
android:text=
"沟通记录"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"14sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
android:visibility=
"gone"
/>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -843,7 +844,8 @@
android:layout_alignParentBottom=
"true"
android:layout_margin=
"10dp"
android:background=
"@color/cl_white"
android:orientation=
"horizontal"
>
android:orientation=
"horizontal"
android:visibility=
"gone"
>
<ImageView
android:id=
"@+id/iv_avatar"
...
...
@@ -880,7 +882,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id=
"@+id/rl_component"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
android:visibility=
"gone"
/>
<TextView
android:id=
"@+id/tv_contact_seller"
...
...
userCenter/src/main/res/layout/fragment_home_user.xml
View file @
0a7085fa
...
...
@@ -672,7 +672,7 @@
<TextView
android:id=
"@+id/transmitServer"
android:layout_width=
"250dp"
android:layout_height=
"
5
0dp"
android:layout_height=
"
3
0dp"
android:background=
"@drawable/btn_blue_react_4"
android:gravity=
"center"
android:text=
"转发服务名片"
...
...
userCenter/src/main/res/values/styles.xml
View file @
0a7085fa
...
...
@@ -11,7 +11,7 @@
<style
name=
"ll_user_bottom2"
>
<item
name=
"android:layout_width"
>
0dp
</item>
<item
name=
"android:layout_weight"
>
1
</item>
<item
name=
"android:layout_height"
>
6
6dp
</item>
<item
name=
"android:layout_height"
>
5
6dp
</item>
<item
name=
"android:orientation"
>
vertical
</item>
<item
name=
"android:gravity"
>
center_horizontal
</item>
<item
name=
"android:background"
>
@drawable/personal_center_selector
</item>
...
...
@@ -28,9 +28,9 @@
<style
name=
"tv_user_bottom2"
>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_marginTop"
>
@dimen/dp_3
</item>
<item
name=
"android:layout_marginTop"
>
2dp
</item>
<item
name=
"android:textColor"
>
@color/cl_home_button
</item>
<item
name=
"android:textSize"
>
20
sp
</item>
<item
name=
"android:textSize"
>
14
sp
</item>
</style>
<style
name=
"ll_service_wechat"
parent=
"ll_horizontal"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment