Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
supplier
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王宇航
supplier
Commits
b5ccc516
Commit
b5ccc516
authored
Sep 09, 2020
by
Wyh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
9.09 1、二維碼頁面BUG修復 2、外送接單顯示餘額問題、餘額刷新問題修復
Signed-off-by: Wyh <1239658231>
parent
47147bd1
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
95 additions
and
58 deletions
+95
-58
base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/BaseViewPageAdapter.java
+3
-0
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/BannerViewPager.java
+2
-2
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/CornerTransform.java
+0
-1
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/ScaleGallerTransformer.java
+0
-3
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/ZoomPageTransformer.java
+2
-3
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/bean/BalanceBean.java
+41
-5
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/ColdChainMainPresenter.java
+2
-2
config.gradle
+1
-1
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/BalanceBean.kt
+9
-2
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
+4
-3
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
+5
-6
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/DeliveryAdapter.kt
+10
-1
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/QrCodePresenter.java
+1
-1
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/RestaurantQrCodeActivity.java
+10
-23
main-module/src/main/res/layout/layout_qrcode_item.xml
+5
-2
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
+0
-3
No files found.
base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/BaseViewPageAdapter.java
View file @
b5ccc516
...
@@ -24,7 +24,9 @@ public abstract class BaseViewPageAdapter extends PagerAdapter {
...
@@ -24,7 +24,9 @@ public abstract class BaseViewPageAdapter extends PagerAdapter {
@Override
@Override
public
Object
instantiateItem
(
ViewGroup
container
,
int
position
)
{
public
Object
instantiateItem
(
ViewGroup
container
,
int
position
)
{
View
view
=
getItemView
(
position
);
View
view
=
getItemView
(
position
);
if
(
view
.
getParent
()
==
null
)
{
container
.
addView
(
view
);
container
.
addView
(
view
);
}
return
view
;
return
view
;
}
}
...
@@ -36,6 +38,7 @@ public abstract class BaseViewPageAdapter extends PagerAdapter {
...
@@ -36,6 +38,7 @@ public abstract class BaseViewPageAdapter extends PagerAdapter {
@Override
@Override
public
void
destroyItem
(
ViewGroup
container
,
int
position
,
Object
object
)
{
public
void
destroyItem
(
ViewGroup
container
,
int
position
,
Object
object
)
{
container
.
removeView
((
View
)
object
);
}
}
}
}
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/BannerViewPager.java
View file @
b5ccc516
...
@@ -17,7 +17,7 @@ import androidx.viewpager.widget.ViewPager;
...
@@ -17,7 +17,7 @@ import androidx.viewpager.widget.ViewPager;
import
com.gingersoft.gsa.cloud.base.R
;
import
com.gingersoft.gsa.cloud.base.R
;
import
com.gingersoft.gsa.cloud.base.adapter.BaseViewPageAdapter
;
import
com.gingersoft.gsa.cloud.base.adapter.BaseViewPageAdapter
;
import
com.gingersoft.gsa.cloud.ui.view.transformer.
ScaleGaller
Transformer
;
import
com.gingersoft.gsa.cloud.ui.view.transformer.
ZoomPage
Transformer
;
import
java.util.List
;
import
java.util.List
;
...
@@ -128,7 +128,7 @@ public class BannerViewPager extends RelativeLayout implements ViewPager.OnPageC
...
@@ -128,7 +128,7 @@ public class BannerViewPager extends RelativeLayout implements ViewPager.OnPageC
mViewPager
.
setAdapter
(
mPagerAdapter
);
mViewPager
.
setAdapter
(
mPagerAdapter
);
if
(
isGallery
)
{
if
(
isGallery
)
{
mViewPager
.
setPageTransformer
(
true
,
new
ScaleGaller
Transformer
());
mViewPager
.
setPageTransformer
(
true
,
new
ZoomPage
Transformer
());
}
}
mViewPager
.
setCurrentItem
(
startCurrentIndex
);
mViewPager
.
setCurrentItem
(
startCurrentIndex
);
...
...
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/CornerTransform.java
View file @
b5ccc516
...
@@ -16,7 +16,6 @@ import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
...
@@ -16,7 +16,6 @@ import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
import
java.security.MessageDigest
;
import
java.security.MessageDigest
;
/**
/**
* Created by Administrator on 2018/11/28.
* 自定义圆角
* 自定义圆角
*/
*/
...
...
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/ScaleGallerTransformer.java
View file @
b5ccc516
...
@@ -4,9 +4,6 @@ import android.view.View;
...
@@ -4,9 +4,6 @@ import android.view.View;
import
androidx.viewpager.widget.ViewPager
;
import
androidx.viewpager.widget.ViewPager
;
/**
* Created by hucanhui on 2017/3/31.
*/
public
class
ScaleGallerTransformer
implements
ViewPager
.
PageTransformer
{
public
class
ScaleGallerTransformer
implements
ViewPager
.
PageTransformer
{
private
static
final
float
MIN_SCALE
=
0.85f
;
private
static
final
float
MIN_SCALE
=
0.85f
;
private
static
final
float
MIN_ALPHA
=
0.5f
;
private
static
final
float
MIN_ALPHA
=
0.5f
;
...
...
base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/transformer/ZoomPageTransformer.java
View file @
b5ccc516
...
@@ -5,11 +5,8 @@ import android.view.View;
...
@@ -5,11 +5,8 @@ import android.view.View;
import
androidx.viewpager.widget.ViewPager
;
import
androidx.viewpager.widget.ViewPager
;
/**
/**
* Created by Administrator on 2018/11/28.
* 3D画廊效果其实就是ViewPager的item切换时,进行缩放的动画效果
* 3D画廊效果其实就是ViewPager的item切换时,进行缩放的动画效果
*
*/
*/
public
class
ZoomPageTransformer
implements
ViewPager
.
PageTransformer
{
public
class
ZoomPageTransformer
implements
ViewPager
.
PageTransformer
{
private
static
final
float
MAX_SCALE
=
1.0f
;
//0缩放
private
static
final
float
MAX_SCALE
=
1.0f
;
//0缩放
...
@@ -20,9 +17,11 @@ public class ZoomPageTransformer implements ViewPager.PageTransformer {
...
@@ -20,9 +17,11 @@ public class ZoomPageTransformer implements ViewPager.PageTransformer {
public
ZoomPageTransformer
()
{
public
ZoomPageTransformer
()
{
}
}
public
ZoomPageTransformer
(
float
MIN_ALPHA
)
{
public
ZoomPageTransformer
(
float
MIN_ALPHA
)
{
this
.
MIN_ALPHA
=
MIN_ALPHA
;
this
.
MIN_ALPHA
=
MIN_ALPHA
;
}
}
@Override
@Override
public
void
transformPage
(
View
view
,
float
position
)
{
public
void
transformPage
(
View
view
,
float
position
)
{
//setScaleY只支持api11以上
//setScaleY只支持api11以上
...
...
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/model/bean/BalanceBean.java
View file @
b5ccc516
...
@@ -3,15 +3,50 @@ package com.gingersoft.coldchain_module.mvp.model.bean;
...
@@ -3,15 +3,50 @@ package com.gingersoft.coldchain_module.mvp.model.bean;
public
class
BalanceBean
{
public
class
BalanceBean
{
/**
/**
* success : true
* sysTime : 1599634994603
* data : {"id":72,"brandId":171,"balance":8685.14,"bond":500,"threshold":1000,"telephone":"110","updateTime":1599551167012,"createTime":1598426640164,"updateUid":390,"createUid":341,"deletes":0}
*/
private
boolean
success
;
private
long
sysTime
;
private
DataBean
data
;
public
boolean
isSuccess
()
{
return
success
;
}
public
void
setSuccess
(
boolean
success
)
{
this
.
success
=
success
;
}
public
long
getSysTime
()
{
return
sysTime
;
}
public
void
setSysTime
(
long
sysTime
)
{
this
.
sysTime
=
sysTime
;
}
public
DataBean
getData
()
{
return
data
;
}
public
void
setData
(
DataBean
data
)
{
this
.
data
=
data
;
}
public
static
class
DataBean
{
/**
* id : 72
* id : 72
* brandId : 171
* brandId : 171
* balance : 818.0
* balance : 8685.14
* bond : 500.0
* bond : 500.0
* threshold :
0.0
* threshold : 100
0.0
* telephone :
* telephone : 110
* updateTime : 1598426640164
* updateTime : 1599551167012
* createTime : 1598426640164
* createTime : 1598426640164
* updateUid : 341
* updateUid : 390
* createUid : 341
* createUid : 341
* deletes : 0
* deletes : 0
*/
*/
...
@@ -115,4 +150,5 @@ public class BalanceBean {
...
@@ -115,4 +150,5 @@ public class BalanceBean {
public
void
setDeletes
(
int
deletes
)
{
public
void
setDeletes
(
int
deletes
)
{
this
.
deletes
=
deletes
;
this
.
deletes
=
deletes
;
}
}
}
}
}
coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/presenter/ColdChainMainPresenter.java
View file @
b5ccc516
...
@@ -127,8 +127,8 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
...
@@ -127,8 +127,8 @@ public class ColdChainMainPresenter extends BasePresenter<ColdChainMainContract.
@Override
@Override
public
void
onNext
(
@NonNull
BalanceBean
info
)
{
public
void
onNext
(
@NonNull
BalanceBean
info
)
{
if
(
info
!=
null
)
{
if
(
info
!=
null
&&
info
.
isSuccess
()
)
{
mRootView
.
loadBalance
(
info
.
get
Balance
(),
info
.
getBond
(),
info
.
getBalance
()
<=
info
.
getThreshold
());
mRootView
.
loadBalance
(
info
.
get
Data
().
getBalance
(),
info
.
getData
().
getBond
(),
info
.
getData
().
getBalance
()
<=
info
.
getData
()
.
getThreshold
());
}
}
}
}
});
});
...
...
config.gradle
View file @
b5ccc516
...
@@ -8,7 +8,7 @@ ext {
...
@@ -8,7 +8,7 @@ ext {
//正式版: 1.0.3 3
//正式版: 1.0.3 3
//內部測試版:1.2.0 20
//內部測試版:1.2.0 20
versionCode
:
7
,
versionCode
:
7
,
versionName
:
"1.0.7
1
"
versionName
:
"1.0.7
2
"
]
]
version
=
[
version
=
[
...
...
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/BalanceBean.kt
View file @
b5ccc516
package
com.gingersoft.gsa.delivery_pick_mode.data.model.bean
package
com.gingersoft.gsa.delivery_pick_mode.data.model.bean
data class
BalanceBean
(
data class
BalanceBean
(
val
`data`
:
Data
,
val
success
:
Boolean
,
val
sysTime
:
Long
)
{
data class
Data
(
var
balance
:
Double
,
var
balance
:
Double
,
val
bond
:
Double
,
val
bond
:
Double
,
val
brandId
:
Int
,
val
brandId
:
Int
,
...
@@ -12,4 +18,5 @@ data class BalanceBean(
...
@@ -12,4 +18,5 @@ data class BalanceBean(
val
threshold
:
Double
,
val
threshold
:
Double
,
val
updateTime
:
Long
,
val
updateTime
:
Long
,
val
updateUid
:
Int
val
updateUid
:
Int
)
)
\ No newline at end of file
}
\ No newline at end of file
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
View file @
b5ccc516
...
@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable
...
@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android.os.IBinder
import
android.os.IBinder
import
android.util.Log
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.widget.TextView
import
android.widget.TextView
...
@@ -117,7 +118,7 @@ class DeliveryOrderMainActivity : BaseActivity() {
...
@@ -117,7 +118,7 @@ class DeliveryOrderMainActivity : BaseActivity() {
getBanlance
(
GsaCloudApplication
.
getBrandId
(
this
@DeliveryOrderMainActivity
))
getBanlance
(
GsaCloudApplication
.
getBrandId
(
this
@DeliveryOrderMainActivity
))
balanceBean
.
observe
(
this
@DeliveryOrderMainActivity
,
Observer
{
balanceBean
.
observe
(
this
@DeliveryOrderMainActivity
,
Observer
{
it
?.
let
{
it
?.
data
?.
let
{
tv_balance
.
text
=
"餘額:${it.balance}"
+
"(保證金: ${it.bond} )"
tv_balance
.
text
=
"餘額:${it.balance}"
+
"(保證金: ${it.bond} )"
if
(
it
.
balance
<=
it
.
threshold
)
{
if
(
it
.
balance
<=
it
.
threshold
)
{
//提示餘額不足
//提示餘額不足
...
@@ -501,10 +502,10 @@ class DeliveryOrderMainActivity : BaseActivity() {
...
@@ -501,10 +502,10 @@ class DeliveryOrderMainActivity : BaseActivity() {
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
if
(
resultCode
==
1001
)
{
if
(
resultCode
==
1001
)
{
val
doubleExtra
=
data
?.
getDoubleExtra
(
"deliveryAmount"
,
0.0
)
val
doubleExtra
=
data
?.
getDoubleExtra
(
"deliveryAmount"
,
0.0
)
pageViewModel
.
balanceBean
.
value
?.
let
{
pageViewModel
.
balanceBean
.
value
?.
data
?.
let
{
if
(
doubleExtra
!=
null
)
{
if
(
doubleExtra
!=
null
)
{
it
.
balance
-=
doubleExtra
it
.
balance
-=
doubleExtra
pageViewModel
.
balanceBean
.
postValue
(
it
)
pageViewModel
.
balanceBean
.
postValue
(
pageViewModel
.
balanceBean
.
value
)
}
}
}
}
}
}
...
...
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/OrderDetailsActivity.kt
View file @
b5ccc516
...
@@ -486,7 +486,7 @@ class OrderDetailsActivity : BaseActivity() {
...
@@ -486,7 +486,7 @@ class OrderDetailsActivity : BaseActivity() {
private
fun
PageViewModel
.
showSelectTransportation
(
transportationBeans
:
List
<
TransportationBean
.
DataX
.
Transportation
>,
orderDetails
:
OrderDetails
.
DataBean
,
isPrint
:
Boolean
)
{
private
fun
PageViewModel
.
showSelectTransportation
(
transportationBeans
:
List
<
TransportationBean
.
DataX
.
Transportation
>,
orderDetails
:
OrderDetails
.
DataBean
,
isPrint
:
Boolean
)
{
//獲取實際金額
//獲取實際金額
showLoading
()
showLoading
()
getActualAmount
(
orderId
,
GsaCloudApplication
.
getMemberId
(
this
@OrderDetailsActivity
),
restaurantId
)
{
getActualAmount
(
orderId
,
GsaCloudApplication
.
getMemberId
(
this
@OrderDetailsActivity
),
restaurantId
)
{
it
->
cancelDialogForLoading
()
cancelDialogForLoading
()
it
?.
let
{
transportAmountBean
->
it
?.
let
{
transportAmountBean
->
transportAmountBean
.
data
.
let
{
transportData
->
transportAmountBean
.
data
.
let
{
transportData
->
...
@@ -499,8 +499,8 @@ class OrderDetailsActivity : BaseActivity() {
...
@@ -499,8 +499,8 @@ class OrderDetailsActivity : BaseActivity() {
}
}
}
}
val
adapter
=
DeliveryAdapter
(
data
)
val
adapter
=
DeliveryAdapter
(
data
)
adapter
.
setOnItemClickListener
{
_
,
_
,
position
->
adapter
.
setOnItemClickListener
{
if
(
data
[
position
]
==
"Van仔"
)
{
if
(
data
[
it
].
contains
(
"Van仔"
))
{
ToastUtils
.
show
(
this
@OrderDetailsActivity
,
"Van仔不支持上門服務,需客戶自行落樓取餐"
)
ToastUtils
.
show
(
this
@OrderDetailsActivity
,
"Van仔不支持上門服務,需客戶自行落樓取餐"
)
}
}
}
}
...
@@ -523,12 +523,11 @@ class OrderDetailsActivity : BaseActivity() {
...
@@ -523,12 +523,11 @@ class OrderDetailsActivity : BaseActivity() {
showLoading
()
showLoading
()
confirmOrder
(
orderDetails
,
trafficType
,
restaurantId
,
isPrint
)
{
msg
->
confirmOrder
(
orderDetails
,
trafficType
,
restaurantId
,
isPrint
)
{
msg
->
cancelDialogForLoading
()
cancelDialogForLoading
()
when
(
msg
.
code
)
{
Transportation
.
toString
()
->
{
//修改運輸工具
val
intent
=
Intent
()
val
intent
=
Intent
()
intent
.
putExtra
(
"deliveryAmount"
,
orderDetails
.
deliveryAmount
)
intent
.
putExtra
(
"deliveryAmount"
,
orderDetails
.
deliveryAmount
)
setResult
(
1001
,
intent
)
setResult
(
1001
,
intent
)
when
(
msg
.
code
)
{
Transportation
.
toString
()
->
{
//修改運輸工具
finish
()
finish
()
ToastUtils
.
show
(
this
@OrderDetailsActivity
,
if
(
TextUtil
.
isNotEmptyOrNullOrUndefined
(
msg
.
errorMsg
))
{
ToastUtils
.
show
(
this
@OrderDetailsActivity
,
if
(
TextUtil
.
isNotEmptyOrNullOrUndefined
(
msg
.
errorMsg
))
{
msg
.
errorMsg
msg
.
errorMsg
...
...
delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/adapter/DeliveryAdapter.kt
View file @
b5ccc516
...
@@ -8,12 +8,21 @@ import com.gingersoft.gsa.delivery_pick_mode.R
...
@@ -8,12 +8,21 @@ import com.gingersoft.gsa.delivery_pick_mode.R
class
DeliveryAdapter
(
data
:
MutableList
<
String
>)
:
BaseQuickAdapter
<
String
,
BaseViewHolder
>(
R
.
layout
.
other_order_delivery_item
,
data
)
{
class
DeliveryAdapter
(
data
:
MutableList
<
String
>)
:
BaseQuickAdapter
<
String
,
BaseViewHolder
>(
R
.
layout
.
other_order_delivery_item
,
data
)
{
init
{
init
{
setOnItemClickListener
{
adapter
,
view
,
position
->
setOnItemClickListener
{
adapter
,
_
,
position
->
selectIndex
=
position
selectIndex
=
position
adapter
.
notifyDataSetChanged
()
adapter
.
notifyDataSetChanged
()
}
}
}
}
fun
setOnItemClickListener
(
block
:
(
position
:
Int
)
->
Unit
)
{
setOnItemClickListener
{
adapter
,
_
,
position
->
block
.
invoke
(
position
)
selectIndex
=
position
adapter
.
notifyDataSetChanged
()
}
}
override
fun
convert
(
holder
:
BaseViewHolder
,
item
:
String
)
{
override
fun
convert
(
holder
:
BaseViewHolder
,
item
:
String
)
{
holder
.
setText
(
R
.
id
.
tv_delivery_name
,
item
)
holder
.
setText
(
R
.
id
.
tv_delivery_name
,
item
)
if
(
holder
.
adapterPosition
==
selectIndex
)
{
if
(
holder
.
adapterPosition
==
selectIndex
)
{
...
...
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/QrCodePresenter.java
View file @
b5ccc516
...
@@ -48,7 +48,7 @@ public class QrCodePresenter extends BasePresenter<QrCodeContract.Model, QrCodeC
...
@@ -48,7 +48,7 @@ public class QrCodePresenter extends BasePresenter<QrCodeContract.Model, QrCodeC
public
void
getRestaurantQrCode
()
{
public
void
getRestaurantQrCode
()
{
mModel
.
getRestaurantQrCode
(
GsaCloudApplication
.
getRestaurantId
(
GsaCloudApplication
.
getAppContext
())
+
""
)
mModel
.
getRestaurantQrCode
(
GsaCloudApplication
.
getRestaurantId
(
GsaCloudApplication
.
getAppContext
())
+
""
)
.
subscribeOn
(
Schedulers
.
io
())
.
subscribeOn
(
Schedulers
.
io
())
.
doOnSubscribe
(
disposable
->
mRootView
.
showLoading
(
""
))
.
doOnSubscribe
(
disposable
->
mRootView
.
showLoading
(
"
加載中...
"
))
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
doAfterTerminate
(()
->
mRootView
.
hideLoading
())
.
doAfterTerminate
(()
->
mRootView
.
hideLoading
())
...
...
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/RestaurantQrCodeActivity.java
View file @
b5ccc516
...
@@ -24,6 +24,7 @@ import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract;
...
@@ -24,6 +24,7 @@ import com.gingersoft.gsa.cloud.main.mvp.contract.QrCodeContract;
import
com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean
;
import
com.gingersoft.gsa.cloud.main.mvp.model.bean.RestaurantQrBean
;
import
com.gingersoft.gsa.cloud.main.mvp.presenter.QrCodePresenter
;
import
com.gingersoft.gsa.cloud.main.mvp.presenter.QrCodePresenter
;
import
com.gingersoft.gsa.cloud.ui.view.BannerViewPager
;
import
com.gingersoft.gsa.cloud.ui.view.BannerViewPager
;
import
com.gingersoft.gsa.cloud.ui.widget.dialog.LoadingDialog
;
import
com.google.android.material.tabs.TabLayout
;
import
com.google.android.material.tabs.TabLayout
;
import
com.jess.arms.base.BaseActivity
;
import
com.jess.arms.base.BaseActivity
;
import
com.jess.arms.di.component.AppComponent
;
import
com.jess.arms.di.component.AppComponent
;
...
@@ -93,19 +94,22 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
...
@@ -93,19 +94,22 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
@Override
@Override
public
void
showLoading
(
String
message
)
{
public
void
showLoading
(
String
message
)
{
if
(
message
!=
null
)
LoadingDialog
.
showDialogForLoading
(
this
,
message
,
true
);
else
LoadingDialog
.
showDialogForLoading
(
this
);
}
}
@Override
@Override
public
void
hideLoading
()
{
public
void
hideLoading
()
{
LoadingDialog
.
cancelDialogForLoading
();
}
}
private
void
initTab
()
{
private
void
initTab
()
{
viewPager
.
initBanner
(
tabs
,
true
,
views
)
//开启3D画廊效果
viewPager
.
initBanner
(
tabs
,
true
,
views
)
//开启3D画廊效果
.
addPageMargin
(
0
,
0
)
//参数1page之间的间距,参数2中间item距离边界的间距
.
addPageMargin
(
-
20
,
2
0
)
//参数1page之间的间距,参数2中间item距离边界的间距
.
finishConfig
();
//这句必须加
.
finishConfig
();
//这句必须加
viewPager
.
getmViewPager
().
setCurrentItem
(
0
);
tabLayout
.
setupWithViewPager
(
viewPager
.
getmViewPager
());
//TabLayout的标签从Adapter中获取
tabLayout
.
setupWithViewPager
(
viewPager
.
getmViewPager
());
//TabLayout的标签从Adapter中获取
//用来循环适配器中的视图总数
//用来循环适配器中的视图总数
for
(
int
i
=
0
;
i
<
tabs
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
tabs
.
size
();
i
++)
{
...
@@ -124,28 +128,11 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
...
@@ -124,28 +128,11 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
textView
.
setText
(
tabs
.
get
(
i
));
//设置tab上的文字
textView
.
setText
(
tabs
.
get
(
i
));
//设置tab上的文字
}
}
}
}
tabLayout
.
addOnTabSelectedListener
(
new
TabLayout
.
OnTabSelectedListener
()
{
@Override
public
void
onTabSelected
(
TabLayout
.
Tab
tab
)
{
setSelectTab
(
tab
,
true
);
}
@Override
public
void
onTabUnselected
(
TabLayout
.
Tab
tab
)
{
setSelectTab
(
tab
,
false
);
}
@Override
public
void
onTabReselected
(
TabLayout
.
Tab
tab
)
{
}
});
}
}
private
void
setSelectTab
(
TabLayout
.
Tab
tabAt
,
boolean
isSelected
)
{
private
void
setSelectTab
(
TabLayout
.
Tab
tabAt
,
boolean
isSelected
)
{
if
(
tabAt
.
getCustomView
()
!=
null
)
{
if
(
tabAt
.
getCustomView
()
!=
null
)
{
TextView
tab
=
tabAt
.
getCustomView
().
findViewById
(
R
.
id
.
tv_tab
);
//第一个tab被选中
TextView
tab
=
tabAt
.
getCustomView
().
findViewById
(
R
.
id
.
tv_tab
);
tab
.
setSelected
(
isSelected
);
tab
.
setSelected
(
isSelected
);
//设置选中标签的文字大小
//设置选中标签的文字大小
tab
.
setTextSize
(
TypedValue
.
COMPLEX_UNIT_PX
,
isSelected
?
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
sp_16
)
:
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
sp_14
));
tab
.
setTextSize
(
TypedValue
.
COMPLEX_UNIT_PX
,
isSelected
?
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
sp_16
)
:
getResources
().
getDimensionPixelSize
(
R
.
dimen
.
sp_14
));
...
@@ -189,7 +176,7 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
...
@@ -189,7 +176,7 @@ public class RestaurantQrCodeActivity extends BaseActivity<QrCodePresenter> impl
TextView
tvUrl
=
view
.
findViewById
(
R
.
id
.
tv_qrcode_item_url
);
TextView
tvUrl
=
view
.
findViewById
(
R
.
id
.
tv_qrcode_item_url
);
Button
copyBtn
=
view
.
findViewById
(
R
.
id
.
btn_copy_url
);
Button
copyBtn
=
view
.
findViewById
(
R
.
id
.
btn_copy_url
);
tvTitle
.
setText
(
title
+
"二維碼"
);
tvTitle
.
setText
(
title
+
"二維碼"
);
int
width
=
ArmsUtils
.
getScreenWidth
(
mContext
)
/
2
;
int
width
=
ArmsUtils
.
getScreenWidth
(
mContext
)
/
3
*
2
;
qrCode
.
setImageBitmap
(
QRCodeUtil
.
createQRImage
(
url
,
width
,
width
));
qrCode
.
setImageBitmap
(
QRCodeUtil
.
createQRImage
(
url
,
width
,
width
));
tvUrl
.
setText
(
url
);
tvUrl
.
setText
(
url
);
copyBtn
.
setOnClickListener
(
v
->
{
copyBtn
.
setOnClickListener
(
v
->
{
...
...
main-module/src/main/res/layout/layout_qrcode_item.xml
View file @
b5ccc516
...
@@ -10,8 +10,10 @@
...
@@ -10,8 +10,10 @@
<com.lihang.ShadowLayout
<com.lihang.ShadowLayout
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
android:background=
"@color/white"
android:background=
"@color/white"
android:layout_marginTop=
"@dimen/dp_10"
android:layout_marginBottom=
"@dimen/dp_20"
app:hl_cornerRadius=
"@dimen/dp_8"
>
app:hl_cornerRadius=
"@dimen/dp_8"
>
<LinearLayout
<LinearLayout
...
@@ -45,7 +47,8 @@
...
@@ -45,7 +47,8 @@
<TextView
<TextView
android:id=
"@+id/tv_qrcode_item_url"
android:id=
"@+id/tv_qrcode_item_url"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:layout_gravity=
"center_horizontal"
android:layout_gravity=
"center_horizontal"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_marginLeft=
"@dimen/dp_20"
android:layout_marginTop=
"@dimen/dp_30"
android:layout_marginTop=
"@dimen/dp_30"
...
...
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
View file @
b5ccc516
...
@@ -10,14 +10,12 @@ import androidx.appcompat.app.AppCompatActivity;
...
@@ -10,14 +10,12 @@ import androidx.appcompat.app.AppCompatActivity;
import
com.epson.epos2.printer.Printer
;
import
com.epson.epos2.printer.Printer
;
import
com.epson.epos2.printer.PrinterStatusInfo
;
import
com.epson.epos2.printer.PrinterStatusInfo
;
import
com.epson.epos2.printer.ReceiveListener
;
import
com.epson.epos2.printer.ReceiveListener
;
import
com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
;
import
com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
;
import
com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
;
import
com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean
;
import
com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean
;
import
com.gingersoft.gsa.cloud.print.PrintExecutor
;
import
com.gingersoft.gsa.cloud.print.PrintExecutor
;
import
com.gingersoft.gsa.cloud.print.PrintSocketHolder
;
import
com.gingersoft.gsa.cloud.print.PrintSocketHolder
;
import
com.joe.print.R
;
import
com.joe.print.R
;
import
com.joe.print.mvp.model.bean.PrintInfoBean
;
import
com.joe.print.mvp.model.bean.PrintInfoBean
;
import
com.joe.print.mvp.print.EpsonPrint
;
import
com.joe.print.mvp.print.PrintTest
;
import
com.joe.print.mvp.print.PrintTest
;
import
com.joe.print.mvp.print.common.PrinterFinderCallback
;
import
com.joe.print.mvp.print.common.PrinterFinderCallback
;
import
com.joe.print.mvp.print.common.SendCallback
;
import
com.joe.print.mvp.print.common.SendCallback
;
...
@@ -218,7 +216,6 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
...
@@ -218,7 +216,6 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
@Override
@Override
public
void
onPtrReceive
(
Printer
printer
,
int
i
,
PrinterStatusInfo
printerStatusInfo
,
String
s
)
{
public
void
onPtrReceive
(
Printer
printer
,
int
i
,
PrinterStatusInfo
printerStatusInfo
,
String
s
)
{
Log
.
e
(
"eee"
,
""
);
if
(
i
==
0
)
{
if
(
i
==
0
)
{
ToastUtils
.
show
(
PrintTestActivity
.
this
,
"打印成功"
);
ToastUtils
.
show
(
PrintTestActivity
.
this
,
"打印成功"
);
}
else
{
}
else
{
...
...
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