1.新增化学品终端的log

HttpCoreLibrary/src/main/java/com/rc/httpcore/interceptor/ParameterValidationInterceptor.kt

@@ -63,9 +63,7 @@ class ParameterValidationInterceptor : Interceptor {
 //                }
 //            }
 //        }
-        if (!AppUtils.isAppDebug()) {
-            LogUtils.json(request)
-        }
+        LogUtils.json(request)
         // 打印所有请求参数（合并为一行）
 //        Log.d(TAG, "Request body: $bodyParametersLog")
 //        Log.d(TAG, "Request query: $queryParametersLog")
@@ -85,9 +83,7 @@ class ParameterValidationInterceptor : Interceptor {
 
         // 打印返回值日志
 //        Log.d(TAG, "Response: $responseBodyString")
-        if (!AppUtils.isAppDebug()) {
-            LogUtils.d(response.toString(), responseBodyString)
-        }
+        LogUtils.d(response.toString(), responseBodyString)
         // 创建一个新的响应体，以便返回
         return response.newBuilder()
             .body(ResponseBody.create(responseBody?.contentType(), responseBodyString))

app/src/main/java/com/example/chemical/ChemicalApp.kt

@@ -11,6 +11,7 @@ import com.blankj.utilcode.util.FileUtils
 import com.blankj.utilcode.util.LogUtils
 import com.example.chemical.comm.Constants
 import com.rc.core.log.RcLog
+import com.rc.core.util.ApkController
 import com.rc.core.util.CrashHandler.initCrash
 import com.rc.core.util.ScreenAdapter
 import com.rc.httpcore.apk.LabInfo

app/src/main/java/com/example/chemical/ui/MainActivity.kt

@@ -10,11 +10,14 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.util.Log
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.EditText
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
@@ -23,7 +26,6 @@ import com.example.chemical.R
 import com.example.chemical.databinding.ActivityMainBinding
 import com.example.chemical.receiver.UsbReceiver
 import com.example.chemical.ui.adapter.CabinetAdapter
-import com.example.chemical.ui.common.BaseCountDownActivity
 import com.example.chemical.ui.discard.LedgerActivity
 import com.example.chemical.ui.discard.WasteChemicalsActivity
 import com.example.chemical.ui.inquiry.InquiryActivity
@@ -36,11 +38,17 @@ import com.example.chemical.ui.still.ChemicalsAlsoActivity
 import com.example.chemical.ui.still.MsdsActivity
 import com.example.chemical.ui.uses.UseActivity
 import com.example.chemical.ui.uses.WarningEventsActivity
-import com.example.chemical.ui.warehousing.ElectronicLedgerActivity
+import com.example.chemical.ui.warehousing.ChemicalLabelingActivity
 import com.example.chemical.ui.warehousing.WarehousingActivity
+import com.example.chemical.utils.RelativeLayoutDebouncer
+import com.example.chemical.utils.SharedPreferencesHelper
+import com.example.chemical.utils.TimeUpdater
+import com.example.chemical.utils.UiManager
 import com.example.chemical.weidith.CustomDialog
 import com.lztek.toolkit.Lztek
 import com.rc.core.log.RcLog
+import com.rc.core.ui.activity.RcBaseActivity
+import com.rc.core.util.DeviceUtils
 import com.rc.httpcore.HttpClient
 import com.rc.httpcore.HttpConfig
 import com.rc.httpcore.client.ApiRepository
@@ -48,14 +56,6 @@ import com.rc.httpcore.exception.NetException
 import retrofit2.HttpException
 import java.net.ConnectException
 import java.net.SocketTimeoutException
-import android.util.Log
-import android.widget.EditText
-import com.blankj.utilcode.util.ActivityUtils
-import com.blankj.utilcode.util.LogUtils
-import com.example.chemical.ui.warehousing.ChemicalLabelingActivity
-import com.example.chemical.utils.*
-import com.rc.core.ui.activity.RcBaseActivity
-import com.rc.core.util.DeviceUtils
 
 //首页 -  登录or 未登录
 class MainActivity : RcBaseActivity<ActivityMainBinding>() {

app/src/main/java/com/example/chemical/ui/newly/AddedChemicalsActivity.kt

@@ -11,7 +11,11 @@ import android.os.Bundle
 import android.os.CountDownTimer
 import android.os.Handler
 import android.os.Looper
-import android.view.*
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import android.view.inputmethod.InputMethodManager
 import android.widget.ArrayAdapter
 import android.widget.EditText
@@ -36,26 +40,52 @@ import com.example.chemical.ui.SplashActivity
 import com.example.chemical.ui.adapter.ChemicalsAdapter
 import com.example.chemical.ui.common.BaseCountDownActivity
 import com.example.chemical.ui.verify.TwoVerificationActivity
-import com.example.chemical.utils.*
-import com.example.chemical.weidith.*
+import com.example.chemical.utils.BitmapUtils
+import com.example.chemical.utils.ButtonDebouncer
+import com.example.chemical.utils.ConversionUtils
+import com.example.chemical.utils.HandlerUtil
+import com.example.chemical.utils.MediaPlayerHelper
+import com.example.chemical.utils.SharedPreferencesHelper
+import com.example.chemical.utils.TimeUpdater
+import com.example.chemical.utils.UiManager
+import com.example.chemical.weidith.BelongingPersonDialog
+import com.example.chemical.weidith.ChemicalTypeDialog
+import com.example.chemical.weidith.CustomDialog
+import com.example.chemical.weidith.DcaeDialog
+import com.example.chemical.weidith.LabelDialog
+import com.example.chemical.weidith.PackingDialog
+import com.example.chemical.weidith.SelectTopicDialog
+import com.example.chemical.weidith.StorageDialog
+import com.example.chemical.weidith.WeighDialog
 import com.rc.core.log.RcLog
 import com.rc.httpcore.HttpConfig
-import com.rc.httpcore.bean.*
+import com.rc.httpcore.bean.BelongingPersonBean
+import com.rc.httpcore.bean.ChemicalABean
+import com.rc.httpcore.bean.ChemicalConfsBean
+import com.rc.httpcore.bean.ChemicalInfoBean
+import com.rc.httpcore.bean.ChemicalSearchBean
+import com.rc.httpcore.bean.ChemicalTypeBean
+import com.rc.httpcore.bean.LockVoListBean
+import com.rc.httpcore.bean.RuleBean
+import com.rc.httpcore.bean.StockDetailsModel
+import com.rc.httpcore.bean.StockModeBean
+import com.rc.httpcore.bean.StockModel
+import com.rc.httpcore.bean.TopicDataBean
 import com.rc.httpcore.client.ApiRepository
 import com.rc.httpcore.exception.NetException
 import com.sun.jna.Pointer
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import retrofit2.HttpException
-import java.lang.Runnable
 import java.math.BigDecimal
 import java.net.ConnectException
 import java.net.SocketTimeoutException
 import java.nio.charset.StandardCharsets
-import java.util.*
-import kotlin.collections.ArrayList
 
 /**
  * 新增入库 全新  包装0  已开封  可输入包装值

app/src/main/java/com/example/chemical/ui/still/ChemicalsAlsoActivity.kt

@@ -142,6 +142,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
 
 
                         }
+
                         "3" -> {//扫码
                             map["mVerTyps"] = 3
 
@@ -849,7 +850,6 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     // 连接成功后的处理逻辑
                     withContext(Dispatchers.Main) {
                         do {
-//                            try {
                             val inputStream = socket!!.inputStream
                             val bt = ByteArray(1024)
                             val content = inputStream!!.read(bt)
@@ -860,8 +860,17 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                                     content,
                                     StandardCharsets.UTF_8
                                 )
+                                if ("" == contents || contents.isEmpty()) {
+                                    return@withContext
+                                }
                                 val split = contents.split("\n")
+                                if (split.isEmpty()) {
+                                    return@withContext
+                                }
                                 val weight = split[0].trim()
+                                if ("" == weight || weight.isEmpty()) {
+                                    return@withContext
+                                }
                                 RcLog.info("===================称重未处理之前=======$contents")
                                 RcLog.info("===================weight=======$weight")
                                 RcLog.info("=====称重数据$weight $taskStarted  ${mWeighingValue!!.text.toString()}")
@@ -875,7 +884,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                                             if (weight.toDouble() == mWeighingValue!!.text.toString()
                                                     .trim().toDouble()
                                             ) {
-                                                if (taskStarted == false) {
+                                                if (!taskStarted) {
                                                     taskStarted = true
                                                     RcLog.info("=====执行了")
                                                     socket.close()
@@ -891,17 +900,10 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                                 }
                                 delay(200)
                             } else {
-//                                jobTow?.cancel()
-
                                 showToast("请手动输入")
                                 weiView()
                                 break
                             }
-//                            } catch (e: Exception) {
-//                                jobTow?.cancel()
-//                                weiView()
-//                                break
-//                            }
                         } while (true)
                     }
 
@@ -1202,13 +1204,16 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
             1 -> {
                 viewBinding.one.visibility = View.VISIBLE
             }
+
             2 -> {
                 viewBinding.two.visibility = View.VISIBLE
             }
+
             3 -> {
                 viewBinding.two.visibility = View.VISIBLE
                 viewBinding.three.visibility = View.VISIBLE
             }
+
             else -> {
                 viewBinding.two.visibility = View.VISIBLE
                 viewBinding.three.visibility = View.VISIBLE
@@ -1231,11 +1236,13 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
                 }
+
                 2 -> {
                     viewBinding.three.visibility = View.GONE
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
                 }
+
                 3 -> {
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
@@ -1256,11 +1263,13 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
                 }
+
                 2 -> {
                     viewBinding.three.visibility = View.GONE
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
                 }
+
                 3 -> {
                     viewBinding.many.visibility = View.GONE
                     viewBinding.drop.visibility = View.GONE
@@ -1290,6 +1299,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.two.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                     viewBinding.three.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                 }
+
                 2 -> {
 //                    viewBinding.two.visibility = View.VISIBLE
                     viewBinding.one.setTextColor(
@@ -1314,6 +1324,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.two.setBackgroundResource(R.drawable.bg_sou_suo_page)
                     viewBinding.three.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                 }
+
                 3 -> {
 //                    viewBinding.three.visibility = View.VISIBLE
                     viewBinding.one.setTextColor(
@@ -1366,6 +1377,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.two.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                     viewBinding.three.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                 }
+
                 2 -> {
                     viewBinding.one.setTextColor(
                         ContextCompat.getColor(
@@ -1389,6 +1401,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.two.setBackgroundResource(R.drawable.bg_sou_suo_page)
                     viewBinding.three.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                 }
+
                 3 -> {
                     viewBinding.one.setTextColor(
                         ContextCompat.getColor(
@@ -1412,6 +1425,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     viewBinding.two.setBackgroundResource(R.drawable.bg_sou_suo_two_page)
                     viewBinding.three.setBackgroundResource(R.drawable.bg_sou_suo_page)
                 }
+
                 else -> {
                     viewBinding.three.text = "$current"
                     if (pages == current) {
@@ -1799,6 +1813,7 @@ class ChemicalsAlsoActivity : BaseCountDownActivity<ActivityChemicalsAlsoBinding
                     throwable.message!!
                 }
             }
+
             is SocketTimeoutException -> "请求超时，请稍后重试"
             is ConnectException -> "无法连接服务器，请检查网络"
             is HttpException -> "服务器繁忙，请稍后重试"

config/config.gradle

@@ -10,7 +10,7 @@ ext {
             targetSdkVersion : 28,
             applicationId    : "com.zhong.che",
             versionCode      : 20,
-            versionName      : "1.24"
+            versionName      : "1.25"
     ]
 
     test = [