update

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

@@ -50,7 +50,6 @@ public class LFilePickerActivity extends BaseActivity {
     private ArrayList<String> mListNumbers = new ArrayList<String>();//存放选中条目的数据地址
     private String mQrCodeEncodeMsg;
     private byte[] dialogLock = new byte[0];
-    public static boolean isProhibitWrite = false;//是否禁止写入文件
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -255,7 +254,7 @@ public class LFilePickerActivity extends BaseActivity {
     }
 
     public void uploadFile(String path) {
-//        isProhibitWrite = true;
+//        LogFileUtils.INSTANCE.setProhibitWrite(true);
 //        String equType = getEquType();
 //
 //        File file = new File(path);
@@ -272,7 +271,7 @@ public class LFilePickerActivity extends BaseActivity {
 //        long size = file.length();
 //        if(size > 34307335){
 //            ToastUtils.showLong("日志文件过大");
-//            isProhibitWrite = false;
+//            LogFileUtils.INSTANCE.setProhibitWrite(false);
 //            hidProgressDialog();
 //            return;
 //        }
@@ -286,7 +285,7 @@ public class LFilePickerActivity extends BaseActivity {
 //                    @Override
 //                    public void call(HttpResult s) {
 //                        hidProgressDialog();
-//                        isProhibitWrite = false;
+//                        LogFileUtils.INSTANCE.setProhibitWrite(false);
 //                        successToast = Toasty.success(LFilePickerActivity.this, "文件上传成功！");
 //                        successToast.show();
 //                        showQrImageIfNeeded();
@@ -295,7 +294,7 @@ public class LFilePickerActivity extends BaseActivity {
 //                    @Override
 //                    public void call(Throwable throwable) {
 //                        hidProgressDialog();
-//                        isProhibitWrite = false;
+//                        LogFileUtils.INSTANCE.setProhibitWrite(false);
 //                        Toasty.error(LFilePickerActivity.this, "文件上传失败！").show();
 //                    }
 //                });

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

@@ -11,8 +11,8 @@ import com.miya.fastcashier.BuildConfig;
 import com.miya.fastcashier.R;
 import com.miya.fastcashier.beans.SelfCashierAccountInfo;
 import com.miya.fastcashier.databinding.DialogSystemParameterBinding;
+import com.miya.fastcashier.net.ApiService;
 import com.miya.fastcashier.service.AccountService;
-import com.miya.fastcashier.service.LoginService;
 import com.miya.fastcashier.utils.BaseFunctionKt;
 import com.miya.print.PrinterManager;
 
@@ -44,7 +44,7 @@ public class SystemParameterDialog extends Dialog {
         setInfo(viewBinding.tvCashier, accountInfo.getShopInfo().getOperatorId());
         setInfo(viewBinding.tvVersionType, "fastCashier_" + BuildConfig.appType);
         setInfo(viewBinding.tvEquipment, "sunmi_v2pro");
-        setInfo(viewBinding.tvServerUrl, LoginService.Companion.getBaseUrl());
+        setInfo(viewBinding.tvServerUrl, ApiService.Companion.getBaseUrl());
         setInfo(viewBinding.tvWifiName, BaseFunctionKt.getWifyName(getContext()));
         setInfo(viewBinding.tvNetIp, BaseFunctionKt.getNetIp(getContext()) == null ? "未知" : BaseFunctionKt.getNetIp(getContext()));
         setInfo(viewBinding.tvPrintType, PrinterManager.getInstance().getPrinter() == null ?

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

-package com.miya.fastcashier.service
+package com.miya.fastcashier.net
 
 import android.util.Log
 import com.miya.fastcashier.beans.SelfCashierAccountInfo
@@ -13,18 +13,16 @@ import retrofit2.http.Body
 import retrofit2.http.POST
 
 
-interface LoginService {
-
-    @POST("verify/auth/token")
-    suspend fun login(@Body loginRequestCall: LoginRequest): BaseResult<SelfCashierAccountInfo>
+interface ApiService {
 
     companion object {
 
-        private const val BASE_URL = "https://hhms.miyapay.com/"
+        const val LOGIN: String = "verify/auth/token"
 
-        private var service: LoginService? = null
+        private const val BASE_URL = "https://hhms.miyapay.com/"
+        private var service: ApiService? = null
 
-        fun getApi(): LoginService {
+        fun getApi(): ApiService {
             if (null == service) {
                 val httpLoggingInterceptor =
                     MiyaHttpLoggingInterceptor {
@@ -41,15 +39,18 @@ interface LoginService {
                     .addConverterFactory(GsonConverterFactory.create())
                     .build()
 
-                service = retrofit.create(LoginService::class.java)
+                service = retrofit.create(ApiService::class.java)
             }
 
             return service!!
         }
 
-        fun getBaseUrl():String{
+        fun getBaseUrl(): String {
             return BASE_URL
         }
     }
 
+
+    @POST(LOGIN)
+    suspend fun login(@Body loginRequestCall: LoginRequest): BaseResult<SelfCashierAccountInfo>
 }
\ No newline at end of file

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

@@ -8,9 +8,8 @@ import com.miya.fastcashier.R
 import com.miya.fastcashier.beans.LoginFormState
 import com.miya.fastcashier.beans.LoginRequest
 import com.miya.fastcashier.beans.SelfCashierAccountInfo
+import com.miya.fastcashier.net.ApiService
 import com.miya.fastcashier.net.BaseResult
-import com.miya.fastcashier.service.LoginService
-import com.miya.fastcashier.utils.manage.LocalKeyDataMKManageKit
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
@@ -25,14 +24,9 @@ class LoginViewModel : ViewModel() {
         viewModelScope.launch(Dispatchers.IO) {
             try {
                 val result = Result.success(
-                    errorHandle(LoginService.getApi().login(LoginRequest(userName, passWord, "")))
+                    errorHandle(ApiService.getApi().login(LoginRequest(userName, passWord, "")))
                 )
 
-//                val balanceDate = LocalKeyDataMKManageKit.getBalanceDate()
-//                if (balanceDate <= 0L) {
-//                    //todo 改成服务器时间
-//                    LocalKeyDataMKManageKit.putBalanceDate(System.currentTimeMillis())
-//                }
                 loginLiveData.postValue(result)
             } catch (e: Exception) {
                 loginLiveData.postValue(Result.failure(e))

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

@@ -3,18 +3,15 @@ package com.miya.fastcashier.viewmodel
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.miya.fastcashier.beans.LoginRequest
-import com.miya.fastcashier.beans.SelfCashierAccountInfo
 import com.miya.fastcashier.beans.ViewOrderStatisticsInfo
 import com.miya.fastcashier.repository.PayRepository
 import com.miya.fastcashier.service.AccountService
-import com.miya.fastcashier.service.LoginService
 import com.miya.fastcashier.service.PrintService
 import com.miya.fastcashier.utils.DateUtils
-import com.sdy.miya.moblie.component.pay.platform.bean.MiyaOrderRefundResponse
-import kotlinx.coroutines.*
-import java.lang.Exception
-import java.lang.RuntimeException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import java.util.*
 import kotlin.collections.HashMap
 

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

@@ -5,25 +5,16 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.alibaba.fastjson.JSON
-import com.blankj.utilcode.util.LogUtils
-import com.blankj.utilcode.util.NumberUtils
 import com.elvishew.xlog.XLog
-import com.miya.fastcashier.beans.LoginRequest
-import com.miya.fastcashier.beans.SelfCashierAccountInfo
 import com.miya.fastcashier.beans.ViewPayOrderData
-import com.miya.fastcashier.dao.DatabaseKeeper
 import com.miya.fastcashier.repository.PayRepository
 import com.miya.fastcashier.service.AccountService
-import com.miya.fastcashier.service.LoginService
 import com.miya.fastcashier.service.PrintService
-import com.miya.fastcashier.utils.DateUtils
-import com.sdy.miya.moblie.component.pay.core.error.ParamInvalidException
-import com.sdy.miya.moblie.component.pay.platform.bean.MiyaOrderRefundResponse
 import com.sdy.miya.moblie.component.pay.platform.bean.PayServiceResponse
-import kotlinx.coroutines.*
-import java.lang.RuntimeException
-import java.util.*
-import kotlin.collections.HashMap
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
 
 
 class PayViewModel : ViewModel() {