kotlin非空处理

app/src/main/java/com/miya/fastcashier/ui/dialog/SystemParameterDialog.kt

@@ -36,11 +36,11 @@ class SystemParameterDialog(context: Context) : Dialog(context, R.style.CommonDi
     private fun init() {
         val accountInfo = getAccountInfo()
         setInfo(viewBinding.tvVersion, getVersion(context))
-        setInfo(viewBinding.tvStoreName, accountInfo!!.shopInfo.storeName)
-        setInfo(viewBinding.tvStoreNum, accountInfo.shopInfo.storeId)
-        setInfo(viewBinding.tvMerchantNum, accountInfo.shopInfo.hhMerchant)
-        setInfo(viewBinding.tvPos, accountInfo.shopInfo.posId)
-        setInfo(viewBinding.tvCashier, accountInfo.shopInfo.operatorId)
+        setInfo(viewBinding.tvStoreName, accountInfo!!.shopInfo?.storeName)
+        setInfo(viewBinding.tvStoreNum, accountInfo.shopInfo?.storeId)
+        setInfo(viewBinding.tvMerchantNum, accountInfo.shopInfo?.hhMerchant)
+        setInfo(viewBinding.tvPos, accountInfo.shopInfo?.posId)
+        setInfo(viewBinding.tvCashier, accountInfo.shopInfo?.operatorId)
         setInfo(viewBinding.tvVersionType, "fastCashier_" + BuildConfig.appType)
         setInfo(viewBinding.tvEquipment, "sunmi_v2pro")
         setInfo(viewBinding.tvServerUrl, baseUrl)

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

@@ -23,10 +23,12 @@ class RequestSignInterceptor : Interceptor {
         val requestBuilder: Request.Builder = original.newBuilder()
         val accountInfo = getAccountInfo()
         if (accountInfo != null && accountInfo.accessToken != null) {
-            requestBuilder.addHeader(
-                AUTHORIZATION,
-                getAuthorization(accountInfo.accessToken.accessToken)
-            )
+            accountInfo.accessToken!!.accessToken?.let { getAuthorization(it) }?.let {
+                requestBuilder.addHeader(
+                    AUTHORIZATION,
+                    it
+                )
+            }
         }
         val request: Request = requestBuilder.build()
         return chain.proceed(request)