账户信息管理功能迁移至libcommon下

app/src/main/java/com/miya/fastcashier/MiyaApplication.kt

@@ -13,7 +13,7 @@ import com.elvishew.xlog.printer.file.FilePrinter
 import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
 import com.fastcashier.lib_common.BaseApplication
-import com.miya.fastcashier.service.AccountService
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.utils.ContextUtils
 import com.miya.fastcashier.utils.DateUtils
 import com.miya.fastcashier.utils.DensityUtils

app/src/main/java/com/miya/fastcashier/dao/ViewPayOrderData.kt

@@ -3,8 +3,8 @@ package com.miya.fastcashier.dao
 import android.text.TextUtils
 import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.fastcashier.lib_common.function.account.AccountService
 import com.fastcashier.lib_common.util.isEmpty
-import com.miya.fastcashier.service.AccountService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import java.lang.RuntimeException
 

app/src/main/java/com/miya/fastcashier/log/LFilePickerActivity.java

@@ -16,12 +16,12 @@ import com.blankj.utilcode.util.EncodeUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.StringUtils;
 import com.fastcashier.lib_common.BuildConfig;
+import com.fastcashier.lib_common.function.account.AccountService;
+import com.fastcashier.lib_common.function.account.SelfCashierTerminalConfig;
 import com.fastcashier.lib_common.net.CommonCallback;
 import com.miya.fastcashier.R;
-import com.miya.fastcashier.net.bean.SelfCashierTerminalConfig;
 import com.miya.fastcashier.net.ApiRequest;
 import com.miya.fastcashier.net.ApiService;
-import com.miya.fastcashier.service.AccountService;
 import com.miya.fastcashier.ui.BaseActivity;
 import com.miya.fastcashier.utils.LogFileUtils;
 

app/src/main/java/com/miya/fastcashier/log/SystemParameterDialog.kt

@@ -7,13 +7,13 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
 import com.fastcashier.lib_common.BuildConfig
+import com.fastcashier.lib_common.function.account.AccountService.getAccountInfo
 import com.fastcashier.lib_common.net.ApiConfig.baseUrl
 import com.fastcashier.lib_common.util.getVersion
 import com.fastcashier.lib_common.util.getVersionCode
 import com.fastcashier.lib_common.util.getWifyName
 import com.miya.fastcashier.R
 import com.miya.fastcashier.databinding.DialogSystemParameterBinding
-import com.miya.fastcashier.service.AccountService.getAccountInfo
 import com.miya.fastcashier.utils.*
 import com.miya.print.PrinterManager
 import java.util.*

app/src/main/java/com/miya/fastcashier/net/ApiRequest.kt

@@ -3,13 +3,13 @@ package com.miya.fastcashier.net
 import android.text.TextUtils
 import android.util.Log
 import com.fastcashier.lib_common.BaseApplication
+import com.fastcashier.lib_common.function.account.SelfCashierAccountInfo
+import com.fastcashier.lib_common.function.account.SelfCashierTerminalConfig
 import com.fastcashier.lib_common.net.ApiConfig
 import com.fastcashier.lib_common.net.CommonCallback
 import com.fastcashier.lib_common.net.MiyaHttpLoggingInterceptor
 import com.fastcashier.lib_common.net.SSLCertificatesInit
 import com.miya.fastcashier.net.param.LoginParams
-import com.miya.fastcashier.net.bean.SelfCashierAccountInfo
-import com.miya.fastcashier.net.bean.SelfCashierTerminalConfig
 import com.miya.fastcashier.utils.LogFileUtils
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient

app/src/main/java/com/miya/fastcashier/net/ApiService.kt

 package com.miya.fastcashier.net
 
+import com.fastcashier.lib_common.function.account.SelfCashierAccountInfo
 import com.fastcashier.lib_common.net.ApiConfig
 import com.fastcashier.lib_common.net.BaseResponse
 import com.miya.fastcashier.net.param.LoginParams
-import com.miya.fastcashier.net.bean.SelfCashierAccountInfo
 import okhttp3.MultipartBody
 import retrofit2.Call
 import retrofit2.http.*

