Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
f8b18f9c
Commit
f8b18f9c
authored
Aug 24, 2021
by
yinjiacheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add 订单详情联系卖家和联系自提点功能动态申请CALL_PHONE权限
parent
faf578d0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
60 additions
and
17 deletions
+60
-17
OrderCommodityInfoView.kt
...n/shenghuoquan/border/ui/widget/OrderCommodityInfoView.kt
+18
-0
OrderPickupPointInfoView.kt
...shenghuoquan/border/ui/widget/OrderPickupPointInfoView.kt
+32
-1
OrderCommodityInfoViewModel.kt
...nghuoquan/border/viewmodel/OrderCommodityInfoViewModel.kt
+4
-8
OrderPickupPointViewModel.kt
...henghuoquan/border/viewmodel/OrderPickupPointViewModel.kt
+6
-8
No files found.
Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/widget/OrderCommodityInfoView.kt
View file @
f8b18f9c
package
com.yidian.shenghuoquan.border.ui.widget
import
android.Manifest
import
android.content.Context
import
android.content.Intent
import
android.net.Uri
import
android.util.AttributeSet
import
android.view.LayoutInflater
import
androidx.constraintlayout.widget.ConstraintLayout
import
androidx.databinding.DataBindingUtil
import
androidx.fragment.app.FragmentActivity
import
androidx.lifecycle.LifecycleOwner
import
androidx.recyclerview.widget.LinearLayoutManager
import
com.tbruyelle.rxpermissions3.RxPermissions
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.bcommon.widget.CommonHintDialog
import
com.yidian.shenghuoquan.border.R
...
...
@@ -69,6 +74,19 @@ class OrderCommodityInfoView @JvmOverloads constructor(context: Context, attrs:
ToastUtils
.
showShortSafe
(
"已申请退款"
)
}
})
// 监听点击联系卖家
vm
.
contractSeller
.
observe
(
context
as
LifecycleOwner
,
{
phone
->
// 先判断权限
RxPermissions
(
context
as
FragmentActivity
).
request
(
Manifest
.
permission
.
CALL_PHONE
).
subscribe
{
granted
->
if
(
granted
)
{
val
intent
=
Intent
(
Intent
.
ACTION_DIAL
)
intent
.
data
=
Uri
.
parse
(
"tel:$phone"
)
context
.
startActivity
(
intent
)
}
else
{
ToastUtils
.
showShortSafe
(
"请在设置里同意相关权限"
)
}
}
})
}
/**
...
...
Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/ui/widget/OrderPickupPointInfoView.kt
View file @
f8b18f9c
package
com.yidian.shenghuoquan.border.ui.widget
import
android.Manifest
import
android.content.Context
import
android.content.Intent
import
android.net.Uri
import
android.util.AttributeSet
import
android.view.LayoutInflater
import
androidx.constraintlayout.widget.ConstraintLayout
import
androidx.databinding.DataBindingUtil
import
androidx.fragment.app.FragmentActivity
import
androidx.lifecycle.LifecycleOwner
import
com.tbruyelle.rxpermissions3.RxPermissions
import
com.yidian.bcommon.utils.ToastUtils
import
com.yidian.shenghuoquan.border.R
import
com.yidian.shenghuoquan.border.databinding.BorderViewOrderPickupPointInfoBinding
import
com.yidian.shenghuoquan.border.dto.PlaceList
...
...
@@ -25,13 +32,37 @@ class OrderPickupPointInfoView @JvmOverloads constructor(context: Context, attrs
this
,
true
)
private
val
vm
by
lazy
{
OrderPickupPointViewModel
()
}
init
{
registerUIEvent
()
}
/**
* 注册UI事件监听
*/
private
fun
registerUIEvent
()
{
// 监听点击联系自提点
vm
.
contractPickupPoint
.
observe
(
context
as
LifecycleOwner
,
{
phone
->
// 先判断权限
RxPermissions
(
context
as
FragmentActivity
).
request
(
Manifest
.
permission
.
CALL_PHONE
).
subscribe
{
granted
->
if
(
granted
)
{
val
intent
=
Intent
(
Intent
.
ACTION_DIAL
)
intent
.
data
=
Uri
.
parse
(
"tel:$phone"
)
context
.
startActivity
(
intent
)
}
else
{
ToastUtils
.
showShortSafe
(
"请在设置里同意相关权限"
)
}
}
})
}
/**
* 设置自提点
* @param info 自提点信息
*/
fun
setPickupPoint
(
info
:
PlaceList
?)
{
binding
.
vm
=
OrderPickupPointViewModel
()
binding
.
vm
=
vm
binding
.
data
=
info
}
}
Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/OrderCommodityInfoViewModel.kt
View file @
f8b18f9c
package
com.yidian.shenghuoquan.border.viewmodel
import
android.content.Intent
import
android.net.Uri
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
com.yidian.bcommon.app.YdBaseApplication
import
com.yidian.bcommon.mvvm.BaseViewModel
import
com.yidian.shenghuoquan.border.http.OrderRemoteDataSource
import
com.yidian.shenghuoquan.border.http.callback.IApplyRefundCallback
...
...
@@ -22,6 +19,9 @@ class OrderCommodityInfoViewModel : BaseViewModel() {
private
val
_applyRefund
=
MutableLiveData
<
String
>()
val
applyRefund
:
LiveData
<
String
>
=
_applyRefund
private
val
_contractSeller
=
MutableLiveData
<
String
>()
val
contractSeller
:
LiveData
<
String
>
=
_contractSeller
/**
* 申请退款
* @param orderId 订单id
...
...
@@ -32,14 +32,10 @@ class OrderCommodityInfoViewModel : BaseViewModel() {
/**
* 联系卖家
* 打开拨号界面
* @param phone 电话号码
*/
fun
contractSeller
(
phone
:
String
)
{
val
intent
=
Intent
(
Intent
.
ACTION_DIAL
)
intent
.
data
=
Uri
.
parse
(
"tel:$phone"
)
intent
.
flags
=
Intent
.
FLAG_ACTIVITY_NEW_TASK
YdBaseApplication
.
context
.
startActivity
(
intent
)
_contractSeller
.
value
=
phone
}
/**
...
...
Components/BOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/OrderPickupPointViewModel.kt
View file @
f8b18f9c
package
com.yidian.shenghuoquan.border.viewmodel
import
android.content.Intent
import
android.net.Uri
import
com.yidian.bcommon.app.YdBaseApplication
import
androidx.lifecycle.LiveData
import
androidx.lifecycle.MutableLiveData
import
com.yidian.bcommon.mvvm.BaseViewModel
/**
...
...
@@ -12,15 +11,14 @@ import com.yidian.bcommon.mvvm.BaseViewModel
*/
class
OrderPickupPointViewModel
:
BaseViewModel
()
{
private
val
_contractPickupPoint
=
MutableLiveData
<
String
>()
val
contractPickupPoint
:
LiveData
<
String
>
=
_contractPickupPoint
/**
* 联系自提点
* 打开拨号界面
* @param phone 电话号码
*/
fun
contractPickupPoint
(
phone
:
String
)
{
val
intent
=
Intent
(
Intent
.
ACTION_DIAL
)
intent
.
data
=
Uri
.
parse
(
"tel:$phone"
)
intent
.
flags
=
Intent
.
FLAG_ACTIVITY_NEW_TASK
YdBaseApplication
.
context
.
startActivity
(
intent
)
_contractPickupPoint
.
value
=
phone
}
}
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