diff --git a/app/src/main/java/com/sw/inbound/GlobalData.kt b/app/src/main/java/com/sw/inbound/GlobalData.kt index 6eb08ca..0c33001 100644 --- a/app/src/main/java/com/sw/inbound/GlobalData.kt +++ b/app/src/main/java/com/sw/inbound/GlobalData.kt @@ -44,7 +44,7 @@ object GlobalData { * 具体业务baseurl */ //var appBaseUrl: String = "http://192.168.1.201:14801" - var appBaseUrl: String = "http://dev.yixiong-tech.com:8081" + var appBaseUrl: String = "https://dev.yixiong-tech.com:8081" /** * 设备id diff --git a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt index b67f299..a1a89ea 100644 --- a/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/FoodCollectionActivity.kt @@ -330,7 +330,7 @@ class FoodCollectionActivity : ComponentActivity() { } } catch (e: Exception) { e.printStackTrace() - toast("程序异常") + toast("程序异常${e.message}") } } diff --git a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt index f236543..a4874c1 100644 --- a/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt +++ b/app/src/main/java/com/sw/inbound/activity/GoodsListActivity.kt @@ -11,9 +11,8 @@ import androidx.camera.view.PreviewView import androidx.core.graphics.toColorInt import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope -import androidx.lifecycle.viewModelScope -import com.shuwei.intelligent.shelves.utils.ext.appendText -import com.shuwei.intelligent.shelves.utils.ext.buildSpannableString +import com.sw.inbound.utils.ext.appendText +import com.sw.inbound.utils.ext.buildSpannableString import com.sw.inbound.GlobalData import com.sw.inbound.R import com.sw.inbound.databinding.ActivityGoodsListBinding diff --git a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt index 088e560..e7f09c0 100644 --- a/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt +++ b/app/src/main/java/com/sw/inbound/dialog/GoodsStoreDialog.kt @@ -17,8 +17,8 @@ import androidx.core.view.updateLayoutParams import androidx.core.widget.addTextChangedListener import coil.load import coil.transform.RoundedCornersTransformation -import com.shuwei.intelligent.shelves.utils.ext.appendText -import com.shuwei.intelligent.shelves.utils.ext.buildSpannableString +import com.sw.inbound.utils.ext.appendText +import com.sw.inbound.utils.ext.buildSpannableString import com.sw.inbound.R import com.sw.inbound.activity.GoodsListActivity import com.sw.inbound.databinding.DialogGoodsStoreBinding diff --git a/app/src/main/java/com/sw/inbound/utils/ext/SpannableExt.kt b/app/src/main/java/com/sw/inbound/utils/ext/SpannableExt.kt index bce4b9f..1bc9b9d 100644 --- a/app/src/main/java/com/sw/inbound/utils/ext/SpannableExt.kt +++ b/app/src/main/java/com/sw/inbound/utils/ext/SpannableExt.kt @@ -1,4 +1,4 @@ -package com.shuwei.intelligent.shelves.utils.ext +package com.sw.inbound.utils.ext import android.text.SpannableStringBuilder import android.text.Spanned