app/src/main/java/com/miya/fastcashier/net/RequestSignInterceptor.kt

 package com.miya.fastcashier.net
 
+import com.fastcashier.lib_common.function.account.AccountService.getAccountInfo
 import com.fastcashier.lib_common.net.ApiConfig.getAuthorization
 import com.miya.fastcashier.net.ApiService.Companion.wrapUrl
-import com.miya.fastcashier.service.AccountService.getAccountInfo
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response

app/src/main/java/com/miya/fastcashier/net/bean/ViewOrderStatisticsInfo.java

@@ -2,6 +2,7 @@ package com.miya.fastcashier.net.bean;
 
 import android.text.TextUtils;
 
+import com.fastcashier.lib_common.base.BaseBean;
 import com.sdy.miya.moblie.component.pay.platform.bean.BaseDO;
 import com.sdy.miya.moblie.component.pay.platform.bean.QueryTradesByTimeResponse;
 

app/src/main/java/com/miya/fastcashier/repository/PayRepository.kt

 package com.miya.fastcashier.repository
 
 import android.text.TextUtils
-import android.util.Log
 import androidx.annotation.WorkerThread
-import com.blankj.utilcode.util.LogUtils
-import com.miya.fastcashier.service.AccountService
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.utils.DateUtils
 import com.sdy.miya.moblie.component.pay.core.constance.AppTagConstance
-import com.sdy.miya.moblie.component.pay.core.result.MiYaMobilePayResult
 import com.sdy.miya.moblie.component.pay.core.result.ResultBuilder
 import com.sdy.miya.moblie.component.pay.platform.MiYaPlatformPayService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import com.sdy.miya.moblie.component.pay.platform.bean.QueryTradesByTimeResponse
