Skip to content

Y
YPPos
Commit d4492da6 authored by UIUANG\Zsc's avatar UIUANG\Zsc
Browse files
Options

新增矢量图-svg，修改一些问题

parent 375e7c3d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 812 additions and 230 deletions
app/build.gradle
View file @ d4492da6
......@@ -13,8 +13,8 @@ android {
applicationId "com.ypsx.yppos"
minSdkVersion 21
targetSdkVersion 30
versionCode 100000
versionName "1.00.000"
versionCode 100001
versionName "1.00.001"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
......@@ -117,7 +117,6 @@ dependencies {
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4'
def room_version = "2.3.0"
def lastversion = "3.5.0"
implementation("androidx.room:room-runtime:$room_version")
annotationProcessor "androidx.room:room-compiler:$room_version"
......@@ -133,8 +132,6 @@ dependencies {
implementation 'com.github.getActivity:ToastUtils:9.5'
implementation 'com.aliyun.dpa:oss-android-sdk:2.1.0'
debugImplementation "io.github.didi.dokit:dokitx:${lastversion}"
releaseImplementation "io.github.didi.dokit:dokitx-no-op:${lastversion}"
// val work_version = "2.6.0"
// Kotlin + coroutines
// implementation("androidx.work:work-runtime-ktx:$work_version")
......
app/release/output-metadata.json 0 → 100644
View file @ d4492da6
{
"version": 2,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.ypsx.yppos",
"variantName": "release",
"elements": [
{
"type": "SINGLE",
"filters": [],
"versionCode": 100001,
"versionName": "1.00.001",
"outputFile": "yppos-v-release.apk"
}
]
}
\ No newline at end of file
app/release/yppos-v-release.apk 0 → 100644
View file @ d4492da6
File added
app/src/main/java/com/ypsx/yppos/PosApp.kt
View file @ d4492da6
......@@ -3,8 +3,6 @@ package com.ypsx.yppos
import android.content.Intent
import android.os.Build
import android.os.Process
import com.didichuxing.doraemonkit.DoKit
import com.didichuxing.doraemonkit.kit.AbstractKit
import com.elvishew.xlog.LogConfiguration
import com.elvishew.xlog.LogLevel
import com.elvishew.xlog.XLog
......@@ -26,7 +24,6 @@ import com.tencent.mmkv.MMKV
import com.ypsx.base.base.BaseApp
import com.ypsx.yppos.app.event.AppViewModel
import com.ypsx.yppos.app.event.EventViewModel
import com.ypsx.yppos.kit.ServerHostKit
import com.ypsx.yppos.room.database.PosDatabase
import com.ypsx.yppos.utils.PathUtils
import com.ypsx.yppos.utils.XLogFlattener
......@@ -50,11 +47,7 @@ class PosApp : BaseApp() {
MMKV.initialize(this)
// 初始化 Toast 框架
ToastUtils.init(this);
var list = arrayListOf<AbstractKit>()
list.add(ServerHostKit())
DoKit.Builder(this)
.customKits(listOf(ServerHostKit()))
.build()
instance = this
PosDatabase.getDatabase(instance)
eventViewModelInstance = getAppViewModelProvider().get(EventViewModel::class.java)
......
app/src/main/java/com/ypsx/yppos/http/ApiService.kt
View file @ d4492da6
......@@ -45,6 +45,9 @@ interface ApiService {
@POST("newretail/api/sys/user/kickoff")
suspend fun posKickOff(@Body request: KickoffRequest): ApiResponse<String?>
@POST("/api/sys/user/refreshToken")
fun refreshToken(@Body request:RefreshTokenRequest):ApiResponse<RefreshTokenResponse>
/**
* 根据POS机Id查询POS机配置详情
*/
......
app/src/main/java/com/ypsx/yppos/http/NetworkApi.kt
View file @ d4492da6
......@@ -48,6 +48,7 @@ class NetworkApi : BaseNetworkApi() {
addInterceptor(HeadInterceptor())
//添加缓存拦截器 可传入缓存天数，不传默认7天
addInterceptor(CacheInterceptor())
addInterceptor(RetryInterceptor())
// 日志拦截器
addInterceptor(HttpLoggingInterceptor())
//超时时间 连接、读、写
......
app/src/main/java/com/ypsx/yppos/http/RetryInterceptor.kt 0 → 100644
View file @ d4492da6
package com.ypsx.yppos.http
import com.elvishew.xlog.XLog
import com.ypsx.yppos.http.data.request.RefreshTokenRequest
import com.ypsx.yppos.utils.CacheUtil
import com.ypsx.yppos.utils.InterceptorUtils
import okhttp3.Interceptor
import okhttp3.Request
import okhttp3.Response
import org.json.JSONObject
class RetryInterceptor: Interceptor {
val NOT_LOGIN_CODE = 20
val TOKEN_AUTHENTICATION_FAILED = 19
private val CODE = "code"
override fun intercept(chain: Interceptor.Chain): Response {
val request = chain.request()
val response = chain.proceed(request)
try {
val body = response.body()
val jsonObject = JSONObject(InterceptorUtils.getRspData(body))
val code: Int = jsonObject.getInt(CODE)
//Token失效重新登录(过滤掉注销会员的接口，退出登录时不必判断接口是否成功，默认进入登录页面，避免此处重复进入)
if (code == NOT_LOGIN_CODE
|| code == TOKEN_AUTHENTICATION_FAILED
) {
var loginResponse = CacheUtil.getLoginResponse()
var refreshToken =
apiService.refreshToken(RefreshTokenRequest(loginResponse!!.accessToken))
loginResponse.accessToken = refreshToken.data.refreshToken
CacheUtil.setLoginResponse(loginResponse)
val newRequest: Request = request.newBuilder().header("access-token", loginResponse.accessToken)
.build()
return chain.proceed(newRequest);
}
} catch (e: Exception) {
val requestUrl = if (request.url() == null) "空" else request.url().toString()
XLog.i("接口 = " + requestUrl + " 发生异常：" + e.message)
}
return response
}
}
\ No newline at end of file
app/src/main/java/com/ypsx/yppos/http/data/bean/InsertOrderProductDTO.kt
View file @ d4492da6
......@@ -27,6 +27,7 @@ data class InsertOrderProductDTO(
var price: Double,
var quantity: Double,
var priceType: String,
var mnemonicCode:String,
var productId: String,
var productNumber: String,
var settlementPrice: Double = 0.0,
......
app/src/main/java/com/ypsx/yppos/http/data/bean/PayAmountBean.kt
View file @ d4492da6
......@@ -6,6 +6,8 @@ data class PayAmountBean(
var discountMoney: Double = 0.0, //满减促销
var discountTime: Double = 0.0,//分时促销
var discountSpecial: Double = 0.0,//特价促销
var amount: Double = 0.0 //总价值
var amount: Double = 0.0, //总价值
var listNum:Int = 0
)
app/src/main/java/com/ypsx/yppos/http/data/bean/RefreshTokenResponse.kt 0 → 100644
View file @ d4492da6
package com.ypsx.yppos.http.data.bean
data class RefreshTokenResponse(
var accessToken: String,
val expiresIn: Int,
val refreshExpiresIn: Int,
val refreshToken: String
)
app/src/main/java/com/ypsx/yppos/http/data/entity/PosProductStyle.kt
View file @ d4492da6
package com.ypsx.yppos.http.data.entity
enum class PosProductStyle {
/**
*单品
*/
SINGLE,
/**
*多规格父商品
*/
SPEC_PARENT,
/**
* 多规格子商品
*/
SPEC_CHILD,
/**
* 套餐
*/
MEALS,
/**
* 配料
*/
MIXTURE,
WEIGHT
/**
* 可称重商品
*/
WEIGHT;
}
\ No newline at end of file
app/src/main/java/com/ypsx/yppos/http/data/request/RefreshTokenRequest.kt 0 → 100644
View file @ d4492da6
package com.ypsx.yppos.http.data.request
data class RefreshTokenRequest(
var refreshToken:String
)
app/src/main/java/com/ypsx/yppos/http/repository/request/HttpRequestManger.kt
View file @ d4492da6
......@@ -119,7 +119,7 @@ class HttpRequestManger {
val data = uploadData[0]
val success = data.success
if (success) {
var cardPayPassword:String? = null
var cardPayPassword: String? = null
if (payMethod == PosPayMethod.CARDPAY) {
cardPayPassword = ""
}
......@@ -235,7 +235,7 @@ class HttpRequestManger {
}
}
}
delay(10000L)
delay(1000 * 60 * 5)
return uploadLog(posCode)
} else {
throw AppException(commandByPosCode.code, commandByPosCode.message)
......@@ -296,7 +296,7 @@ class HttpRequestManger {
val data = productData.data
PosProductRepository.getInstance().insertAll(data)
CacheUtil.setUpdateTimeBigger(todayDateTime)
delay(1000 * 60 * 5)
delay(1000 * 60 )
syncProduct(storeId)
}
}
......
app/src/main/java/com/ypsx/yppos/kit/ServerHostKit.kt deleted 100644 → 0
View file @ 375e7c3d
package com.ypsx.yppos.kit
import android.app.Activity
import android.content.Context
import androidx.appcompat.app.AlertDialog
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.input.InputCallback
import com.afollestad.materialdialogs.input.input
import com.afollestad.materialdialogs.list.SingleChoiceListener
import com.afollestad.materialdialogs.list.listItemsSingleChoice
import com.didichuxing.doraemonkit.kit.AbstractKit
import com.didichuxing.doraemonkit.util.ActivityUtils
import com.ypsx.yppos.PosApp
import com.ypsx.yppos.R
import com.ypsx.yppos.room.database.PosDatabase
import com.ypsx.yppos.utils.CacheUtil
class ServerHostKit : AbstractKit() {
private val hostMap = mapOf(
"sit开发环境Host" to "https://sit-cpos.ypshengxian.com/",
"预发Host" to "https://pre-cpos.ypshengxian.com/",
"线上正式Host" to "https://cpos.ypshengxian.com/",
)
private val hosts = hostMap.values.toTypedArray()
private val names = hostMap.keys.toList()
override val icon: Int
get() = R.mipmap.icon_yp_logo
override val name: Int
get() = R.string.environment_kit
override fun onClickWithReturn(activity: Activity): Boolean {
val activity = ActivityUtils.getTopActivity()
//选中的host
val checkHost =
CacheUtil.getHost()
var checkedIndex = hosts.indexOf(checkHost)
if (checkedIndex < 0) checkedIndex = names.size - 1//也就是研发Native那个
//启用输入的host
MaterialDialog(activity).title(text = "切换Server接口")
.cancelable(false)
.cancelOnTouchOutside(false)
.listItemsSingleChoice(
items = names,
initialSelection = checkedIndex,
selection = object : SingleChoiceListener {
override fun invoke(dialog: MaterialDialog, index: Int, text: CharSequence) {
//如果选择了研发native，index就会超过host的index
if (index < hosts.size) {
CacheUtil.setHost(hosts[index])
CacheUtil.clearAll()
PosDatabase.clearAllTables()
PosApp.instance.restartApplication()
}
}
})
.positiveButton(text = "确定")
.negativeButton(text = "取消")
.show()
return true
}
override fun onAppInit(context: Context?) {
}
}
\ No newline at end of file
app/src/main/java/com/ypsx/yppos/ui/activity/LoginActivity.kt
View file @ d4492da6
......@@ -4,14 +4,19 @@ import android.os.Bundle
import android.text.method.HideReturnsTransformationMethod
import android.text.method.PasswordTransformationMethod
import androidx.activity.viewModels
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.list.SingleChoiceListener
import com.afollestad.materialdialogs.list.listItemsSingleChoice
import com.ypsx.base.ext.view.afterTextChange
import com.ypsx.base.ext.view.textStringTrim
import com.ypsx.base.network.manager.NetState
import com.ypsx.base.util.RegexUtils
import com.ypsx.yppos.PosApp
import com.ypsx.yppos.R
import com.ypsx.yppos.app.base.BaseActivity
import com.ypsx.yppos.app.ext.startKtxActivityFinish
import com.ypsx.yppos.databinding.ActivityLoginBinding
import com.ypsx.yppos.room.database.PosDatabase
import com.ypsx.yppos.ui.popup.AppUpdaterPopupWindow
import com.ypsx.yppos.ui.popup.MessagePopupWindow
import com.ypsx.yppos.utils.CacheUtil
......@@ -25,8 +30,16 @@ import com.ypsx.yppos.viewmodel.state.LoginViewModel
*/
class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
private val requestLoginViewModel: RequestLoginViewModel by viewModels()
private var exitTime: Long = 0
private var clickNum = 1
override fun layoutId(): Int = R.layout.activity_login
private val hostMap = mapOf(
"sit开发环境Host" to "https://sit-cpos.ypshengxian.com/",
"预发Host" to "https://pre-cpos.ypshengxian.com/",
"线上正式Host" to "https://cpos.ypshengxian.com/",
)
private val hosts = hostMap.values.toTypedArray()
private val names = hostMap.keys.toList()
override fun initView(savedInstanceState: Bundle?) {
mDatabind.vm = mViewModel
......@@ -71,7 +84,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
val isHideFirst = mViewModel.isHideFirst.get()
if (isHideFirst) {
mViewModel.isHideFirst.set(false)
mDatabind.btEye.setImageResource(R.mipmap.ic_eye_open)
mDatabind.btEye.setImageResource(R.drawable.ic_eye_open)
//显示
mDatabind.etPassword.transformationMethod =
HideReturnsTransformationMethod.getInstance()
......@@ -81,12 +94,52 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
mViewModel.isHideFirst.set(true)
mDatabind.etPassword.transformationMethod =
PasswordTransformationMethod.getInstance()
mDatabind.btEye.setImageResource(R.mipmap.ic_eye_close)
mDatabind.btEye.setImageResource(R.drawable.ic_eye_close)
mDatabind.etPassword.setSelection(mDatabind.etPassword.textStringTrim().length)
}
}
fun combosClick(){
if (System.currentTimeMillis() - exitTime > 2000) {
clickNum = 1
exitTime = System.currentTimeMillis()
} else {
exitTime = System.currentTimeMillis()
clickNum += 1
}
if (clickNum >= 5) {
showServerHostPopWindow()
}
}
}
private fun showServerHostPopWindow() {
//选中的host
val checkHost = CacheUtil.getHost()
var checkedIndex = hosts.indexOf(checkHost)
if (checkedIndex < 0) checkedIndex = names.size - 1//也就是研发Native那个
//启用输入的host
MaterialDialog(this).title(text = "切换Server接口")
.cancelable(false)
.cancelOnTouchOutside(false)
.listItemsSingleChoice(
items = names,
initialSelection = checkedIndex,
selection = object : SingleChoiceListener {
override fun invoke(dialog: MaterialDialog, index: Int, text: CharSequence) {
//如果选择了研发native，index就会超过host的index
if (index < hosts.size) {
CacheUtil.setHost(hosts[index])
CacheUtil.clearAll()
PosDatabase.clearAllTables()
PosApp.instance.restartApplication()
}
}
})
.positiveButton(text = "确定")
.negativeButton(text = "取消")
.show()
}
override fun createObserver() {
......
app/src/main/java/com/ypsx/yppos/ui/activity/MainActivity.kt
View file @ d4492da6
......@@ -8,8 +8,10 @@ import android.util.Log
import android.view.KeyEvent
import android.view.View
import android.view.inputmethod.EditorInfo
import android.widget.TextView
import androidx.activity.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ypsx.base.ext.view.textStringTrim
import com.ypsx.yppos.R
import com.ypsx.yppos.app.base.BaseActivity
......@@ -50,7 +52,11 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
private var posBuyPartsDeleted = arrayListOf<InsertOrderProductDTO>()
var activitys: List<OrderActivityResponse>? = null
var payAmountPopupWindow: PayAmountPopupWindow? = null
var paySuccessPopWindow: PaySuccessPopWindow? = null
var payFailedPopWindow: PayFailedPopWindow? = null
val realName: String = CacheUtil.getRealName()
private lateinit var tvListNum: TextView
// var offerDetailsPopupWindow = OfferDetailsPopupWindow(this)
......@@ -90,6 +96,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
if (keyCode >= SCAN_KEYCODE[0] && keyCode <= SCAN_KEYCODE[SCAN_KEYCODE.size - 1]
) {
mScanManager.startDecode()
hideKeyboard()
}
if (keyCode == KeyEvent.KEYCODE_BACK) {
......@@ -170,9 +177,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
mDatabind.click = ProxyClick()
requestMainViewModel.getOptions()
recyclerView.layoutManager = LinearLayoutManager(this)
var linearLayoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
// linearLayoutManager.stackFromEnd = true;
// linearLayoutManager.scrollToPositionWithOffset(orderProductAdapter.itemCount - 1, Integer.MIN_VALUE);
recyclerView.layoutManager = linearLayoutManager
recyclerView.adapter = orderProductAdapter
orderProductAdapter.addHeaderView(View.inflate(this, R.layout.item_order_header, null))
val viewHeader = View.inflate(this, R.layout.item_order_header, null)
tvListNum = viewHeader.findViewById<TextView>(R.id.tv_list_num)
tvListNum.text = "购买商品列表(0)"
orderProductAdapter.addHeaderView(viewHeader)
orderProductAdapter.run {
addChildClickViewIds(R.id.rl_item_delete, R.id.tv_count_add, R.id.tv_count_reduce)
setOnItemChildClickListener { adapter, view, position ->
......@@ -280,7 +293,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
val textStringTrim = et_search_content.textStringTrim()
requestMainViewModel.getKeyWords(textStringTrim)
}
return@setOnEditorActionListener false
}
......@@ -318,17 +330,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
mViewModel.discountMoney.get(),
mViewModel.discountTime.get()
)
iv_arrow.setImageResource(R.mipmap.ic_temp_down)
iv_arrow.setImageResource(R.drawable.ic_discount_down)
offerDetailsPopupWindow.onDismissListener = object :
OnDismissListener() {
override fun onDismiss() {
iv_arrow.setImageResource(R.mipmap.ic_temp_up)
iv_arrow.setImageResource(R.drawable.ic_discount_up)
}
}
}
fun payAmount() {
......@@ -398,6 +408,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
}
orderProductAdapter.setList(it)
orderProductAdapter.notifyDataSetChanged()
val size = orderProductAdapter.data.size
RecyclerViewUtil.smoothMoveToPosition(mDatabind.recyclerView, size - 1)
// mDatabind.recyclerView.smoothScrollToPosition()
})
......@@ -430,15 +443,18 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
mViewModel.discount.set(it.discountTotal.toString())
mViewModel.payAmount.set(it.payApportionAmount.toString())
mViewModel.amount.set(it.amount)
// mViewModel.productsNum.set(it.listNum)
tvListNum.text = "购买商品列表(${it.listNum})"
})
requestMainViewModel.paySuccessState.observe(this, {
payAmountPopupWindow?.dismiss()
payAmountPopupWindow!!.dismiss()
if (it.isSuccess) {
val paySuccessPopWindow = PaySuccessPopWindow(this)
paySuccessPopWindow.showPopupWindow()
paySuccessPopWindow.setData(it.data!!)
paySuccessPopWindow.onDismissListener = object : OnDismissListener() {
payFailedPopWindow!!.dismiss()
paySuccessPopWindow = PaySuccessPopWindow(this)
paySuccessPopWindow!!.showPopupWindow()
paySuccessPopWindow!!.setData(it.data!!)
paySuccessPopWindow!!.onDismissListener = object : OnDismissListener() {
override fun onDismiss() {
mViewModel.resetOrderNo()
mViewModel.resetAmount()
......@@ -451,12 +467,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
}
}
} else {
val payFailedPopWindow = PayFailedPopWindow(this)
payFailedPopWindow.showPopupWindow()
payFailedPopWindow.setData(it.errorMsg)
payFailedPopWindow.setOnPayFailedClick(object : OnPayFailedClick {
payFailedPopWindow = PayFailedPopWindow(this)
payFailedPopWindow!!.showPopupWindow()
payFailedPopWindow!!.setData(it.errorMsg)
payFailedPopWindow!!.setOnPayFailedClick(object : OnPayFailedClick {
override fun back() {
mViewModel.resetOrderNo()
productPromotionRequest.orderNo = mViewModel.orderNo.get()
......
app/src/main/java/com/ypsx/yppos/ui/adapter/OrderProductAdapter.kt
View file @ d4492da6
......@@ -17,7 +17,18 @@ class OrderProductAdapter(data: ArrayList<InsertOrderProductDTO>) :
) {
override fun convert(holder: BaseViewHolder, item: InsertOrderProductDTO) {
item.run {
holder.setText(R.id.tv_barCode, "条码：$barCode")
when (style) {
PosProductStyle.SINGLE.name -> holder.setText(R.id.tv_barCode, "条码：$barCode")
PosProductStyle.WEIGHT.name->{
if (weightCode.isNullOrEmpty()) {
holder.setText(R.id.tv_barCode, "PLU：$mnemonicCode")
}else{
holder.setText(R.id.tv_barCode, "PLU：$weightCode")
}
}
}
if (discountTotal > 0.0 || isPromotion) {
val ssb = SpannableStringBuilder("促销 $name")
var roundBackgroundColorSpan =
......
app/src/main/java/com/ypsx/yppos/utils/CacheUtil.kt
View file @ d4492da6
......@@ -97,8 +97,8 @@ object CacheUtil {
val kv = MMKV.mmkvWithID("app")
kv.decodeString("host", "https://sit-cpos.ypshengxian.com/").toString()
} else {
"https://cpos.ypshengxian.com/"
val kv = MMKV.mmkvWithID("app")
kv.decodeString("host", "https://cpos.ypshengxian.com/").toString()
}
}
}
\ No newline at end of file
app/src/main/java/com/ypsx/yppos/utils/InterceptorUtils.java 0 → 100644
View file @ d4492da6
package com.ypsx.yppos.utils;
import org.json.JSONObject;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
import okhttp3.MediaType;
import okhttp3.RequestBody;
import okhttp3.Response;
import okhttp3.ResponseBody;
import okio.Buffer;
import okio.BufferedSource;
public class InterceptorUtils {
private static final Charset UTF8 = Charset.forName("UTF-8");
public static String getRspData(ResponseBody responseBody) throws Exception {
long contentLength = responseBody.contentLength();
BufferedSource source = responseBody.source();
source.request(Long.MAX_VALUE); // Buffer the entire body.
Buffer buffer = source.buffer();
Charset charset = UTF8;
MediaType contentType = responseBody.contentType();
if (contentType != null) {
try {
charset = contentType.charset(UTF8);
} catch (UnsupportedCharsetException e) {
return null;
}
}
if (contentLength != 0) {
return new JSONObject(buffer.clone().readString(charset)).toString(); //because response content contain quotation mark
}
return null;
}
public static String getReqData(RequestBody requestBody) throws IOException {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
return buffer.readString(UTF8);
}
public static Response changeRspData(Response response, String rspData) {
MediaType contentType = response.body().contentType();
ResponseBody body = ResponseBody.create(contentType, rspData);
return response.newBuilder().body(body).build();
}
}
app/src/main/java/com/ypsx/yppos/utils/RecyclerViewUtil.kt 0 → 100644
View file @ d4492da6
package com.ypsx.yppos.utils
import androidx.recyclerview.widget.RecyclerView
object RecyclerViewUtil {
//目标项是否在最后一个可见项之后
private var mShouldScroll = false
//记录目标项位置
private var mToPosition = 0
/**
* 滑动到指定位置
*/
fun smoothMoveToPosition(mRecyclerView: RecyclerView, position: Int) {
// 第一个可见位置
val firstItem: Int = mRecyclerView.getChildLayoutPosition(mRecyclerView.getChildAt(0))
// 最后一个可见位置
val lastItem: Int =
mRecyclerView.getChildLayoutPosition(mRecyclerView.getChildAt(mRecyclerView.childCount - 1))
if (position < firstItem) {
// 第一种可能:跳转位置在第一个可见位置之前，使用smoothScrollToPosition
mRecyclerView.smoothScrollToPosition(position)
} else if (position <= lastItem) {
// 第二种可能:跳转位置在第一个可见位置之后，最后一个可见项之前
val movePosition = position - firstItem
if (movePosition >= 0 && movePosition < mRecyclerView.childCount) {
val top: Int = mRecyclerView.getChildAt(movePosition).top
// smoothScrollToPosition 不会有效果，此时调用smoothScrollBy来滑动到指定位置
mRecyclerView.smoothScrollBy(0, top)
}
} else {
// 第三种可能:跳转位置在最后可见项之后，则先调用smoothScrollToPosition将要跳转的位置滚动到可见位置
// 再通过onScrollStateChanged控制再次调用smoothMoveToPosition，执行上一个判断中的方法
mRecyclerView.smoothScrollToPosition(position)
mToPosition = position
mShouldScroll = true
}
}
}
\ No newline at end of file
app/src/main/java/com/ypsx/yppos/viewmodel/request/RequestMainViewModel.kt
View file @ d4492da6
......@@ -11,6 +11,7 @@ import com.ypsx.base.network.AppException
import com.ypsx.yppos.http.apiService
import com.ypsx.yppos.http.data.bean.*
import com.ypsx.yppos.http.data.entity.PosPayMethod
import com.ypsx.yppos.http.data.entity.PosProductStyle
import com.ypsx.yppos.http.data.entity.ProductActivityType
import com.ypsx.yppos.http.data.request.*
import com.ypsx.yppos.http.repository.request.HttpRequestCoroutine
......@@ -117,6 +118,7 @@ class RequestMainViewModel : BaseViewModel() {
launch({ PosProductRepository.getInstance().queryAllIn(list) }, {
var list = mutableListOf<InsertOrderProductDTO>()
var posProduct: PosProduct? = null
var listNum = 0
var amountTotal = 0.0 //总价值
for (product in products) {
......@@ -126,6 +128,12 @@ class RequestMainViewModel : BaseViewModel() {
break
}
}
if (posProduct?.style == PosProductStyle.WEIGHT.name) {
listNum += 1
}else if (posProduct?.style == PosProductStyle.SINGLE.name) {
listNum += product.quantity.toInt()
}
val amount: Double = product.price.times(product.quantity) ?: 0.0
amountTotal = BigDecimalUtils.forPlus(amountTotal.plus(amount))
......@@ -152,7 +160,8 @@ class RequestMainViewModel : BaseViewModel() {
style = posProduct.style,
pluLevel = posProduct.pluLevel,
merchantItemId = posProduct.merchantItemId,
productNumber = posProduct.productNumber
productNumber = posProduct.productNumber,
mnemonicCode = posProduct.mnemonicCode
)
posBuyPart.toJson().dXLog()
list.add(posBuyPart)
......@@ -161,7 +170,8 @@ class RequestMainViewModel : BaseViewModel() {
payAmountBean.postValue(
PayAmountBean(
payApportionAmount = amountTotal,
amount = amountTotal
amount = amountTotal,
listNum = listNum
)
)
})
......@@ -194,16 +204,7 @@ class RequestMainViewModel : BaseViewModel() {
}
}
discountTotal = discountMoney + discountSpecial + discountTime
payAmountBean.postValue(
PayAmountBean(
BigDecimalUtils.forPlus(discountTotal),
BigDecimalUtils.forPlus( payApportionAmount),
BigDecimalUtils.forPlus(discountMoney),
BigDecimalUtils.forPlus(discountTime),
BigDecimalUtils.forPlus(discountSpecial),
BigDecimalUtils.forPlus(amount)
)
)
val productPromotions = productPromotionsResponse.productPromotions
val list = ArrayList<String>(productPromotions.size)
for (item in productPromotions) {
......@@ -213,6 +214,8 @@ class RequestMainViewModel : BaseViewModel() {
var list = mutableListOf<InsertOrderProductDTO>()
XLog.d("数量大小：${list.size}")
var posProduct: PosProduct? = null
var listNum = 0
for (product in productPromotions) {
for (item in it) {
if (product.productId == item.id) {
......@@ -230,7 +233,11 @@ class RequestMainViewModel : BaseViewModel() {
}
}
}
}
if (posProduct?.style == PosProductStyle.WEIGHT.name) {
listNum += 1
}else if (posProduct?.style == PosProductStyle.SINGLE.name) {
listNum += product.quantity.toInt()
}
var activityInfo = product.activityInfo
var activitys:ArrayList<ActivityInfoDTO> = arrayListOf()
......@@ -264,12 +271,25 @@ class RequestMainViewModel : BaseViewModel() {
productNumber = posProduct.productNumber,
payApportionAmount = product.payApportionAmount,
isPromotion = isPromotion,
isVirtual = posProduct.isVirtual
isVirtual = posProduct.isVirtual,
mnemonicCode = posProduct.mnemonicCode
)
posBuyPart.toJson().dXLog()
list.add(posBuyPart)
}
posBuyPartList.postValue(list)
payAmountBean.postValue(
PayAmountBean(
BigDecimalUtils.forPlus(discountTotal),
BigDecimalUtils.forPlus( payApportionAmount),
BigDecimalUtils.forPlus(discountMoney),
BigDecimalUtils.forPlus(discountTime),
BigDecimalUtils.forPlus(discountSpecial),
BigDecimalUtils.forPlus(amount),
listNum
)
)
})
}
......
app/src/main/java/com/ypsx/yppos/viewmodel/state/MainViewModel.kt
View file @ d4492da6
......@@ -5,6 +5,7 @@ import androidx.databinding.ObservableInt
import com.ypsx.base.base.viewmodel.BaseViewModel
import com.ypsx.base.callback.databind.BooleanObservableField
import com.ypsx.base.callback.databind.DoubleObservableField
import com.ypsx.base.callback.databind.IntObservableField
import com.ypsx.base.callback.databind.StringObservableField
import com.ypsx.yppos.http.data.bean.LoginUser
import com.ypsx.yppos.room.entity.PosBuy
......@@ -28,6 +29,8 @@ class MainViewModel : BaseViewModel() {
var payAmount = StringObservableField("0.00")
var discount = StringObservableField("0.00")
// var productsNum = IntObservableField(0)
var discountMoney = StringObservableField("0.00") //满减促销
var discountTime = StringObservableField("0.00")//分时促销
......
app/src/main/java/com/ypsx/yppos/viewmodel/state/SettingsViewModel.kt
View file @ d4492da6
......@@ -20,8 +20,8 @@ class SettingsViewModel : BaseViewModel() {
version.set("版本号：V${AppUtils.getAppVersionName()}")
val loginResponse = CacheUtil.getLoginResponse()
storeName.set(loginResponse!!.loginUser.orgName)
userName.set("用户：${loginResponse.loginUser.realName}")
storeName.set(loadConfig?.storeName)
userName.set("用户：${loginResponse?.loginUser?.realName}")
posCode.set("机号：${loadConfig?.code}")
}
......
app/src/main/res/drawable/bg_pay_amount.xml
View file @ d4492da6
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_checked="true" android:drawable="@mipmap/ic_pay_amount_selected"/>
<item android:state_checked="false" android:drawable="@mipmap/ic_pay_amount_unselected"/>
<item android:state_checked="true" android:drawable="@drawable/ic_pay_amount_selected"/>
<item android:state_checked="false" android:drawable="@drawable/ic_pay_amount_unselected"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/ic_discount_down.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="38dp"
android:height="24dp"
android:viewportWidth="38"
android:viewportHeight="24">
<path
android:pathData="M18.9527,18.28L6.849,6.1763C6.2775,5.6047 5.3492,5.6047 4.7777,6.1763C4.2062,6.7478 4.2062,7.676 4.7777,8.2476L17.8498,21.3196C18.1519,21.6217 18.556,21.7673 18.9527,21.7455C19.3495,21.7637 19.7536,21.6217 20.0557,21.3196L33.1278,8.2512C33.6993,7.6797 33.6993,6.7514 33.1278,6.1799C32.5563,5.6084 31.628,5.6084 31.0565,6.1799L18.9527,18.28Z"
android:strokeWidth="1"
android:fillColor="#FF4400"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_discount_up.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="38dp"
android:height="24dp"
android:viewportWidth="38"
android:viewportHeight="24">
<path
android:pathData="M19.009,9.177L6.9052,21.2807C6.3337,21.8522 5.4055,21.8522 4.834,21.2807C4.2624,20.7092 4.2624,19.7809 4.834,19.2094L17.906,6.1374C18.2081,5.8353 18.6122,5.6897 19.009,5.7115C19.4058,5.6933 19.8098,5.8353 20.112,6.1374L33.184,19.2058C33.7555,19.7773 33.7555,20.7056 33.184,21.2771C32.6125,21.8486 31.6842,21.8486 31.1127,21.2771L19.009,9.177Z"
android:strokeWidth="1"
android:fillColor="#FF4400"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_eye_close.xml 0 → 100644
View file @ d4492da6
<vector android:height="20dp" android:viewportHeight="15"
android:viewportWidth="27" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#333333" android:fillType="evenOdd"
android:pathData="M13.5037,10.2857C8.0373,10.2857 2.9387,7.2147 0.195,2.2716C-0.206,1.551 0.0322,0.6292 0.7196,0.2107C1.41,-0.2078 2.2965,0.0408 2.6944,0.7581C4.9226,4.7698 9.0624,7.2651 13.5008,7.2651C17.9389,7.2651 22.0757,4.7698 24.304,0.755C24.7049,0.0345 25.5884,-0.2141 26.2788,0.2011C26.9693,0.6197 27.2044,1.5416 26.8065,2.2622C24.0687,7.2147 18.9701,10.2857 13.5037,10.2857Z"
android:strokeColor="#00000000" android:strokeWidth="1"/>
<path android:fillColor="#333333" android:fillType="evenOdd"
android:pathData="M2.396,10.6165C2.157,10.5635 1.9238,10.4419 1.7315,10.2486C1.166,9.6843 1.134,8.7398 1.6615,8.135L3.6958,5.8C4.2233,5.1952 5.1063,5.164 5.6719,5.7252C6.2372,6.2895 6.2692,7.234 5.7417,7.8388L3.7075,10.1738C3.3606,10.5697 2.8593,10.7194 2.396,10.6165ZM16.5048,13.7806C16.0413,13.6777 15.6391,13.3255 15.4701,12.8111L14.4822,9.7966C14.2256,9.0141 14.6104,8.1662 15.339,7.8917C16.0705,7.6175 16.8633,8.0291 17.1197,8.8084L18.1077,11.8229C18.3612,12.6053 17.9795,13.4534 17.2509,13.7277C17.0032,13.8211 16.7438,13.8336 16.5048,13.7806ZM23.1875,10.6569C22.7184,10.7131 22.2316,10.5135 21.9227,10.0802L20.107,7.5458C19.6378,6.888 19.7544,5.9528 20.3664,5.4509C20.9814,4.9489 21.8557,5.0737 22.3249,5.7283L24.1406,8.2629C24.6099,8.9206 24.4932,9.8558 23.8813,10.3577C23.6714,10.5261 23.4294,10.6257 23.1875,10.6569ZM9.1137,14.1111C8.3589,13.9427 7.875,13.1478 8.0324,12.3403L8.6912,8.9798C8.8486,8.1724 9.5917,7.6549 10.3465,7.8232C11.1014,7.9916 11.5851,8.7865 11.4279,9.594L10.7691,12.9545C10.6117,13.7619 9.8686,14.2794 9.1137,14.1111Z"
android:strokeColor="#00000000" android:strokeWidth="1"/>
</vector>
app/src/main/res/drawable/ic_eye_open.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="30dp"
android:height="20dp"
android:viewportWidth="30"
android:viewportHeight="20">
<path
android:pathData="M15,0C20.525,0 25.525,3.3328 30,10C25.525,16.6672 20.525,20 15,20C9.475,20 4.475,16.6672 0,10C4.475,3.3328 9.475,0 15,0ZM15,2.5C10.7575,2.5 6.7558,4.7375 2.5,10C6.5903,15.0568 10.4098,17.3011 15,17.5C19.2459,17.5 23.2475,15.2625 27.5,10C23.413,4.9431 19.5919,2.7007 15,2.5Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M15,4.4444C17.7614,4.4444 20,6.6831 20,9.4444C20,12.2058 17.7614,14.4444 15,14.4444C12.2386,14.4444 10,12.2058 10,9.4444C10,6.6831 12.2386,4.4444 15,4.4444ZM15,6.9444C13.6192,6.9444 12.5,8.0637 12.5,9.4444C12.5,10.8252 13.6192,11.9444 15,11.9444C16.3808,11.9444 17.5,10.8252 17.5,9.4444C17.5,8.0637 16.3808,6.9444 15,6.9444Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_item_delete.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="35dp"
android:height="36dp"
android:viewportWidth="35"
android:viewportHeight="36">
<path
android:pathData="M14.3447,29.8372L14.3447,13.7769C14.342,13.0528 13.7272,12.4664 12.9669,12.4609C12.2169,12.4691 11.6124,13.0487 11.6124,13.7625L11.6124,29.8523C11.6124,30.5661 12.2169,31.147 12.9655,31.1545C13.7272,31.149 14.3413,30.5626 14.3447,29.8393L14.3447,29.8372ZM22.5415,29.8372L22.5415,13.7769C22.5388,13.0528 21.9241,12.4664 21.1638,12.4609C20.4138,12.4691 19.8093,13.0487 19.8093,13.7625L19.8093,29.8523C19.8093,30.5661 20.4138,31.147 21.1624,31.1545C21.9241,31.149 22.5381,30.5626 22.5415,29.8393L22.5415,29.8372ZM11.684,2.7693L22.4699,2.7693C23.2642,2.7693 23.9077,2.1495 23.9077,1.3846C23.9077,0.6197 23.2642,0 22.4699,0L11.684,0C10.8896,0 10.2462,0.6197 10.2462,1.3846C10.2462,2.1495 10.8896,2.7693 11.684,2.7693ZM27.3744,10.773L27.3498,10.78L27.3498,32.2173C27.3498,32.8071 26.8675,33.2869 26.2719,33.2903L7.8821,33.2903C7.2768,33.2883 6.7864,32.8043 6.7809,32.2054L6.7809,10.7807L6.757,10.7807C6.633,10.144 6.0795,9.6871 5.4394,9.6923C4.7849,9.6923 4.2399,10.1576 4.123,10.7723L4.0985,10.7807L4.0985,34.3933C4.0985,35.2746 4.8151,35.989 5.7016,36L28.4277,36C29.3279,35.9904 30.054,35.2662 30.0554,34.3745L30.0554,10.7793L30.0315,10.7793C29.8855,10.1483 29.3288,9.7032 28.6892,9.7061L28.6892,9.6944C28.0546,9.6943 27.5061,10.1438 27.3737,10.773L27.3744,10.773ZM32.7604,4.8462L1.3941,4.8462C0.6243,4.8462 0,5.4657 0,6.2308C0,6.9957 0.6243,7.6154 1.3934,7.6154L32.7604,7.6154C33.5296,7.6154 34.1538,6.9957 34.1538,6.2308C34.1538,5.4657 33.5296,4.8462 32.7604,4.8462Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_main_search.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="33dp"
android:height="33dp"
android:viewportWidth="33"
android:viewportHeight="33">
<path
android:pathData="M13.5,13.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#999999"
android:fillType="evenOdd"/>
<path
android:pathData="M26,25L31,31"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#999999"
android:fillType="evenOdd"
android:strokeLineCap="round"/>
</vector>
app/src/main/res/drawable/ic_main_settings.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="38dp"
android:height="37dp"
android:viewportWidth="38"
android:viewportHeight="37">
<path
android:pathData="M31.8952,4.6604C32.4794,4.9977 32.6441,5.6123 32.3065,6.197L30.169,9.8992C30.723,10.7387 31.277,11.5781 31.6363,12.3053L35.8774,12.1556C36.3794,12.1858 36.9637,12.5231 37.0157,13.3325L36.9734,22.4014C37.0253,23.2107 36.493,23.6828 35.7963,23.5404L31.5553,23.6899L30.2053,26.0282L32.1963,29.7758C32.4734,30.1957 32.3305,30.8926 31.7984,31.3647L23.9657,35.9358C23.5458,36.2131 22.849,36.0707 22.3773,35.5384L20.3863,31.7909C19.5769,31.8431 18.4605,31.978 17.569,31.7231L15.4314,35.4254C15.094,36.0099 14.4794,36.1746 13.8952,35.8373L6.1048,31.3396C5.5206,31.0023 5.3561,30.3878 5.6936,29.8033L7.8311,26.1009C7.2771,25.2613 6.7231,24.4219 6.3637,23.695L2.1226,23.8444C1.6206,23.8144 1.0364,23.4771 0.9844,22.6675L1.0268,13.5987C0.9747,12.7892 1.5069,12.3172 2.2037,12.4596L6.4449,12.3102L7.7949,9.9718L5.8037,6.2242C5.332,5.692 5.4747,4.995 6.2017,4.6354L14.0343,0.0643C14.4542,-0.2131 15.1509,-0.0705 15.5101,0.6565L17.5013,4.4041C18.3106,4.3518 19.4271,4.217 20.3187,4.4719L22.5686,0.5749C22.9062,-0.0099 23.5206,-0.1746 24.1048,0.1627L31.8952,4.6604ZM22.3094,11.7228C18.9632,9.7909 14.9273,10.8723 12.9954,14.2185C11.0636,17.5644 12.1451,21.6003 15.4912,23.5322C18.8372,25.464 22.8731,24.3826 24.8049,21.0366C26.7367,17.6905 25.6554,13.6546 22.3094,11.7228Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_order_add.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:pathData="M15.625,-0C16.5958,-0 17.3828,0.7407 17.3828,1.6544L17.382,13.867L29.5956,13.8672C30.4612,13.8672 31.1716,14.5735 31.2439,15.4733L31.25,15.625C31.25,16.5958 30.5093,17.3828 29.5956,17.3828L17.382,17.382L17.3828,29.5956C17.3828,30.4612 16.6765,31.1716 15.7767,31.2439L15.625,31.25C14.6542,31.25 13.8672,30.5093 13.8672,29.5956L13.867,17.382L1.6544,17.3828C0.7888,17.3828 0.0784,16.6765 0.0061,15.7767L0,15.625C0,14.6542 0.7407,13.8672 1.6544,13.8672L13.867,13.867L13.8672,1.6544C13.8672,0.7888 14.5735,0.0784 15.4733,0.0061L15.625,-0Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M31.25,15.625C31.25,16.4893 30.5518,17.1875 29.6875,17.1875L17.1875,17.1875L17.1875,29.6875C17.1875,30.5518 16.4893,31.25 15.625,31.25L15.625,31.25C14.7607,31.25 14.0625,30.5518 14.0625,29.6875L14.0625,17.1875L1.5625,17.1875C0.6982,17.1875 -0,16.4893 -0,15.625L-0,15.625C-0,14.7607 0.6982,14.0625 1.5625,14.0625L14.0625,14.0625L14.0625,1.5625C14.0625,0.6982 14.7607,0 15.625,0L15.625,0C16.4893,0 17.1875,0.6982 17.1875,1.5625L17.1875,14.0625L29.6875,14.0625C30.5518,14.0625 31.25,14.7607 31.25,15.625L31.25,15.625Z"
android:strokeWidth="1"
android:fillColor="#727272"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_order_reduce.xml 0 → 100644
View file @ d4492da6
<vector android:height="32dp" android:viewportHeight="31"
android:viewportWidth="31" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#727272" android:fillType="nonZero"
android:pathData="M31.25,15.8519C31.25,16.8762 30.5518,17.7037 29.6875,17.7037L1.5625,17.7037C0.6982,17.7037 0,16.8762 0,15.8519L0,15.8519C0,14.8275 0.6982,14 1.5625,14L29.6875,14C30.5518,14 31.25,14.8275 31.25,15.8519L31.25,15.8519Z"
android:strokeColor="#00000000" android:strokeWidth="1"/>
</vector>
app/src/main/res/drawable/ic_pay_amount_selected.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="44"
android:viewportHeight="44">
<path
android:pathData="M22,44L22,44C9.8497,44 0,34.1503 0,22C0,9.8497 9.8497,0 22,0C34.1503,0 44.0001,9.8497 44.0001,22L44.0001,21.9993C43.9868,34.144 34.1453,43.986 22.0007,44L22,44ZM8.8701,19.4288L8.8701,19.4288C8.1286,20.2056 8.1286,21.4281 8.8701,22.2049L16.9235,30.525L16.9235,30.525C17.9302,31.584 19.6047,31.6264 20.6636,30.6198C20.696,30.589 20.7276,30.5574 20.7584,30.525L35.1313,15.6654L35.1313,15.6654C35.87,14.8896 35.87,13.6706 35.1313,12.8948L35.1313,12.8948C34.4263,12.1536 33.254,12.1243 32.5128,12.8292C32.4904,12.8505 32.4686,12.8724 32.4473,12.8948L18.8375,26.9638L11.55,19.4301L11.55,19.4301C10.8444,18.6916 9.6738,18.6649 8.9353,19.3705C8.915,19.3899 8.8951,19.4098 8.8756,19.4301L8.8701,19.4288Z"
android:strokeWidth="1"
android:fillColor="#A14EFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_pay_amount_unselected.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="44"
android:viewportHeight="44">
<path
android:pathData="M22,44L22,44C9.8497,44 0,34.1503 0,22C0,9.8497 9.8497,0 22,0C34.1503,0 44.0001,9.8497 44.0001,22L44.0001,21.9993C43.9868,34.144 34.1453,43.986 22.0007,44L22,44ZM8.8701,19.4288L8.8701,19.4288C8.1286,20.2056 8.1286,21.4281 8.8701,22.2049L16.9235,30.525L16.9235,30.525C17.9302,31.584 19.6047,31.6264 20.6636,30.6198C20.696,30.589 20.7276,30.5574 20.7584,30.525L35.1313,15.6654L35.1313,15.6654C35.87,14.8896 35.87,13.6706 35.1313,12.8948L35.1313,12.8948C34.4263,12.1536 33.254,12.1243 32.5128,12.8292C32.4904,12.8505 32.4686,12.8724 32.4473,12.8948L18.8375,26.9638L11.55,19.4301L11.55,19.4301C10.8444,18.6916 9.6738,18.6649 8.9353,19.3705C8.915,19.3899 8.8951,19.4098 8.8756,19.4301L8.8701,19.4288Z"
android:strokeWidth="1"
android:fillColor="#CECECE"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_pay_failed.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="120dp"
android:height="120dp"
android:viewportWidth="120"
android:viewportHeight="120">
<path
android:pathData="M60,120C93.137,120 120,93.137 120,60C120,26.863 93.137,0 60,0C26.863,0 0,26.863 0,60C0,93.137 26.863,120 60,120Z"
android:strokeWidth="1"
android:fillColor="#FF3B44"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M79.413,43.348C80.179,42.583 80.179,41.34 79.413,40.575C78.647,39.808 77.406,39.808 76.64,40.575L59.994,57.22L43.348,40.575C42.583,39.808 41.34,39.808 40.575,40.575C39.808,41.34 39.808,42.583 40.575,43.348L57.221,59.994L40.575,76.64C39.808,77.406 39.808,78.647 40.575,79.413C41.34,80.179 42.583,80.179 43.348,79.413L59.994,62.769L76.64,79.413C77.406,80.179 78.647,80.179 79.413,79.413C80.179,78.647 80.179,77.406 79.413,76.64L62.769,59.994L79.413,43.348Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_pay_success.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="120dp"
android:height="120dp"
android:viewportWidth="120"
android:viewportHeight="120">
<path
android:pathData="M60,60m-60,0a60,60 0,1 1,120 0a60,60 0,1 1,-120 0"
android:strokeWidth="1"
android:fillColor="#6DD400"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M85.016,41.758L53.111,73.18L34.346,55.253C33.352,54.242 31.74,54.242 30.746,55.253C29.751,56.26 29.751,57.897 30.746,58.907L51.348,78.704C52.343,79.715 53.955,79.715 54.95,78.704C55.063,78.589 55.159,78.464 55.246,78.335L88.617,45.414C89.611,44.404 89.611,42.767 88.617,41.758C87.622,40.747 86.011,40.747 85.016,41.758Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_popup_close.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<group>
<clip-path
android:pathData="M0,0l32,0l0,32l-32,0z"/>
<path
android:pathData="M31.353,28.2818L19.0835,16.0001L31.353,3.7182C32.2157,2.8546 32.2157,1.4793 31.353,0.6477C30.4903,-0.2159 29.1483,-0.2159 28.2856,0.6477L16.0161,12.9296L3.7144,0.6477C2.8517,-0.2159 1.5097,-0.2159 0.647,0.6477C-0.2157,1.5112 -0.2157,2.8546 0.647,3.7182L12.9167,16.0001L0.647,28.2818C-0.2157,29.1454 -0.2157,30.4888 0.647,31.3523C1.4778,32.2159 2.8517,32.2159 3.7144,31.3523L15.9841,19.0706L28.2536,31.3523C29.1163,32.1839 30.4903,32.1839 31.321,31.3523C32.1837,30.5207 32.1837,29.1454 31.353,28.2818Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</group>
</vector>
app/src/main/res/drawable/ic_print_receipt.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="27dp"
android:height="32dp"
android:viewportWidth="27"
android:viewportHeight="32">
<path
android:pathData="M13.7555,32L9.1333,29.3334L4.8667,31.7334L4.5109,31.7334C3.9777,31.7334 3.4444,31.6445 2.9111,31.3778C2.0221,31.0222 1.2221,30.2222 0.8666,29.3334C0.6888,28.8001 0.511,28.2666 0.511,27.7334L0.511,3.9999C0.511,3.4666 0.6,2.9334 0.8666,2.4C1.311,1.4223 2.0221,0.7111 2.9999,0.2667C3.4444,0.0889 3.9777,0 4.5109,0L22.9111,0C23.4444,0 23.9777,0.0889 24.511,0.3555C25.4888,0.8 26.2,1.5111 26.6443,2.4889C26.8221,3.0222 27,3.5556 27,4.0889L27,27.8223C27,28.3556 26.9111,28.8889 26.6443,29.4222C26.2,30.4 25.4888,31.1112 24.511,31.5555C23.9777,31.7334 23.4444,31.9112 22.9111,31.9112L22.5554,31.9112L18.3777,29.3334L13.7555,32ZM18.2887,26.2223L23.1777,29.0666C23.2666,29.0666 23.3554,28.9778 23.4444,28.9778C23.6222,28.8889 23.7111,28.8001 23.8889,28.7111C23.9777,28.6223 24.0666,28.4446 24.1555,28.2666C24.2444,28.0889 24.2444,27.9111 24.2444,27.7334L24.2444,3.9999C24.2444,3.8222 24.2444,3.6444 24.1555,3.4666C24.0666,3.2889 23.9777,3.2001 23.8889,3.0222C23.7999,2.9334 23.6222,2.8444 23.4444,2.7556C23.2666,2.7556 23.0889,2.6666 22.9111,2.6666L4.5109,2.6666C4.3332,2.6666 4.1554,2.7556 3.9777,2.7556C3.7999,2.8444 3.7111,2.9334 3.5332,3.1111C3.4444,3.2001 3.3554,3.3779 3.2666,3.5556C3.1777,3.6444 3.1777,3.8222 3.1777,3.9999L3.1777,27.7334C3.1777,27.9111 3.1777,28.0889 3.2666,28.2666C3.3554,28.4446 3.4444,28.5334 3.5332,28.7111C3.6222,28.8001 3.7999,28.8889 3.9777,28.9778C4.0666,28.9778 4.1554,29.0666 4.2444,29.0666L9.1333,26.2223L13.7555,28.8889L18.2887,26.2223Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M12.4222,9.6889L7.1777,9.6889C6.7333,9.6889 6.2,9.4222 6.0222,9.0666C5.7555,8.6223 5.7555,8.0888 6.0222,7.7333C6.2,7.2888 6.6443,7.0223 7.0888,7.1111L12.3332,7.1111C12.7777,7.1111 13.311,7.3778 13.4888,7.7333C13.7555,8.1778 13.7555,8.7111 13.4888,9.0666C13.311,9.5111 12.8665,9.7778 12.4222,9.6889ZM19,15.2001L7.0888,15.2001C6.6443,15.2001 6.111,14.9333 5.9333,14.5778C5.6665,14.1333 5.6665,13.6 5.9333,13.2445C6.2,12.8 6.6443,12.6222 7.0888,12.6222L19,12.6222C19.4443,12.6222 19.9778,12.889 20.1555,13.2445C20.4221,13.689 20.4221,14.2223 20.1555,14.5778C19.9778,15.0223 19.5333,15.2889 19,15.2001Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_tips_close.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="23dp"
android:height="22dp"
android:viewportWidth="23"
android:viewportHeight="22">
<path
android:pathData="M20.0926,-0L21.9767,1.884L13.008,10.852L22.2488,20.0926L20.3648,21.9767L11.124,12.736L1.884,21.9767L0,20.0926L9.24,10.852L0.2722,1.884L2.1562,-0L11.124,8.968L20.0926,-0Z"
android:strokeWidth="1"
android:fillColor="#F86E21"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_tips_failed.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M18,0C27.9411,0 36,8.0589 36,18C36,27.9411 27.9411,36 18,36C8.0589,36 0,27.9411 0,18C0,8.0589 8.0589,0 18,0ZM18,1C8.6112,1 1,8.6112 1,18C1,27.3888 8.6112,35 18,35C27.3888,35 35,27.3888 35,18C35,8.6112 27.3888,1 18,1Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M11.4697,11.4697C11.7359,11.2034 12.1526,11.1792 12.4462,11.3971L12.5303,11.4697L25.5303,24.4697C25.8232,24.7626 25.8232,25.2374 25.5303,25.5303C25.2641,25.7966 24.8474,25.8208 24.5538,25.6029L24.4697,25.5303L11.4697,12.5303C11.1768,12.2374 11.1768,11.7626 11.4697,11.4697Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M24.4697,11.4697C24.7626,11.1768 25.2374,11.1768 25.5303,11.4697C25.7966,11.7359 25.8208,12.1526 25.6029,12.4462L25.5303,12.5303L12.5303,25.5303C12.2374,25.8232 11.7626,25.8232 11.4697,25.5303C11.2034,25.2641 11.1792,24.8474 11.3971,24.5538L11.4697,24.4697L24.4697,11.4697Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_tips_sigh.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M18,0C27.9411,0 36,8.0589 36,18C36,27.9411 27.9411,36 18,36C8.0589,36 0,27.9411 0,18C0,8.0589 8.0589,0 18,0ZM18,1C8.6112,1 1,8.6112 1,18C1,27.3888 8.6112,35 18,35C27.3888,35 35,27.3888 35,18C35,8.6112 27.3888,1 18,1Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M18.5,8.75C18.8797,8.75 19.1935,9.0322 19.2432,9.3982L19.25,9.5L19.25,21.5C19.25,21.9142 18.9142,22.25 18.5,22.25C18.1203,22.25 17.8065,21.9678 17.7568,21.6018L17.75,21.5L17.75,9.5C17.75,9.0858 18.0858,8.75 18.5,8.75Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M18.5,23.75C18.8797,23.75 19.1935,24.0322 19.2432,24.3982L19.25,24.5L19.25,26.5C19.25,26.9142 18.9142,27.25 18.5,27.25C18.1203,27.25 17.8065,26.9678 17.7568,26.6018L17.75,26.5L17.75,24.5C17.75,24.0858 18.0858,23.75 18.5,23.75Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_tips_success.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:height="36dp"
android:viewportWidth="36"
android:viewportHeight="36">
<path
android:pathData="M18,0C27.9411,0 36,8.0589 36,18C36,27.9411 27.9411,36 18,36C8.0589,36 0,27.9411 0,18C0,8.0589 8.0589,0 18,0ZM18,1C8.6112,1 1,8.6112 1,18C1,27.3888 8.6112,35 18,35C27.3888,35 35,27.3888 35,18C35,8.6112 27.3888,1 18,1Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
<path
android:pathData="M26.4697,12.4697C26.7626,12.1768 27.2374,12.1768 27.5303,12.4697C27.7966,12.7359 27.8208,13.1526 27.6029,13.4462L27.5303,13.5303L16,25.0607L9.4697,18.5303C9.1768,18.2374 9.1768,17.7626 9.4697,17.4697C9.7359,17.2034 10.1526,17.1792 10.4462,17.3971L10.5303,17.4697L16,22.939L26.4697,12.4697Z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_tips_trumpet.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="33dp"
android:viewportWidth="32"
android:viewportHeight="33">
<path
android:pathData="M2.0927,22.5368L2.0927,10.4685C2.0927,10.2058 2.3013,10.279 2.5612,10.2795L6.6527,10.2795C6.7527,10.2795 6.8988,10.288 6.9934,10.2765C7.1018,10.2634 7.1678,10.217 7.2549,10.1938C7.3896,10.1581 7.377,10.1766 7.4902,10.1159C7.7194,9.9935 7.9103,9.8748 8.1115,9.703C8.2374,9.5956 8.3468,9.4864 8.4739,9.3755L9.6695,8.3128C9.6742,8.3084 9.6807,8.3019 9.6854,8.2974L9.9249,8.0979C9.9989,8.0232 10.0233,8.0032 10.1046,7.9327C10.1116,7.9266 10.1309,7.9089 10.1376,7.9027L10.1854,7.8565C10.2198,7.8249 10.2467,7.806 10.289,7.7719L11.5489,6.6483C11.625,6.5801 11.6582,6.5682 11.7363,6.4908L12.4545,5.8603C12.5202,5.7948 12.5655,5.762 12.6363,5.6973L14.4446,4.0869C14.4841,4.0503 14.4929,4.0425 14.5259,4.0114L16.1164,2.6541L16.1164,30.0676C16.0126,30.0396 15.9176,29.9469 15.8356,29.8783L15.7539,29.8031C15.7494,29.7987 15.7427,29.792 15.738,29.7877C15.7099,29.7613 15.687,29.7418 15.6552,29.7137L15.1455,29.2827C15.1407,29.2782 15.1344,29.2714 15.1297,29.2672L14.9107,29.0783C14.9059,29.0739 14.8995,29.0673 14.8947,29.0629L14.2815,28.5473C14.1563,28.4295 14.0441,28.3384 13.9073,28.2315L13.6051,27.9694C13.5708,27.9373 13.5919,27.9548 13.5569,27.9233L12.9276,27.3923C12.886,27.3562 12.8712,27.3408 12.8291,27.3026L8.6594,23.7264C8.5869,23.6654 8.5405,23.6339 8.469,23.5717L8.1031,23.2479C7.8495,23.0442 7.5797,22.8299 7.2538,22.7495C7.1881,22.7334 7.058,22.7165 6.9899,22.7007C6.4085,22.5664 5.2997,22.6313 4.6849,22.6313L2.3406,22.6332C2.208,22.6354 2.0927,22.6644 2.0927,22.5368L2.0927,22.5368ZM0,10.0589L0,22.9464C0,23.1523 0.0816,23.3898 0.1684,23.5642L0.659,24.2352C0.8408,24.4053 1.0677,24.5685 1.3035,24.6563C1.3869,24.6875 1.3983,24.6703 1.4839,24.6949C1.6507,24.7431 1.5673,24.7747 1.8098,24.7757L6.278,24.774C6.8046,24.7723 6.7077,24.8564 7.0991,25.1745L7.5339,25.555C7.6165,25.628 7.676,25.6681 7.7538,25.7429C7.8426,25.8285 7.8867,25.8483 7.9765,25.9281L8.0732,26.0193C8.1271,26.0659 8.1385,26.0693 8.1912,26.1209L9.1173,26.9197C9.1223,26.9239 9.1293,26.9297 9.1342,26.934L10.0287,27.7018C10.5385,28.1416 11.0341,28.6074 11.5653,29.0189L12.3455,29.6814C12.667,29.9981 13.0481,30.2523 13.3796,30.5601L13.6623,30.8105C13.9775,31.1028 14.3312,31.3534 14.6506,31.6412C14.9885,31.9459 15.336,32.2983 15.7636,32.4719C16.2042,32.6507 16.6135,32.7473 17.0769,32.5805C17.3567,32.4798 17.5412,32.3329 17.749,32.1243C18.0148,31.8572 18.2093,31.4897 18.2093,31.1075L18.2093,1.6144C18.2093,1.2625 18.0593,0.9864 17.9193,0.7723L17.3328,0.2296C17.0262,0.039 16.7333,0.0388 16.3664,0.0388C16.2051,0.0388 16.1573,0.0976 16.0446,0.1237C15.9578,0.1435 15.9719,0.1242 15.8893,0.1561C15.8027,0.1898 15.8433,0.1931 15.749,0.2353C15.6984,0.2578 15.7167,0.2454 15.68,0.26L15.4971,0.359C15.4911,0.3626 15.483,0.367 15.4772,0.3705C15.3897,0.4244 15.3142,0.4866 15.2414,0.5423C15.1541,0.6091 15.1119,0.6679 15.0276,0.7363C14.9697,0.7835 14.9834,0.7643 14.9251,0.822L14.4271,1.2648C14.3974,1.2904 14.3914,1.2957 14.3607,1.3238L11.4599,3.88C11.4551,3.8845 11.4487,3.8912 11.4439,3.8954L11.2146,4.1053C11.1698,4.1452 11.1477,4.1579 11.096,4.2063L10.2133,4.9857C10.1246,5.0542 10.0721,5.1134 9.9836,5.1952L9.6183,5.5197C9.6134,5.5241 9.6067,5.5305 9.602,5.535L7.8114,7.1314C7.6612,7.2716 7.5169,7.3858 7.3636,7.5306L6.8273,7.9979C6.6347,8.1578 6.6174,8.1383 6.3405,8.137C5.7889,8.1344 5.2368,8.1368 4.6851,8.1368C3.6311,8.1368 2.054,7.9735 1.2104,8.3495C1.1339,8.3837 1.153,8.3841 1.0905,8.4176C0.7797,8.5838 0.4857,8.8321 0.3064,9.1391C0.1656,9.3801 0.1651,9.424 0.0671,9.6853L0,10.0589Z"
android:strokeWidth="1"
android:fillColor="#F86E21"
android:fillAlpha="0.98"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.8021,4.7968C19.8021,4.9822 19.8492,5.1089 19.8984,5.2668C19.9312,5.3726 19.8917,5.2837 19.948,5.3742C20.1361,5.6751 20.3295,5.7953 20.6578,5.9185C20.7882,5.9674 20.7766,5.9456 20.9183,5.9709C21.0222,5.9896 21.0711,6.0312 21.1798,6.0537L21.8042,6.2115C21.8985,6.2455 21.834,6.2315 21.9127,6.2596L23.0619,6.7073C23.6491,6.9459 24.1787,7.3101 24.7095,7.6603C24.7152,7.664 24.7229,7.669 24.7287,7.6727L25.1375,7.9848C25.1428,7.9889 25.1498,7.9947 25.1549,7.9988C25.1897,8.0265 25.1666,8.0103 25.206,8.0419C25.2111,8.0459 25.2183,8.0516 25.2234,8.0557C25.2285,8.0598 25.236,8.0652 25.2413,8.0693L25.9428,8.6848C25.9476,8.6893 25.9543,8.6958 25.959,8.7001L26.3565,9.1183C26.4078,9.1832 26.4514,9.2172 26.5095,9.2789L27.1538,10.0784C27.158,10.0834 27.1642,10.0904 27.1684,10.0954L27.8321,11.1272C27.8573,11.1754 27.8622,11.1829 27.8852,11.2311L28.621,12.8835L29.0259,14.3973C29.081,14.5706 29.0443,14.7693 29.0881,14.9647C29.1523,15.2525 29.1722,15.5166 29.1722,15.8567L29.1411,17.4954C29.1298,17.6946 29.0561,17.8346 29.0478,18.0315C29.0358,18.3214 28.9771,18.3204 28.9535,18.5665C28.9306,18.806 28.8326,19.0947 28.7623,19.3189L28.5342,20.034C28.3679,20.5747 28.0801,21.0623 27.832,21.5629L27.4672,22.1717C27.2425,22.5448 26.9339,22.887 26.6735,23.2299L25.573,24.3569C25.5128,24.4136 25.4602,24.4452 25.397,24.4944C24.944,24.8468 24.65,25.1093 24.1309,25.423L23.7309,25.6496C23.6826,25.6748 23.6814,25.6697 23.6273,25.7026L23.4234,25.812C23.375,25.8379 23.3816,25.8412 23.3254,25.8706L21.4976,26.579C21.3782,26.6235 21.345,26.6143 21.212,26.6375C21.0961,26.6575 21.0965,26.6875 20.9759,26.7142C20.5328,26.813 20.0322,26.9129 19.8813,27.5006C19.7774,27.9058 19.7542,27.7753 19.9021,28.2338C19.9386,28.3467 20.0065,28.4307 20.0903,28.5165C20.4592,28.8934 20.6387,28.8702 21.1139,28.8702C21.2305,28.8702 21.2526,28.8169 21.3769,28.7889C21.7313,28.7091 22.1164,28.6552 22.468,28.5032C22.5747,28.4569 22.6207,28.4589 22.7294,28.4204L22.9874,28.3339C23.3502,28.2166 23.7183,28.047 24.0635,27.8756L26.33,26.4755C26.771,26.143 27.1622,25.7666 27.5682,25.3928C27.5951,25.3682 27.5918,25.3725 27.6177,25.3484C27.8616,25.122 28.0648,24.8548 28.2813,24.5999C28.2873,24.593 28.3047,24.5735 28.3109,24.5668C28.3152,24.562 28.3216,24.5552 28.326,24.5505L29.4361,22.9921C29.4923,22.9078 29.5195,22.8723 29.5724,22.783L29.8686,22.2311C30.0751,21.8828 30.2234,21.4807 30.378,21.1066C30.381,21.0997 30.3851,21.0917 30.3883,21.0851L30.4523,20.9609C30.459,20.9441 30.4672,20.9146 30.4764,20.8905C30.5161,20.7877 30.541,20.7445 30.5712,20.6396L30.7421,20.1187C30.78,20.0109 30.7765,19.9624 30.8222,19.8531C30.851,19.7843 30.8329,19.8605 30.8623,19.7359L30.9667,19.3054C31.0439,18.8558 31.1256,18.6438 31.176,18.1304C31.2281,17.5996 31.2961,17.5278 31.2961,16.8334L31.2961,15.8567C31.2961,15.59 31.2076,14.5357 31.1472,14.2739C31.1003,14.071 31.0931,13.8703 31.0281,13.7006L30.894,13.1428C30.8681,13.0133 30.8718,12.9715 30.8266,12.8643C30.7203,12.6128 30.6193,12.131 30.4393,11.711L30.2769,11.339C30.2054,11.1694 30.1579,10.9954 30.0606,10.8327L29.6472,10.0522C29.6152,9.9896 29.6194,9.9864 29.5828,9.9281L29.1748,9.2685C29.153,9.233 29.135,9.2085 29.1118,9.1743C29.0951,9.1497 29.0926,9.1446 29.0738,9.1182L26.7799,6.5799L25.9892,5.9596C25.7026,5.7801 25.4318,5.5573 25.1394,5.3991C24.7424,5.1839 24.3642,4.9554 23.9515,4.7699L23.2069,4.4496C23.0981,4.4124 23.0642,4.3879 22.9567,4.3555C22.8494,4.3229 22.7899,4.2969 22.7024,4.2655C22.6,4.2288 22.5489,4.2201 22.4467,4.1769L21.9032,4.0319C21.7981,4.0158 21.7236,3.9793 21.6384,3.9523L21.0514,3.8199C20.6856,3.8199 20.6624,3.7918 20.366,3.9475C20.2626,4.002 20.1916,4.0716 20.1059,4.1579C19.9693,4.2956 19.8021,4.59 19.8021,4.7968"
android:strokeWidth="1"
android:fillColor="#F86E21"
android:fillAlpha="0.98"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M20.6454,11.8865C20.6454,11.9256 20.6803,12.0019 20.694,12.058C20.7411,12.2519 20.7722,12.3737 20.8853,12.5268L21.3929,12.9284C21.663,13.0936 21.9503,13.2658 22.1793,13.4899L22.7386,14.1546C22.744,14.1621 22.7602,14.1828 22.7654,14.1904L22.8734,14.3652C23.1976,14.9224 23.4252,15.6861 23.4252,16.3294C23.4252,16.728 23.3437,17.1072 23.2448,17.4709L23.0578,17.9753C22.9346,18.2169 22.8127,18.4715 22.6371,18.6853C22.5607,18.7783 22.5101,18.8645 22.4292,18.9481L20.9021,20.1488C20.7785,20.2883 20.6454,20.619 20.6454,20.8037L20.7869,21.2911C20.9132,21.5226 21.0639,21.6524 21.2841,21.7664C21.4052,21.8293 21.3543,21.8332 21.5201,21.8444C21.7164,21.8577 21.9082,21.8823 22.0874,21.8173L22.491,21.5943C22.5512,21.5576 22.6116,21.5135 22.6813,21.4713C22.7579,21.4249 22.8274,21.3829 22.8964,21.3416C23.0938,21.2237 23.5587,20.8382 23.7053,20.6766L24.2193,20.0923C24.7775,19.3042 24.4837,19.7593 24.9579,18.9153L25.4367,17.4133C25.4677,17.2937 25.4776,16.9786 25.4894,16.8361C25.5323,16.3198 25.5439,16.1968 25.4778,15.6767C25.4669,15.5911 25.4634,15.5083 25.4543,15.3851C25.4439,15.2416 25.4034,15.2261 25.376,15.1177C25.3456,14.9975 25.3482,14.8336 25.3042,14.7175C25.2778,14.6482 25.2924,14.7008 25.2659,14.5984L25.1798,14.3701C25.1068,14.1874 25.0929,14.0515 25.0053,13.8845L24.0681,12.4036L23.51,11.8326C23.1732,11.5451 22.2587,10.8465 21.8948,10.8465C21.6053,10.8465 21.4488,10.8279 21.2017,10.9665C21.0851,11.0319 21.0001,11.0912 20.9251,11.1915L20.8266,11.3443C20.8231,11.3503 20.8186,11.3583 20.815,11.3642L20.7467,11.4842C20.7451,11.4879 20.6454,11.8838 20.6454,11.8865"
android:strokeWidth="1"
android:fillColor="#F86E21"
android:fillAlpha="0.98"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/ic_user_logout.xml 0 → 100644
View file @ d4492da6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="33dp"
android:viewportWidth="32"
android:viewportHeight="33">
<path
android:pathData="M16,32.8421C7.1772,32.8421 0,25.7223 0,16.9701C0,12.1203 2.1929,7.5984 6.0165,4.5669C6.7328,4.0057 7.7723,4.1187 8.3416,4.8256C8.9108,5.5324 8.7972,6.5672 8.0808,7.132C5.0469,9.5369 3.3094,13.1223 3.3094,16.9701C3.3094,23.9113 9.0027,29.559 16,29.559C22.9972,29.559 28.6905,23.9113 28.6905,16.9701C28.6905,13.155 26.9752,9.5878 23.9816,7.1831C23.2727,6.6109 23.1588,5.5797 23.7356,4.8729C24.3122,4.166 25.3517,4.0603 26.0643,4.6288C29.8365,7.6603 32,12.1568 32,16.9663C32,25.7223 24.8228,32.8421 16,32.8421Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M16.0001,18.5263C15.0702,18.5263 14.3158,17.7862 14.3158,16.8741L14.3158,1.6522C14.3158,0.74 15.0702,0 16.0001,0C16.9298,0 17.6842,0.74 17.6842,1.6522L17.6842,16.8777C17.6842,17.79 16.9298,18.5263 16.0001,18.5263Z"
android:strokeWidth="1"
android:fillColor="#333333"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
app/src/main/res/drawable/icon_eye_state.xml deleted 100644 → 0
View file @ 375e7c3d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/ic_eye_open" android:state_selected="true" />
<item android:drawable="@mipmap/ic_eye_close" />
</selector>
\ No newline at end of file
app/src/main/res/layout/activity_login.xml
View file @ d4492da6
......@@ -58,6 +58,7 @@
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:onClick="@{()->click.combosClick()}"
app:layout_constraintBottom_toTopOf="@+id/guideline11"
app:layout_constraintEnd_toStartOf="@+id/guideline8"
app:layout_constraintStart_toStartOf="@+id/guideline"
......@@ -189,7 +190,7 @@
android:layout_marginEnd="10dp"
android:background="@android:color/transparent"
android:onClick="@{()->click.eye()}"
android:src="@mipmap/ic_eye_close" />
android:src="@drawable/ic_eye_close" />
</LinearLayout>
......
app/src/main/res/layout/activity_main.xml
View file @ d4492da6
......@@ -41,13 +41,13 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_settings"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:onClick="@{()->click.settings()}"
android:src="@mipmap/ic_main_settings"
app:srcCompat="@drawable/ic_main_settings"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -90,10 +90,11 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@mipmap/ic_temp_search" />
app:srcCompat="@drawable/ic_main_search"
/>
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/et_search_content"
......@@ -103,7 +104,7 @@
android:layout_weight="1"
android:background="@android:color/transparent"
android:digits="1234567890"
android:hint="搜索商品条码/PLU"
android:hint="@string/main_search_hint"
android:imeOptions="actionSearch"
android:inputType="number"
android:lines="1"
......@@ -121,7 +122,7 @@
android:gravity="center"
android:onClick="@{()->click.search()}"
android:padding="10dp"
android:text="搜索"
android:text="@string/btn_search"
android:textColor="#d9000000"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -154,30 +155,30 @@
android:orientation="horizontal"
android:visibility="@{vm.tipsVisible}">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:src="@mipmap/ic_temp_trumpet" />
app:srcCompat="@drawable/ic_tips_trumpet" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="点击按钮 扫描条形码/秤码添加商品"
android:text="@string/main_tips"
android:textColor="#FFF77D3E"
android:textSize="16sp"
/>
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:onClick="@{()->click.tips()}"
android:src="@mipmap/ic_temp_tips_close" />
app:srcCompat="@drawable/ic_tips_close" />
</androidx.appcompat.widget.LinearLayoutCompat>
......@@ -227,7 +228,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="@string/rmb"
android:textColor="#FFFF4400"
android:textSize="18sp"
android:textStyle="bold" />
......@@ -253,14 +254,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="优惠："
android:text="@string/total_discount"
android:textColor="#FF333333"
android:textSize="15sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="@string/rmb"
android:textColor="#FFFF4400"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -273,13 +274,13 @@
android:textSize="16sp"
android:textStyle="bold" />
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/dp_10"
android:src="@mipmap/ic_temp_up" />
android:src="@drawable/ic_discount_up" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
......@@ -291,7 +292,7 @@
android:background="#A14EFF"
android:gravity="center"
android:onClick="@{()->click.payAmount()}"
android:text="结算"
android:text="@string/pay_amount"
android:textColor="@color/white"
android:textSize="20sp"
......
app/src/main/res/layout/activity_register.xml
View file @ d4492da6
......@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="欢迎使用谊品POS终端系统"
android:text="@string/welcome_use_pos_system"
android:textColor="#333333"
android:textSize="17sp"
app:layout_constraintEnd_toStartOf="@+id/guideline3"
......@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="请先注册账号"
android:text="@string/register_account"
android:textColor="#A14EFF"
android:textSize="24sp"
app:layout_constraintEnd_toStartOf="@+id/guideline3"
......
app/src/main/res/layout/item_order_header.xml
View file @ d4492da6
......@@ -5,9 +5,10 @@
android:background="#F8F8F8"
>
<TextView
android:id="@+id/tv_list_num"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="购买商品列表"
android:text=""
android:textSize="16sp"
android:textColor="#888888"
android:layout_marginTop="@dimen/dp_10"
......
app/src/main/res/layout/item_pos_product.xml
View file @ d4492da6
......@@ -26,7 +26,7 @@
android:layout_centerVertical="true"
android:lines="1"
android:textColor="@color/colorAccent"
android:textSize="18sp"
android:textSize="16sp"
tools:text="条码：289771828928229"
/>
......@@ -37,13 +37,13 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
>
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_item_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_item_delete" />
app:srcCompat="@drawable/ic_item_delete" />
</RelativeLayout>
......@@ -76,9 +76,9 @@
android:ellipsize="end"
android:lines="2"
android:maxLines="2"
android:text="商品名称"
tools:text="商品名称"
android:textColor="#474245"
android:textSize="16sp" />
android:textSize="18sp" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -101,7 +101,7 @@
android:id="@+id/tv_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="20.0"
tools:text="20.0"
android:textColor="#FF5949"
android:textSize="24sp" />
</LinearLayout>
......@@ -112,7 +112,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_name"
android:layout_marginTop="5dp"
android:text="价格"
tools:text="价格"
android:textColor="@color/colorAccent"
android:textSize="16sp" />
......@@ -129,13 +129,14 @@
android:background="@drawable/bg_item_count"
android:orientation="horizontal">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_count_reduce"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
android:layout_gravity="center"
android:layout_marginStart="@dimen/dp_10"
android:src="@mipmap/ic_order_reduce" />
app:srcCompat="@drawable/ic_order_reduce" />
<TextView
......@@ -144,20 +145,20 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="1"
tools:text="1"
android:textColor="@color/black_333"
android:textSize="16sp"
/>
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/tv_count_add"
android:layout_width="30dp"
android:layout_height="match_parent"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:scaleType="centerInside"
android:layout_marginEnd="@dimen/dp_10"
android:src="@mipmap/ic_order_add" />
app:srcCompat="@drawable/ic_order_add" />
</LinearLayout>
......
app/src/main/res/layout/popup_offer_details.xml
View file @ d4492da6
......@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="优惠明细"
android:text="@string/offer_details"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
......@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="促销特价优惠："
android:text="@string/promotional_special_offers"
android:textColor="@color/black_333"
android:textSize="16sp" />
......@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="满减优惠："
android:text="@string/full_discount"
android:textColor="@color/black_333"
android:textSize="16sp" />
......@@ -117,7 +117,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="分时折扣优惠："
android:text="@string/time_sharing_discount"
android:textColor="@color/black_333"
android:textSize="16sp" />
......@@ -148,7 +148,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="总优惠金额："
android:text="@string/total_discount_amount"
android:textColor="@color/black_333"
android:textSize="18sp" />
......
app/src/main/res/layout/popup_order_pay_amount.xml
View file @ d4492da6
......@@ -27,7 +27,7 @@
android:gravity="center"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:text="收银台"
android:text="@string/checkout_counter"
android:textColor="@color/black"
android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent"
......@@ -43,7 +43,7 @@
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_popup_close" />
app:srcCompat="@drawable/ic_popup_close" />
<LinearLayout
android:id="@+id/ll_pay_amount"
......@@ -57,7 +57,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="@string/rmb"
android:textColor="#FF4400"
android:textSize="16sp" />
......@@ -94,7 +94,7 @@
android:id="@+id/tv_orderNo_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="小票流水号"
android:text="@string/order_no"
android:textColor="#ff4d4d4d"
android:textSize="16sp"
......@@ -150,7 +150,7 @@
android:drawableEnd="@drawable/bg_pay_amount"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="扫码支付"
android:text="@string/scan_qr_pay"
android:visibility="@{vm.offlineVisible}"
android:textColor="#4D4D4D"
android:textSize="16sp" />
......@@ -168,7 +168,7 @@
android:drawableEnd="@drawable/bg_pay_amount"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="会员余额"
android:text="@string/member_balance_pay"
android:textColor="#4D4D4D"
android:textSize="16sp" />
......@@ -187,7 +187,7 @@
android:background="@drawable/bg_receive_payment"
android:gravity="center"
android:onClick="@{()->click.pay()}"
android:text="立即收款"
android:text="@string/receive_payment_now"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
......
app/src/main/res/layout/popup_pay_amount.xml
View file @ d4492da6
......@@ -19,7 +19,7 @@
android:background="@drawable/bg_dialog"
android:layout_height="wrap_content">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imageView4"
android:layout_width="20dp"
android:layout_height="20dp"
......@@ -28,7 +28,7 @@
android:onClick="@{()->click.close()}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_popup_close" />
app:srcCompat="@drawable/ic_popup_close" />
<TextView
android:id="@+id/tv_title"
......@@ -57,7 +57,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="@string/rmb"
android:textColor="#FF4400"
android:textSize="18sp"
android:textStyle="bold" />
......
app/src/main/res/layout/popup_pay_failed.xml
View file @ d4492da6
......@@ -19,15 +19,15 @@
android:background="@drawable/bg_popup_pay"
>
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imageView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_pay_failed" />
app:srcCompat="@drawable/ic_pay_failed" />
<TextView
android:id="@+id/textView5"
......@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="支付失败"
android:text="@string/pay_failed"
android:textColor="@color/black_333"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
......@@ -80,7 +80,7 @@
android:layout_weight="1"
android:gravity="center"
android:onClick="@{()->click.back()}"
android:text="返回收银"
android:text="@string/return_cashier"
android:textColor="#a6000000"
android:textSize="17sp"
/>
......@@ -99,7 +99,7 @@
android:layout_weight="1"
android:gravity="center"
android:onClick="@{()->click.payAgain()}"
android:text="重新支付"
android:text="@string/pay_again"
android:textColor="#A14EFF"
android:textSize="17sp" />
</LinearLayout>
......
app/src/main/res/layout/popup_pay_success.xml
View file @ d4492da6
......@@ -19,15 +19,15 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_popup_pay">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_pay_success" />
app:srcCompat="@drawable/ic_pay_success" />
<TextView
android:id="@+id/textView3"
......@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:text="收款成功"
android:text="@string/pay_success"
android:textColor="@color/black_333"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
......@@ -57,7 +57,7 @@
android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥"
android:text="@string/rmb"
android:textColor="@color/red" />
<TextView
......@@ -96,7 +96,7 @@
android:id="@+id/textView10"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="关闭"
android:text="@string/close"
android:onClick="@{()->click.close()}"
android:textColor="@color/black_333"
android:gravity="center"
......
app/src/main/res/layout/popup_settings.xml
View file @ d4492da6
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="vm"
type="com.ypsx.yppos.viewmodel.state.SettingsViewModel" />
......@@ -24,9 +26,7 @@
android:layout_height="16dp"
android:layout_alignParentRight="true"
android:layout_marginEnd="10dp"
android:src="@drawable/triangle_up"
/>
android:src="@drawable/triangle_up" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
......@@ -86,16 +86,17 @@
android:orientation="horizontal"
android:padding="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_print_receipt" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_print_receipt" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="重打上次小票"
android:text="@string/print_receipt"
android:textColor="@color/black_333"
android:textSize="18sp" />
......@@ -106,20 +107,21 @@
android:layout_height="wrap_content"
android:background="@drawable/bg_popup_settings_bottom"
android:gravity="center_vertical"
android:orientation="horizontal"
android:onClick="@{()->click.logout()}"
android:orientation="horizontal"
android:padding="15dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_user_logout" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_user_logout" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="退出登录"
android:text="@string/user_logout"
android:textColor="@color/black_333"
android:textSize="18sp" />
......
app/src/main/res/layout/toast_failed.xml
View file @ d4492da6
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@drawable/bg_loading"
android:orientation="vertical"
android:paddingLeft="10dp"
......@@ -11,11 +12,11 @@
android:gravity="center">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:scaleType="centerInside"
android:background="@mipmap/ic_tips_failed" />
app:srcCompat="@drawable/ic_tips_failed" />
<TextView
android:id="@android:id/message"
......
app/src/main/res/layout/toast_sigh.xml
View file @ d4492da6
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_loading"
android:gravity="center"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp"
android:gravity="center"
>
android:paddingBottom="15dp">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:scaleType="centerInside"
android:background="@mipmap/ic_tips_sigh" />
app:srcCompat="@drawable/ic_tips_sigh" />
<TextView
android:id="@android:id/message"
......
app/src/main/res/layout/toast_success.xml
View file @ d4492da6
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_loading"
android:gravity="center"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingTop="15dp"
android:paddingRight="10dp"
android:paddingBottom="15dp"
android:gravity="center"
>
android:paddingBottom="15dp">
<ImageView
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:scaleType="centerInside"
android:background="@mipmap/ic_tips_success" />
app:srcCompat="@drawable/ic_tips_success" />
<TextView
android:id="@android:id/message"
......
app/src/main/res/mipmap-hdpi/ic_eye_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_eye_close.png

531 Bytes

app/src/main/res/mipmap-hdpi/ic_eye_open.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_eye_open.png

793 Bytes

app/src/main/res/mipmap-hdpi/ic_item_delete.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_item_delete.png

609 Bytes

app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_launcher_round.png

5.21 KB

app/src/main/res/mipmap-hdpi/ic_main_settings.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_main_settings.png

1.16 KB

app/src/main/res/mipmap-hdpi/ic_pay_failed.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_pay_failed.png

2.16 KB

app/src/main/res/mipmap-hdpi/ic_pay_success.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-hdpi/ic_pay_success.png

2.91 KB

app/src/main/res/mipmap-mdpi/ic_eye_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_eye_close.png

418 Bytes

app/src/main/res/mipmap-mdpi/ic_eye_open.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_eye_open.png

431 Bytes

app/src/main/res/mipmap-mdpi/ic_item_delete.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_item_delete.png

457 Bytes

app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_launcher_round.png

3.31 KB

app/src/main/res/mipmap-mdpi/ic_main_settings.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_main_settings.png

846 Bytes

app/src/main/res/mipmap-mdpi/ic_pay_amount_selected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_pay_amount_selected.png

677 Bytes

app/src/main/res/mipmap-mdpi/ic_pay_amount_unselected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_pay_amount_unselected.png

714 Bytes

app/src/main/res/mipmap-mdpi/ic_pay_failed.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_pay_failed.png

1.16 KB

app/src/main/res/mipmap-mdpi/ic_pay_success.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_pay_success.png

1.59 KB

app/src/main/res/mipmap-mdpi/ic_popup_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_popup_close.png

335 Bytes

app/src/main/res/mipmap-mdpi/ic_print_receipt.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_print_receipt.png

400 Bytes

app/src/main/res/mipmap-mdpi/ic_user_logout.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-mdpi/ic_user_logout.png

687 Bytes

app/src/main/res/mipmap-xhdpi/ic_eye_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_eye_close.png

719 Bytes

app/src/main/res/mipmap-xhdpi/ic_eye_open.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_eye_open.png

970 Bytes

app/src/main/res/mipmap-xhdpi/ic_item_delete.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_item_delete.png

701 Bytes

app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

7.3 KB

app/src/main/res/mipmap-xhdpi/ic_main_settings.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_main_settings.png

1.31 KB

app/src/main/res/mipmap-xhdpi/ic_pay_amount_selected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_pay_amount_selected.png

1.27 KB

app/src/main/res/mipmap-xhdpi/ic_pay_amount_unselected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_pay_amount_unselected.png

1.3 KB

app/src/main/res/mipmap-xhdpi/ic_pay_failed.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_pay_failed.png

3.04 KB

app/src/main/res/mipmap-xhdpi/ic_pay_success.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_pay_success.png

4.05 KB

app/src/main/res/mipmap-xhdpi/ic_popup_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_popup_close.png

620 Bytes

app/src/main/res/mipmap-xhdpi/ic_print_receipt.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_print_receipt.png

754 Bytes

app/src/main/res/mipmap-xhdpi/ic_user_logout.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xhdpi/ic_user_logout.png

1.17 KB

app/src/main/res/mipmap-xxhdpi/ic_eye_close.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_eye_close.png

1.22 KB

app/src/main/res/mipmap-xxhdpi/ic_eye_open.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_eye_open.png

1.78 KB

app/src/main/res/mipmap-xxhdpi/ic_item_delete.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_item_delete.png

1.14 KB

app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png

11.6 KB

app/src/main/res/mipmap-xxhdpi/ic_main_settings.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_main_settings.png

2.41 KB

app/src/main/res/mipmap-xxhdpi/ic_order_add.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_order_add.png

468 Bytes

app/src/main/res/mipmap-xxhdpi/ic_order_reduce.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_order_reduce.png

284 Bytes

app/src/main/res/mipmap-xxhdpi/ic_pay_amount_selected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_pay_amount_selected.png

2.46 KB

app/src/main/res/mipmap-xxhdpi/ic_pay_amount_unselected.png deleted 100644 → 0
View file @ 375e7c3d
app/src/main/res/mipmap-xxhdpi/ic_pay_amount_unselected.png

2.52 KB

app/src/main/res/mipmap-xxhdpi/ic_pay_failed.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_pay_success.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_popup_close.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_print_receipt.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_temp_down.jpg deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_temp_search.jpg deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_temp_tips_close.jpg deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_temp_trumpet.jpg deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_temp_up.jpg deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_tips_failed.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_tips_sigh.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_tips_success.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxhdpi/ic_user_logout.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_eye_close.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_eye_open.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_item_delete.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_main_settings.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_pay_failed.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_pay_success.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_popup_close.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_print_receipt.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/mipmap-xxxhdpi/ic_user_logout.png deleted 100644 → 0
View file @ 375e7c3d
This diff is collapsed.
app/src/main/res/values/strings.xml
View file @ d4492da6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment