修复问题

.gitignore

@@ -13,3 +13,5 @@
 .externalNativeBuild
 .cxx
 local.properties
+app/sit/output-metadata.json
+app/sit/yppos-v-sit.apk

app/build.gradle

@@ -45,12 +45,18 @@ android {
             signingConfig signingConfigs.config
         }
 
-//        return_test {
-//            buildConfigField 'String', 'HOST', RETURN_DEBUG_HOST
-//            minifyEnabled false
-//
-//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-//        }
+        sit{
+            buildConfigField 'String', 'HOST', SIT_HOST
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.config
+        }
+
+        pre {
+            buildConfigField 'String', 'HOST', PRE_HOST
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
             buildConfigField 'String', 'HOST', RELEASE_HOST
             minifyEnabled false
@@ -80,6 +86,12 @@ android {
         ]
     }
 
+    android.applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = 'yppos-v-' + variant.buildType.name + '.apk'
+        }
+    }
+
 }
 
 dependencies {

app/src/main/java/com/ypsx/yppos/PosApp.kt

@@ -20,6 +20,7 @@ import com.elvishew.xlog.printer.file.backup.FileSizeBackupStrategy2
 import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
+import com.hjq.toast.ToastUtils
 import com.tencent.mmkv.MMKV
 import com.ypsx.base.base.BaseApp
 import com.ypsx.yppos.app.event.AppViewModel
@@ -45,6 +46,8 @@ class PosApp : BaseApp() {
     override fun onCreate() {
         super.onCreate()
         MMKV.initialize(this)
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
         instance = this
         PosDatabase.getDatabase(instance)
         eventViewModelInstance = getAppViewModelProvider().get(EventViewModel::class.java)

app/src/main/java/com/ypsx/yppos/http/data/bean/InsertOrderProductDTO.kt

@@ -4,7 +4,7 @@ data class InsertOrderProductDTO(
 
 
     var activityPrice: Double = 0.0,
-    var activitys: ActivityInfoDTO?=null,
+    var activitys: List<ActivityInfoDTO>? = null,
     //成交价
     var amount: Double = 0.0,
     var barCode: String,
@@ -24,7 +24,7 @@ data class InsertOrderProductDTO(
     var payApportionAmount: Double = 0.0,
     var pluLevel: String? = null,
     var price: Double,
-    var quantity:Double,
+    var quantity: Double,
     var priceType: String,
     var productId: String,
     var productNumber: String,
@@ -35,10 +35,9 @@ data class InsertOrderProductDTO(
     var tailAmount: Int = 0,
     var unit: String,
 //商家商品Id
-    var merchantItemId: String?=null,
+    var merchantItemId: String? = null,
     //称重码
     var weightCode: String? = null,
 
 
-
-)
+    )

app/src/main/java/com/ypsx/yppos/room/repository/PosBuyRepository.kt

@@ -111,7 +111,7 @@ class PosBuyRepository {
     }
 
     fun queryPosBuyPartByOrderNo(orderNo: String): List<PosBuyPart>? {
-        return getPosBuyPartDao().queryByOrderNo(orderNo, true)
+        return getPosBuyPartDao().queryByOrderNo(orderNo, false)
     }
 
     fun queryPosBuyPaymentByOrderNo(orderNo: String): PosBuyPayment? {

app/src/main/java/com/ypsx/yppos/room/repository/PosProductRepository.kt

@@ -40,7 +40,7 @@ class PosProductRepository {
     }
 
     fun queryAllIn( productIds: ArrayList<String>):List<PosProduct> {
-        productIds.toArray().toString().dXLog()
+        productIds.toArray().contentToString().dXLog()
         return getPosProductDao().queryAllByProductId(productIds)
     }
 }
\ No newline at end of file

app/src/main/java/com/ypsx/yppos/ui/activity/MainActivity.kt

@@ -7,11 +7,13 @@ import android.os.Process.myPid
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.ypsx.base.ext.view.textStringTrim
 import com.ypsx.yppos.R
 import com.ypsx.yppos.app.base.BaseActivity
+import com.ypsx.yppos.app.ext.hideKeyboard
 import com.ypsx.yppos.databinding.ActivityMainBinding
 import com.ypsx.yppos.http.data.bean.InsertOrderProductDTO
 import com.ypsx.yppos.http.data.bean.OrderActivityResponse
@@ -29,6 +31,7 @@ import com.ypsx.yppos.viewmodel.state.MainViewModel
 import kotlinx.android.synthetic.main.activity_main.*
 import razerdp.basepopup.BasePopupWindow.*
 import java.util.*
+import kotlin.collections.ArrayList
 import kotlin.system.exitProcess
 
 
@@ -122,7 +125,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
                 var promotionOnSaleTotal = mViewModel.discountSpecial.get()
                 var discountTotal = mViewModel.discount.get()
                 var data = orderProductAdapter.data
-                data.addAll(posBuyPartsDeleted)
+                var arrayList = ArrayList<InsertOrderProductDTO>()
+                arrayList.addAll(data)
+                arrayList.addAll(posBuyPartsDeleted)
 
                 "$realName 付款方式：${payMethod.name} 支付码：$barcode".dXLog()
                 requestMainViewModel.createOrder(
@@ -131,7 +136,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
                     payAmount.toDouble(),
                     promotionOnSaleTotal.toDouble(),
                     discountTotal.toDouble(),
-                    data,
+                    arrayList,
                     payMethod,
                     barcode
                 )
@@ -169,10 +174,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
         recyclerView.adapter = orderProductAdapter
         orderProductAdapter.addHeaderView(View.inflate(this, R.layout.item_order_header, null))
         orderProductAdapter.run {
-            addChildClickViewIds(R.id.iv_item_delete, R.id.tv_count_add, R.id.tv_count_reduce)
+            addChildClickViewIds(R.id.rl_item_delete, R.id.tv_count_add, R.id.tv_count_reduce)
             setOnItemChildClickListener { adapter, view, position ->
                 when (view.id) {
-                    R.id.iv_item_delete -> {
+                    R.id.rl_item_delete -> {
                         var messageDialog = MessagePopupWindow(this@MainActivity)
                         messageDialog.showPopupWindow()
                         messageDialog.setData("单品删除", "是否取消当前商品", "取消", "确定")
@@ -269,6 +274,15 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(),
                 scanGunKeyEventHelper?.setOnBarCodeCatchListener(this)
             }
         }
+        et_search_content.setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                hideKeyboard()
+                val textStringTrim = et_search_content.textStringTrim()
+                requestMainViewModel.getKeyWords(textStringTrim)
+            }
+
+            return@setOnEditorActionListener false
+        }
 
     }
 

app/src/main/java/com/ypsx/yppos/ui/popup/SettingsPopupWindow.kt

@@ -55,6 +55,7 @@ class SettingsPopupWindow(context: Context?) : BasePopupWindow(context) {
 
     inner class ProxyClick {
         fun print() {
+            dismiss()
             "${CacheUtil.getRealName()}打印最后一条付款成功记录".dXLog()
             scope.launch {
                 kotlin.runCatching {
@@ -74,7 +75,7 @@ class SettingsPopupWindow(context: Context?) : BasePopupWindow(context) {
                         }
                     }
                 }.onSuccess {
-
+                    "打印完成".toastSuccess()
                 }.onFailure {
                 }
             }

app/src/main/java/com/ypsx/yppos/utils/PrintUtils.kt

 package com.ypsx.yppos.utils
 
 import android.device.PrinterManager
+import android.widget.Toast
+import com.blankj.utilcode.util.Utils.runOnUiThread
 import com.ypsx.yppos.http.data.bean.OrderDetailsResponse
 import com.ypsx.yppos.http.data.entity.PosPayMethod
 import com.ypsx.yppos.room.entity.PosBuy
@@ -319,6 +321,7 @@ object PrintUtils {
             status = printerManager.printPage(0) //Execution printing
             printerManager.paperFeed(16) //paper feed
         }
+        updatePrintStatus(status)
     }
 
 
@@ -334,11 +337,10 @@ object PrintUtils {
             builder.append(" ")
         }
         builder.append(content)
-        builder.toString().dXLog()
         return builder.toString()
     }
 
-    fun getPriceSpace(
+    private fun getPriceSpace(
         barCode: String,
         paymentProductQuantity: Double,
         price: Double,
@@ -398,6 +400,31 @@ object PrintUtils {
         return valueLength
     }
 
+    private fun updatePrintStatus(status: Int) {
+        runOnUiThread(Runnable {
+            when (status) {
+                PRNSTS_OUT_OF_PAPER -> {
+                    "缺纸!!!".toast()
+                }
+                PRNSTS_OVER_HEAT -> {
+                    "过温保护!!!".toast()
+                }
+                PRNSTS_UNDER_VOLTAGE -> {
+                    "电池电压过低!!!".toast()
+                }
+                PRNSTS_BUSY -> {
+                    "打印机忙!!!".toast()
+                }
+                PRNSTS_ERR -> {
+                    "打印机出错!!!".toast()
+                }
+                PRNSTS_ERR_DRIVER -> {
+                    "打印机驱动出错!!!".toast()
+                }
+            }
+        })
+    }
+
 
     fun printLast(
         posConfig: PosConfig,
@@ -696,6 +723,7 @@ object PrintUtils {
             status = printerManager.printPage(0) //Execution printing
             printerManager.paperFeed(16) //paper feed
         }
+        updatePrintStatus(status)
     }
 
 }
\ No newline at end of file

app/src/main/java/com/ypsx/yppos/utils/ToastUtils.kt

@@ -17,7 +17,7 @@ fun String.toastSign() {
 
 
 fun String.toastSuccess() {
-    ToastUtils.setView(R.layout.toast_failed)
+    ToastUtils.setView(R.layout.toast_success)
     ToastUtils.setGravity(Gravity.CENTER)
     ToastUtils.show(this)
 }

app/src/main/java/com/ypsx/yppos/viewmodel/request/RequestMainViewModel.kt

@@ -221,9 +221,13 @@ class RequestMainViewModel : BaseViewModel() {
                     }
                 }
                 var activitys = product.activityInfo
+                var activitysList:ArrayList<ActivityInfoDTO>? = null
+                if (activitys != null) {
+                   activitysList =  arrayListOf(activitys)
+                }
                 var activityPrice = activitys?.activityPrice ?: 0.0
                 val posBuyPart = InsertOrderProductDTO(
-                    activitys = activitys,
+                    activitys = activitysList,
                     activityPrice = activityPrice,
                     amount = product.payApportionAmount ?: 0.0,
                     discountTotal = product.discountTotal ?: 0.0,
@@ -326,6 +330,7 @@ class RequestMainViewModel : BaseViewModel() {
                 PrintUtils.print(posConfig!!, it)
             }, {
                 "打印完成".dXLog()
+                "打印完成".toastSuccess()
             })
 
         })

app/src/main/java/com/ypsx/yppos/viewmodel/state/SettingsViewModel.kt

@@ -10,6 +10,8 @@ class SettingsViewModel : BaseViewModel() {
     var version = StringObservableField()
     var storeName = StringObservableField()
     var userName = StringObservableField()
+    var posCode = StringObservableField()
+
 
 
 
@@ -19,7 +21,8 @@ class SettingsViewModel : BaseViewModel() {
         version.set("版本号：V${AppUtils.getAppVersionName()}")
         val loginResponse = CacheUtil.getLoginResponse()
         storeName.set(loginResponse!!.loginUser.orgName)
-        userName.set("用户：${loginResponse.loginUser.realName}${loadConfig?.code}")
+        userName.set("用户：${loginResponse.loginUser.realName}")
+        posCode.set("机号：${loadConfig?.code}")
 
     }
 

app/src/main/res/layout/item_pos_product.xml

@@ -30,7 +30,13 @@
             tools:text="条码：289771828928229"
 
             />
-
+        <RelativeLayout
+            android:id="@+id/rl_item_delete"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            >
             <ImageView
                 android:id="@+id/iv_item_delete"
                 android:layout_width="wrap_content"
@@ -38,6 +44,9 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:src="@mipmap/ic_item_delete" />
+        </RelativeLayout>
+
+
 
     </RelativeLayout>
 

app/src/main/res/layout/popup_settings.xml

@@ -59,6 +59,14 @@
                     android:textColor="@color/white"
                     android:textSize="15sp" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:text="@{vm.posCode}"
+                    android:textColor="@color/white"
+                    android:textSize="15sp" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

base/build.gradle

@@ -20,10 +20,24 @@ android {
     }
 
     buildTypes {
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        sit {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        pre {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+
+
     }
     buildFeatures {
         dataBinding = true
@@ -43,7 +57,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.0'
     //kotlin
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
     //lifecycle
     api 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'

base/src/main/java/com/ypsx/base/base/BaseApp.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
-import com.hjq.toast.ToastUtils
 
 /**
  * 作者　: hegaojian
@@ -27,8 +26,7 @@ open class BaseApp : Application(), ViewModelStoreOwner {
 
     override fun onCreate() {
         super.onCreate()
-        // 初始化 Toast 框架
-        ToastUtils.init(this);
+
         mAppViewModelStore = ViewModelStore()
     }
 

gradle.properties

@@ -23,6 +23,12 @@ RELEASE_STORE_PASSWORD=yppos123456
 RELEASE_STORE_FILE=./yppos.jks
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-DEBUG_HOST="http://139.196.77.98:81/"
-RETURN_DEBUG_HOST="http://se-regression.wmdigit.com/"
-RELEASE_HOST="http://demo2.wmdigit.com/"
+DEBUG_HOST="https://test-cpos.ypshengxian.com/"
+SIT_HOST="https://sit-cpos.ypshengxian.com/"
+PRE_HOST="https://pre-cpos.ypshengxian.com/"
\ No newline at end of file
+RELEASE_HOST="https://cpos.ypshengxian.com/"
+
+#https://cpos.ypshengxian.com ʽ
+#https://pre-cpos.ypshengxian.com
+#https://sit-cpos.ypshengxian.com
+#https://test-cpos.ypshengxian.com
\ No newline at end of file