-import java.lang.Exception
-import java.text.SimpleDateFormat
 import java.util.*
 
 /**

app/src/main/java/com/miya/fastcashier/service/PrintService.kt

 package com.miya.fastcashier.service
 
 import android.text.TextUtils
+import com.fastcashier.lib_common.function.account.AccountService
+import com.fastcashier.lib_common.function.account.SelfCashierAccountInfo
 import com.fastcashier.lib_common.util.isEmpty
-import com.miya.fastcashier.net.bean.SelfCashierAccountInfo
 import com.miya.fastcashier.net.bean.ViewOrderStatisticsInfo
 import com.miya.fastcashier.utils.DateUtils
 import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum

app/src/main/java/com/miya/fastcashier/ui/LoginActivity.kt

@@ -14,8 +14,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import com.blankj.utilcode.util.ToastUtils
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.databinding.ActivityLoginBinding
-import com.miya.fastcashier.service.AccountService
 import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
 import com.miya.fastcashier.viewmodel.LoginViewModel

app/src/main/java/com/miya/fastcashier/ui/MainActivity.kt

@@ -7,9 +7,9 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.ViewModelProvider
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.R
 import com.miya.fastcashier.databinding.ActivityMainBinding
-import com.miya.fastcashier.service.AccountService
 import com.miya.fastcashier.service.PrintService
 import com.miya.fastcashier.ui.dialog.AuthorizePasswordInputDialog
 import com.miya.fastcashier.ui.dialog.CommonDialog

app/src/main/java/com/miya/fastcashier/ui/SearchOrderActivity.kt

@@ -15,17 +15,20 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.elvishew.xlog.XLog
+import com.fastcashier.lib_common.function.account.AccountService
 import com.fastcashier.lib_common.util.dp2px
 import com.google.android.material.tabs.TabLayoutMediator
 import com.miya.fastcashier.R
-import com.miya.fastcashier.dao.ViewPayOrderData
 import com.miya.fastcashier.dao.PayDataDao
+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.service.AccountService
 import com.miya.fastcashier.service.PrintService
-import com.miya.fastcashier.utils.*
+import com.miya.fastcashier.utils.CenterToasty
+import com.miya.fastcashier.utils.MiYaPayPlantformPayWayEnum
+import com.miya.fastcashier.utils.StringPriceFormat
+import com.miya.fastcashier.utils.clickWithTrigger
 import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
 import com.miya.fastcashier.viewmodel.SearchOrderViewModel
 
@@ -192,7 +195,7 @@ class SearchOrderFragment(val payType: MiYaPayPlantformPayWayEnum.MiyaPayType) :
     private fun loadMore(loadIndex: Int) {
         //加载更多
 //        vm.getPayData(payType, loadIndex)
-        vm.getPayDataByTimeAndUser(payType,AccountService.getUserName(), balanceDate)
+        vm.getPayDataByTimeAndUser(payType, AccountService.getUserName(), balanceDate)
 //        onLoading = true
     }
 

app/src/main/java/com/miya/fastcashier/utils/manage/AccountPasswordManageKit.kt

@@ -7,9 +7,9 @@ import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.FileIOUtils
 import com.blankj.utilcode.util.FileUtils
 import com.blankj.utilcode.util.ToastUtils
-import com.miya.fastcashier.service.AccountService.getAccountPassword
-import com.miya.fastcashier.service.AccountService.getUserName
-import com.miya.fastcashier.service.AccountService.setAccountPassword
+import com.fastcashier.lib_common.function.account.AccountService.getAccountPassword
+import com.fastcashier.lib_common.function.account.AccountService.getUserName
+import com.fastcashier.lib_common.function.account.AccountService.setAccountPassword
 import com.permissionx.guolindev.PermissionX
 import java.util.concurrent.Executors
 

app/src/main/java/com/miya/fastcashier/utils/manage/LocalKeyDataMKManageKit.kt

 package com.miya.fastcashier.utils.manage
 
-import com.blankj.utilcode.util.LogUtils
-import com.miya.fastcashier.service.AccountService
-import com.miya.fastcashier.utils.DateUtils
+import com.fastcashier.lib_common.function.account.AccountService
 import com.tencent.mmkv.MMKV
 import java.util.*
 

app/src/main/java/com/miya/fastcashier/viewmodel/LoginViewModel.kt

@@ -4,11 +4,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 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.net.param.LoginParams
-import com.miya.fastcashier.net.bean.SelfCashierAccountInfo
 import com.miya.fastcashier.net.ApiRequest
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch

app/src/main/java/com/miya/fastcashier/viewmodel/MainViewModel.kt

@@ -3,9 +3,9 @@ package com.miya.fastcashier.viewmodel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.net.bean.ViewOrderStatisticsInfo
 import com.miya.fastcashier.repository.PayRepository
-import com.miya.fastcashier.service.AccountService
 import com.miya.fastcashier.service.PrintService
 import com.miya.fastcashier.utils.DateUtils
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/miya/fastcashier/viewmodel/PayViewModel.kt

@@ -6,9 +6,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alibaba.fastjson.JSON
 import com.elvishew.xlog.XLog
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.dao.ViewPayOrderData
 import com.miya.fastcashier.repository.PayRepository
-import com.miya.fastcashier.service.AccountService
 import com.miya.fastcashier.service.PrintService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/miya/fastcashier/viewmodel/PrintViewModel.kt

@@ -3,7 +3,7 @@ package com.miya.fastcashier.viewmodel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.miya.fastcashier.service.AccountService
+import com.fastcashier.lib_common.function.account.AccountService
 import com.miya.fastcashier.service.PrintService
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/miya/fastcashier/net/bean/BaseBean.java → lib_common/src/main/java/com/fastcashier/lib_common/base/BaseBean.java

-package com.miya.fastcashier.net.bean;
+package com.fastcashier.lib_common.base;
 
 
 import java.io.Serializable;
 
 /**
  * 基础DO类，提供toString快方法
- * Created by fys on 2016/3/31.
  */
 public class BaseBean implements Serializable {
 

app/src/main/java/com/miya/fastcashier/service/AccountService.kt → lib_common/src/main/java/com/fastcashier/lib_common/function/account/AccountService.kt

-package com.miya.fastcashier.service
-
-import com.miya.fastcashier.net.bean.SelfCashierAccountInfo
+package com.fastcashier.lib_common.function.account
 
 object AccountService {
 

app/src/main/java/com/miya/fastcashier/net/bean/SelfCashierAccountInfo.java → lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierAccountInfo.java

-package com.miya.fastcashier.net.bean;
+package com.fastcashier.lib_common.function.account;
 
 import android.text.TextUtils;
 
+import com.fastcashier.lib_common.base.BaseBean;
 import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 非米雅渠道 自助结算终端用户信息类
- * Created by fengyu on 2018/4/8.
+ * 类描述：基础信息类
+ * 概述：非米雅渠道  自助结算终端用户信息类
+ * 创建人：zpxiang
+ * 创建时间：2022/6/1
+ * 修改人：
+ * 修改时间：
  */
 public class SelfCashierAccountInfo extends BaseBean {
 
     @SerializedName("store")
-    private SelfCashierAccountInfo.ShopInfo shopInfo;
+    private ShopInfo shopInfo;
 
     @SerializedName("accessToken")
-    private SelfCashierAccountInfo.AccessToken accessToken;
+    private AccessToken accessToken;
 
-    public SelfCashierAccountInfo.AccessToken getAccessToken() {
+    public AccessToken getAccessToken() {
         return accessToken;
     }
 
-    public void setAccessToken(SelfCashierAccountInfo.AccessToken accessToken) {
+    public void setAccessToken(AccessToken accessToken) {
         this.accessToken = accessToken;
     }
 
-    public SelfCashierAccountInfo.ShopInfo getShopInfo() {
+    public ShopInfo getShopInfo() {
         return shopInfo;
     }
 
-    public void setShopInfo(SelfCashierAccountInfo.ShopInfo shopInfo) {
+    public void setShopInfo(ShopInfo shopInfo) {
         this.shopInfo = shopInfo;
     }
 

app/src/main/java/com/miya/fastcashier/net/bean/SelfCashierTerminalConfig.java → lib_common/src/main/java/com/fastcashier/lib_common/function/account/SelfCashierTerminalConfig.java

-package com.miya.fastcashier.net.bean;
+package com.fastcashier.lib_common.function.account;
+
+import com.fastcashier.lib_common.base.BaseBean;
 
 import java.util.Date;
 import java.util.List;
 
 /**
- * 自助收银终端 应用配置信息
- * Created by fengyu on 2018/6/28.
+ * 类描述：基础应用信息类
+ * 概述：自助收银终端应用配置信息
+ * 创建人：zpxiang
+ * 创建时间：2022/6/1
+ * 修改人：
+ * 修改时间：
  */
 public class SelfCashierTerminalConfig extends BaseBean {
 
@@ -151,7 +157,6 @@ public class SelfCashierTerminalConfig extends BaseBean {
         private boolean isSdkPayDiscPosterShow;
 
 
-
         public boolean isSdkPayDiscPosterShow() {
             return isSdkPayDiscPosterShow;
         }
@@ -585,8 +590,6 @@ public class SelfCashierTerminalConfig extends BaseBean {
         private boolean useETicket;
 
 
-
-
         public boolean isMerchantOperatePageEnable() {
             return merchantOperatePageEnable;
         }
@@ -930,14 +933,12 @@ public class SelfCashierTerminalConfig extends BaseBean {
         private String extData;
 
 
-
         /**
          * 商户特殊功能开关解析类
          */
         private String merchantFunctionSerializableClass;
 
 
-
         /**
          * 扫描会员弹框提示文案
          */

lib_common/src/main/java/com/fastcashier/lib_common/net/CommonCallback.kt

@@ -3,7 +3,6 @@ package com.fastcashier.lib_common.net
 import android.util.Log
 import com.fastcashier.lib_common.BaseApplication.Companion.getApplication
 import com.fastcashier.lib_common.R
-import com.fastcashier.lib_common.net.BaseResponse
 import com.fastcashier.lib_common.util.isNetworkConnected
 import retrofit2.Call
 import retrofit2.Callback