修改打印机打印回调内容

KeyBoardView/build.gradle

@@ -37,7 +37,7 @@ repositories {
 }
 
 group 'com.qmai.android.widget'
-version '1.1.44-SNAPSHOT'
+version '1.1.45-SNAPSHOT'
 
 gradlePublish {
 

KeyBoardView/src/main/res/drawable/savestock_blue.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#3478F3" />
+</shape>
\ No newline at end of file

KeyBoardView/src/main/res/values/attrs.xml

@@ -100,4 +100,16 @@
         <attr name="keyboardMode" />
     </declare-styleable>
 
+    <!--按钮控件（CommonKeyBoardKeyBoardStyleable）的设置-->
+    <declare-styleable name="CommonKeyBoardKeyBoardStyleable">
+        <attr name="sureText" format="string" />
+        <attr name="sureTextColor" format="reference|color"/>
+        <attr name="sureTextSize" format="dimension"/>
+        <attr name="clearTextColor" format="reference|color"/>
+        <attr name="clearText" format="string"/>
+        <attr name="clearTextSize" format="dimension"/>
+        <attr name="pointColor" format="reference|color"/>
+        <attr name="pointSize" format="dimension"/>
+    </declare-styleable>
+
 </resources>
\ No newline at end of file

KeyBoardView/src/main/res/xml/inputphonekeyboard.xml

+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard xmlns:android="http://schemas.android.com/apk/res/android"
+    android:keyHeight="41dp"
+    android:horizontalGap="1dp"
+    android:verticalGap="1dp"
+    android:keyWidth="25%p">
+    <Row>
+        <Key
+            android:codes="1"
+            android:keyEdgeFlags="left"
+            android:keyLabel="1" />
+        <Key
+            android:codes="2"
+            android:keyLabel="2" />
+        <Key
+            android:codes="3"
+            android:keyEdgeFlags="right"
+            android:keyLabel="3" />
+
+        <Key
+            android:codes="11"
+            android:keyEdgeFlags="right"
+            android:isRepeatable="true"
+            android:keyLabel=""/>
+    </Row>
+    <Row>
+        <Key
+            android:codes="4"
+            android:keyEdgeFlags="left"
+            android:keyLabel="4" />
+        <Key
+            android:codes="5"
+            android:keyLabel="5" />
+        <Key
+            android:codes="6"
+            android:keyLabel="6" />
+        <Key
+            android:codes="-11"
+            android:keyEdgeFlags="right"
+            android:keyHeight="181dp"
+            android:keyLabel="结账" />
+    </Row>
+    <Row>
+        <Key
+            android:codes="7"
+            android:keyEdgeFlags="left"
+            android:keyLabel="7" />
+        <Key
+            android:codes="8"
+            android:keyLabel="8" />
+        <Key
+            android:codes="9"
+            android:keyLabel="9" />
+        <Key
+            android:codes="-"
+            android:keyEdgeFlags="right"
+            android:keyHeight="0dp"
+            />
+    </Row>
+    <Row>
+        <Key
+            android:codes="20"
+            android:keyEdgeFlags="left"
+            android:keyLabel="" />
+        <Key
+            android:codes="0"
+            android:keyLabel="0" />
+        <Key
+            android:codes="10"
+            android:isRepeatable="true"
+            android:keyIcon = "@drawable/icon_key_board_delete"
+            />
+        <Key
+            android:codes="-"
+            android:keyEdgeFlags="right"
+            android:keyHeight="0dp"
+            />
+    </Row>
+</Keyboard>
+

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

@@ -117,6 +117,46 @@
                 android:keyBackground="@drawable/stockbtn_keyboard_key"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
+
+        <com.qmai.android.keyboard.CommonKeyBoardKeyBoard
+            android:id="@+id/keyPhone"
+            android:layout_marginLeft="140dp"
+            android:layout_marginRight="140dp"
+            android:layout_marginTop="20dp"
+            android:background="@drawable/shape_key"
+            android:paddingRight="1dp"
+            android:keyTextColor="#333333"
+            android:paddingTop="1dp"
+            android:paddingBottom="1dp"
+            android:paddingLeft="1dp"
+            android:keyTextSize="16sp"
+            android:verticalGap= "10dp"
+            android:shadowColor="#ffffff"
+            android:keyBackground="@drawable/stockbtn_keyboard_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <com.qmai.android.keyboard.MoneyNumberKeyBoardKeyBoard
+            android:id="@+id/moneyKeyboard"
+            app:layout_constraintTop_toBottomOf="@+id/quickInputRecycler"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="100dp"
+            android:layout_marginRight="100dp"
+            android:background="@drawable/shape_key"
+            android:keyBackground="@drawable/stockbtn_keyboard_key"
+            android:keyTextColor="@color/black"
+            android:keyTextSize="18sp"
+            android:paddingStart="1dp"
+            android:layout_alignParentBottom="true"
+            android:paddingTop="1dp"
+            android:paddingEnd="4dp"
+            android:paddingBottom="1dp"
+            android:shadowColor="#ffffff"
+            android:layout_marginBottom="16dp"
+            android:layout_gravity="bottom|center_horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent" />
     </LinearLayout>
 
 

websocket/build.gradle

@@ -3,11 +3,11 @@ apply plugin: "com.whl.gradle-publish-plugin"
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 27
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -22,7 +22,7 @@ android {
 }
 
 group 'com.qmai.android.sdk'
-version '2.1.5-SNAPSHOT'
+version '3.0.0.2-SNAPSHOT'
 
 gradlePublish {
 

websocket/src/main/assets/litepal.xml

@@ -19,7 +19,7 @@
 			For example:
     	<version value="1" />
     -->
-    <version value="3" />
+    <version value="4" />
 
     <!--
     	Define your models in the list with mapping tag, LitePal will

websocket/src/main/java/com/zhimai/websocket/bean/SocketCheckMessage.kt

@@ -14,6 +14,8 @@ class SocketCheckMessage : LitePalSupport() {
     var messageId:String? = null
     //订单号
     var orderNo:String? = null
+    //消息的routingKey
+    var routingKey:String?= null
 
     //设备id
     var deviceId:String? = null
@@ -44,5 +46,8 @@ class SocketCheckMessage : LitePalSupport() {
     //是否播报
     var isPlay:String? = null
 
+    //扩展字段 预留
+    var other:String? = null
+
 
 }
\ No newline at end of file

websocket/src/main/java/com/zhimai/websocket/bean/SocketRecordBean.kt

+package com.zhimai.websocket.bean
+
+import org.litepal.crud.LitePalSupport
+
+/**
+ * @author： 高英祥
+ * @github:
+ * @time： 2021/9/29 16:27
+ * @desc：
+ * @doc:
+ */
+class SocketRecordBean : LitePalSupport() {
+    var time: String? = null
+    //当时的动作
+    var action: String? = null
+    //错误信息
+    var error: String? = null
+    //说明
+    var desc: String? = null
+
+    //预留扩展字段1
+    var otherOne:String? = null
+    //预留扩展字段2
+    var otherTwo:String? =null
+}
\ No newline at end of file

websocket/src/main/java/com/zhimai/websocket/util/RxTimerUtil.java

@@ -18,6 +18,7 @@ public class RxTimerUtil {
     private static final String TAG = "RxTimerUtil";
     private static Disposable mDisposableTime;
     private static Disposable mDisposableSocket;
+    private static Disposable mDisposableIOTSocket;
     private static Disposable mDisposablepPrint;
     private static Disposable mDisposableOther;
 
@@ -84,6 +85,10 @@ public class RxTimerUtil {
                                 break;
                             case SysCode.RX_TIMER_TYPE.OTHER:
                                 mDisposableOther = disposable;
+                                break;
+                            case SysCode.RX_TIMER_TYPE.IOT_SOCKET_PING:
+                                mDisposableIOTSocket = disposable;
+                                break;
                         }
                     }
 
@@ -135,6 +140,14 @@ public class RxTimerUtil {
                     mDisposableOther.dispose();
                     Log.e(TAG, "====定时器取消mDisposableOther======");
                 }
+                break;
+            case SysCode.RX_TIMER_TYPE.IOT_SOCKET_PING:
+                if (mDisposableIOTSocket != null && !mDisposableIOTSocket.isDisposed()) {
+                    mDisposableIOTSocket.dispose();
+                    Log.e(TAG, "====定时器取消mDisposableIOTSocket======");
+                }
+                break;
+
         }
 
     }

websocket/src/main/java/com/zhimai/websocket/util/SysCode.java

@@ -13,6 +13,8 @@ public class SysCode {
         int SOCKET = 1;
         int PRINT = 2;
         int OTHER = 3;
+
+        int IOT_SOCKET_PING=4;
     }
 
 }