Commit 81a403da authored by 赵鹏翔's avatar 赵鹏翔

代码整理

parent dc943ef4
......@@ -58,10 +58,10 @@
android:name=".ui.ResetAuthorizePasswordActivity"
android:exported="true" />
<activity
android:name=".log.FunctionCenterActivity"
android:name=".ui.FunctionCenterActivity"
android:exported="true" />
<activity
android:name=".log.LFilePickerActivity"
android:name=".ui.LFilePickerActivity"
android:exported="true" />
</application>
......
......@@ -18,9 +18,9 @@ import com.fastcashier.lib_common.function.account.AccountService
import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
import com.fastcashier.lib_common.util.DateUtils
import com.fastcashier.lib_common.util.LogFileUtils
import com.miya.fastcashier.utils.ContextUtils
import com.miya.fastcashier.utils.DensityUtils
import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.util.ContextUtils
import com.miya.fastcashier.util.DensityUtils
import com.miya.fastcashier.util.manage.LocalKeyDataMKManageKit
import com.miya.print.PrinterManager
import com.sdy.miya.moblie.component.pay.core.net.MiYaPayMobileApiClient
import com.sdy.miya.moblie.component.pay.core.net.MiyaHttpLoggingInterceptor
......
package com.miya.fastcashier.log
package com.miya.fastcashier.bean
import java.io.Serializable
......
package com.miya.fastcashier.net.param
package com.miya.fastcashier.bean
/**
* Data validation state of the login form.
......
......@@ -3,7 +3,7 @@ package com.miya.fastcashier.dao
import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.Room
import com.miya.fastcashier.utils.ContextUtils
import com.miya.fastcashier.util.ContextUtils
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.room.migration.Migration
......
......@@ -12,7 +12,7 @@ import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
import com.fastcashier.lib_common.util.StringPriceFormatUtils
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityAliPayCodeBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.viewmodel.PayViewModel
import com.miya.print.utils.BitmapUtils
import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
......
package com.miya.fastcashier.log
package com.miya.fastcashier.ui
import android.content.Intent
import android.os.Bundle
......@@ -6,6 +6,7 @@ import com.fastcashier.lib_common.base.BaseActivity
import com.fastcashier.lib_common.util.LogFileUtils
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityFunctionCenterBinding
import com.miya.fastcashier.util.manage.log.LFilePickerManage
import com.miya.fastcashier.ui.dialog.SystemParameterDialog
/**
......@@ -36,7 +37,7 @@ class FunctionCenterActivity : BaseActivity() {
}
fun toUploadLog() {
LFilePicker()
LFilePickerManage()
.withActivity(this)
.withStartPath(LogFileUtils.CACHE_FILE_PATH) //指定初始显示路径
.withIsGreater(true) //过滤文件大小 小于指定大小的文件
......
package com.miya.fastcashier.log;
package com.miya.fastcashier.ui;
import android.content.Intent;
import android.graphics.Color;
......@@ -22,10 +22,13 @@ import com.fastcashier.lib_common.function.account.SelfCashierTerminalConfig;
import com.fastcashier.lib_common.net.CommonCallback;
import com.fastcashier.lib_common.util.LogFileUtils;
import com.miya.fastcashier.R;
import com.miya.fastcashier.util.manage.log.LFileFilter;
import com.miya.fastcashier.bean.LFileParamEntity;
import com.miya.fastcashier.net.MiyaApiRequest;
import com.miya.fastcashier.net.MiyaApi;
import com.miya.fastcashier.ui.adapter.PathAdapter;
import com.miya.fastcashier.ui.dialog.CustomImageCenterDialog;
import com.miya.fastcashier.utils.FileUtils;
import com.miya.fastcashier.util.FileUtils;
import com.miya.fastcashier.widget.EmptyRecyclerView;
import java.io.File;
......
......@@ -17,7 +17,7 @@ import com.blankj.utilcode.util.ToastUtils
import com.fastcashier.lib_common.function.account.AccountService
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityLoginBinding
import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.util.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.viewmodel.LoginViewModel
import com.permissionx.guolindev.PermissionX
import com.permissionx.guolindev.callback.RequestCallback
......
......@@ -18,9 +18,9 @@ import com.fastcashier.lib_common.util.getVersionName
import com.miya.fastcashier.R
import com.miya.fastcashier.databinding.ActivityMainBinding
import com.miya.fastcashier.ui.dialog.AuthorizePasswordInputDialog
import com.miya.fastcashier.utils.*
import com.miya.fastcashier.utils.manage.AccountPasswordManageKit
import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.util.*
import com.miya.fastcashier.util.manage.AccountPasswordManageKit
import com.miya.fastcashier.util.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.viewmodel.MainViewModel
import com.sdy.miya.moblie.component.pay.core.utils.PayLogFileUtils
import com.fastcashier.lib_common.util.LogFileUtils
......
......@@ -10,8 +10,8 @@ import com.fastcashier.lib_common.config.IntentExtra
import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityPayBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.ScanGunKeyEventHelper
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.ScanGunKeyEventHelper
import com.miya.fastcashier.viewmodel.PayViewModel
import java.util.*
......
......@@ -14,7 +14,7 @@ import com.miya.fastcashier.R
import com.miya.fastcashier.R.mipmap.ic_alipay
import com.miya.fastcashier.R.mipmap.ic_wxpay
import com.miya.fastcashier.databinding.ActivityPayCodeBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.viewmodel.PayViewModel
import com.miya.print.utils.BitmapUtils
import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
......
......@@ -17,8 +17,8 @@ import com.miya.fastcashier.R
import com.miya.fastcashier.databinding.ActivityPriceInputBinding
import com.miya.fastcashier.ui.dialog.PayChooseDialog
import com.miya.fastcashier.ui.dialog.PayChooseDialog.GeneratePayCodeClickListener
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.WordUtil
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.WordUtil
import com.miya.fastcashier.viewmodel.PayViewModel
import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
import java.math.BigDecimal
......
......@@ -9,8 +9,8 @@ import com.fastcashier.lib_common.base.BaseActivity
import com.fastcashier.lib_common.ui.dialog.NumberManualDialog
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityRefundBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.ScanGunKeyEventHelper
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.ScanGunKeyEventHelper
import com.miya.fastcashier.viewmodel.PayViewModel
......
......@@ -7,8 +7,8 @@ import android.text.TextUtils
import com.fastcashier.lib_common.base.BaseActivity
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityResetAuthorizePasswordBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.manage.AccountPasswordManageKit
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.manage.AccountPasswordManageKit
class ResetAuthorizePasswordActivity : BaseActivity() {
......
......@@ -29,8 +29,8 @@ import com.miya.fastcashier.dao.ViewPayOrderData
import com.miya.fastcashier.databinding.ActivitySearchOrderBinding
import com.miya.fastcashier.databinding.FragmentSearchOrderBinding
import com.miya.fastcashier.databinding.ItemSearchOrderListBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.manage.LocalKeyDataMKManageKit
import com.miya.fastcashier.viewmodel.SearchOrderViewModel
/**
......
......@@ -12,7 +12,6 @@ import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.MiyaApplication
import com.miya.fastcashier.R
import com.miya.fastcashier.databinding.ActivitySettingBinding
import com.miya.fastcashier.log.FunctionCenterActivity
import com.miya.fastcashier.ui.dialog.AuthorizePasswordInputDialog
class SettingActivity : BaseActivity() {
......
......@@ -12,7 +12,7 @@ import com.fastcashier.lib_common.function.pay.OrderRecordManageKit
import com.fastcashier.lib_common.util.StringPriceFormatUtils
import com.fastcashier.lib_common.util.clickWithTrigger
import com.miya.fastcashier.databinding.ActivityWxPayCodeBinding
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.viewmodel.PayViewModel
import com.miya.print.utils.BitmapUtils
import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
......
package com.miya.fastcashier.log;
package com.miya.fastcashier.ui.adapter;
import android.annotation.SuppressLint;
import android.content.Context;
......@@ -11,7 +11,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.miya.fastcashier.R;
import com.miya.fastcashier.utils.FileUtils;
import com.miya.fastcashier.util.FileUtils;
import java.io.File;
import java.io.FileFilter;
......
......@@ -14,8 +14,8 @@ import com.fastcashier.lib_common.base.BaseActivity
import com.fastcashier.lib_common.util.dp2px
import com.miya.fastcashier.databinding.DialogAuthorizePasswordInputBinding
import com.miya.fastcashier.ui.RefundActivity
import com.miya.fastcashier.utils.CenterToasty
import com.miya.fastcashier.utils.manage.AccountPasswordManageKit
import com.miya.fastcashier.util.CenterToasty
import com.miya.fastcashier.util.manage.AccountPasswordManageKit
class AuthorizePasswordInputDialog : DialogFragment(), View.OnClickListener {
......
package com.miya.fastcashier.utils;
package com.miya.fastcashier.util;
import android.content.Context;
import android.view.Gravity;
......
package com.miya.fastcashier.utils;
package com.miya.fastcashier.util;
import android.content.Context;
......
package com.miya.fastcashier.utils
package com.miya.fastcashier.util
import android.app.Activity
import com.bigkoo.pickerview.builder.TimePickerBuilder
......
package com.miya.fastcashier.utils
package com.miya.fastcashier.util
import android.app.Application
import android.content.ComponentCallbacks
......
package com.miya.fastcashier.utils;
package com.miya.fastcashier.util;
import com.miya.fastcashier.log.FileComparator;
import com.miya.fastcashier.util.manage.log.FileComparator;
import java.io.File;
import java.io.FileFilter;
......
package com.miya.fastcashier.utils;
package com.miya.fastcashier.util;
import android.os.Handler;
import android.text.TextUtils;
......
package com.miya.fastcashier.utils
package com.miya.fastcashier.util
import android.content.Context
import android.text.SpannableString
import com.miya.fastcashier.utils.WordUtil
import android.text.TextUtils
import android.text.style.ForegroundColorSpan
import androidx.core.content.ContextCompat
......
package com.miya.fastcashier.utils.manage
package com.miya.fastcashier.util.manage
import android.Manifest
import android.os.Environment
......
package com.miya.fastcashier.utils.manage
package com.miya.fastcashier.util.manage
import com.fastcashier.lib_common.function.account.AccountService
import com.tencent.mmkv.MMKV
import java.util.*
/**
* 类描述:本地关键数据MMKV统一管理
......
package com.miya.fastcashier.log
package com.miya.fastcashier.util.manage.log
import java.io.File
import java.util.Comparator
......
package com.miya.fastcashier.log
package com.miya.fastcashier.util.manage.log
import java.io.File
import java.io.FileFilter
......
package com.miya.fastcashier.log
package com.miya.fastcashier.util.manage.log
import android.app.Activity
import android.app.Fragment
......@@ -6,12 +6,13 @@ import android.content.Intent
import android.os.Bundle
import androidx.annotation.StyleRes
import com.miya.fastcashier.R
import com.miya.fastcashier.bean.LFileParamEntity
import com.miya.fastcashier.ui.LFilePickerActivity
/**
* 作者:Leon
* 时间:2017/3/20 16:57
* 功能中心日志界面跳转配置管理类
*/
class LFilePicker {
class LFilePickerManage {
private var mActivity: Activity? = null
private var mFragment: Fragment? = null
......@@ -40,7 +41,7 @@ class LFilePicker {
* @param activity
* @return
*/
fun withActivity(activity: Activity?): LFilePicker {
fun withActivity(activity: Activity?): LFilePickerManage {
mActivity = activity
return this
}
......@@ -51,7 +52,7 @@ class LFilePicker {
* @param fragment
* @return
*/
fun withFragment(fragment: Fragment?): LFilePicker {
fun withFragment(fragment: Fragment?): LFilePickerManage {
mFragment = fragment
return this
}
......@@ -62,7 +63,7 @@ class LFilePicker {
* @param title
* @return
*/
fun withTitle(title: String?): LFilePicker {
fun withTitle(title: String?): LFilePickerManage {
mTitle = title
return this
}
......@@ -74,7 +75,7 @@ class LFilePicker {
* @return
*/
@Deprecated("")
fun withTitleColor(color: String?): LFilePicker {
fun withTitleColor(color: String?): LFilePickerManage {
mTitleColor = color
return this
}
......@@ -85,7 +86,7 @@ class LFilePicker {
* @param theme
* @return
*/
fun withTheme(@StyleRes theme: Int): LFilePicker {
fun withTheme(@StyleRes theme: Int): LFilePickerManage {
this.theme = theme
return this
}
......@@ -96,7 +97,7 @@ class LFilePicker {
* @param style
* @return
*/
fun withTitleStyle(@StyleRes style: Int): LFilePicker {
fun withTitleStyle(@StyleRes style: Int): LFilePickerManage {
mTitleStyle = style
return this
}
......@@ -107,7 +108,7 @@ class LFilePicker {
* @param color
* @return
*/
fun withBackgroundColor(color: String?): LFilePicker {
fun withBackgroundColor(color: String?): LFilePickerManage {
mBackgroundColor = color
return this
}
......@@ -118,7 +119,7 @@ class LFilePicker {
* @param requestCode
* @return
*/
fun withRequestCode(requestCode: Int): LFilePicker {
fun withRequestCode(requestCode: Int): LFilePickerManage {
mRequestCode = requestCode
return this
}
......@@ -129,7 +130,7 @@ class LFilePicker {
* @param backStyle
* @return
*/
fun withBackIcon(backStyle: Int): LFilePicker {
fun withBackIcon(backStyle: Int): LFilePickerManage {
mBackStyle = 0 //默认样式
mBackStyle = backStyle
return this
......@@ -141,7 +142,7 @@ class LFilePicker {
* @param isMutily
* @return
*/
fun withMutilyMode(isMutily: Boolean): LFilePicker {
fun withMutilyMode(isMutily: Boolean): LFilePickerManage {
mMutilyMode = isMutily
return this
}
......@@ -152,7 +153,7 @@ class LFilePicker {
* @param text
* @return
*/
fun withAddText(text: String?): LFilePicker {
fun withAddText(text: String?): LFilePickerManage {
mAddText = text
return this
}
......@@ -163,12 +164,12 @@ class LFilePicker {
* @param style
* @return
*/
fun withIconStyle(style: Int): LFilePicker {
fun withIconStyle(style: Int): LFilePickerManage {
mIconStyle = style
return this
}
fun withFileFilter(arrs: Array<String>): LFilePicker {
fun withFileFilter(arrs: Array<String>): LFilePickerManage {
mFileTypes = arrs
return this
}
......@@ -179,7 +180,7 @@ class LFilePicker {
* @param notFoundFiles
* @return
*/
fun withNotFoundBooks(notFoundFiles: String?): LFilePicker {
fun withNotFoundBooks(notFoundFiles: String?): LFilePickerManage {
mNotFoundFiles = notFoundFiles
return this
}
......@@ -190,7 +191,7 @@ class LFilePicker {
* @param num
* @return
*/
fun withMaxNum(num: Int): LFilePicker {
fun withMaxNum(num: Int): LFilePickerManage {
mMaxNum = num
return this
}
......@@ -201,7 +202,7 @@ class LFilePicker {
* @param fileName
* @return
*/
fun withFileName(fileName: String?): LFilePicker {
fun withFileName(fileName: String?): LFilePickerManage {
mFileName = fileName
return this
}
......@@ -212,7 +213,7 @@ class LFilePicker {
* @param path
* @return
*/
fun withStartPath(path: String?): LFilePicker {
fun withStartPath(path: String?): LFilePickerManage {
mStartPath = path
return this
}
......@@ -223,7 +224,7 @@ class LFilePicker {
* @param chooseMode
* @return
*/
fun withChooseMode(chooseMode: Boolean): LFilePicker {
fun withChooseMode(chooseMode: Boolean): LFilePickerManage {
mChooseMode = chooseMode
return this
}
......@@ -234,7 +235,7 @@ class LFilePicker {
* @param isGreater true:大于 ;false:小于,同时包含指定大小在内
* @return
*/
fun withIsGreater(isGreater: Boolean): LFilePicker {
fun withIsGreater(isGreater: Boolean): LFilePickerManage {
mIsGreater = isGreater
return this
}
......@@ -245,7 +246,7 @@ class LFilePicker {
* @param fileSize
* @return
*/
fun withFileSize(fileSize: Long): LFilePicker {
fun withFileSize(fileSize: Long): LFilePickerManage {
mFileSize = fileSize
return this
}
......
......@@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
import com.fastcashier.lib_common.function.account.SelfCashierAccountInfo
import com.fastcashier.lib_common.net.CommonCallback
import com.miya.fastcashier.R
import com.miya.fastcashier.net.param.LoginFormState
import com.miya.fastcashier.bean.LoginFormState
import com.miya.fastcashier.net.param.LoginParams
import com.miya.fastcashier.net.MiyaApiRequest
import kotlinx.coroutines.Dispatchers
......
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