修复请求异常回调

KeyBoardView/src/main/java/com/qmai/android/keyboard/MoneyNumberKeyBoardKeyBoard.kt

@@ -204,7 +204,7 @@ private lateinit var keys: List<Keyboard.Key>
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        mHandler
+
         Log.d("TAG", "onDetachedFromWindow: ")
     }
 }
\ No newline at end of file

app/src/main/java/com/qimai/android/widget/MainActivityPtinter.kt

@@ -11,10 +11,7 @@ import com.qimai.android.widget.R
 import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_main_printer.*
 import kotlinx.coroutines.*
-import zs.qimai.com.printer2.callback.PrintCallBack
-import zs.qimai.com.printer2.callback.PrintConnOrDisCallBack
-import zs.qimai.com.printer2.callback.UsbPrintConnCallBack
-import zs.qimai.com.printer2.callback.UsbSearchCallBack
+import zs.qimai.com.printer2.callback.*
 import zs.qimai.com.printer2.canvas.LabelTemplete
 import zs.qimai.com.printer2.canvas.TestPrintTemplate
 import zs.qimai.com.printer2.executer.PrintExecutor
@@ -91,6 +88,23 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack {
                 }
             }
         }
+        tv_connect_wifi.setOnClickListener {
+            PrintManagerUtils.getInstance().wifiConnect("192.168.10.165",
+                object : OnConnectCallBack {
+                    override fun onConnectStart() {
+                        Log.d(TAG, "onConnectStart: ")
+                    }
+
+                    override fun onConnectSuccess(device: DeviceManager?) {
+                        Log.d(TAG, "onConnectSuccess: device= $device")
+                    }
+
+                    override fun onConnectError(errCode: Int, errMsg: String?) {
+                        Log.d(TAG, "onConnectError: $errMsg")
+                    }
+
+                })
+        }
 
         GlobalScope.launch(Dispatchers.IO) {
             one()
@@ -114,10 +128,21 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack {
 
 
     private fun initUsbPrinter() {
+        DeviceManagerUtils.getInstance().addConnectStatusCallBack(object : PrintConnOrDisCallBack {
+            override fun onConectPrint(device: DeviceManager) {
+                Log.d(TAG, "onConectPrint: deviceId = ${device.deviceId}")
+            }
+
+            override fun onDisPrint(device: DeviceManager) {
+                Log.d(TAG, "onDisPrint: deviceId= ${device.deviceId}")
+            }
+
+        })
         val usbDevices = mutableMapOf<String, UsbDevice>()
         PrintManagerUtils.getInstance()
             .getSearchUsbList(object : UsbSearchCallBack {
                 override fun onSearchStart() {}
+
                 @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
                 override fun onSearchFound(
                     s: String,
@@ -151,6 +176,7 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack {
                 }
             })
     }
+
     private suspend fun two() {
         withContext(Dispatchers.IO) {
             Log.d(TAG, "two: ")

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

@@ -45,6 +45,18 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <TextView
+        android:id="@+id/tv_connect_wifi"
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:text="wifi连接"
+        android:textSize="22sp"
+        android:gravity="center"
+        android:textColor="#000"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
     <TextView
         android:id="@+id/tv_disconnect_usb"
         android:layout_width="match_parent"

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.4.20'
     ext.lintVersion = '26.5.0'
     ext.lifecycle_version = "2.2.5"
-    ext. widgetlib_version = "1.1.26-SNAPSHOT"
+    ext. widgetlib_version = "1.1.33-SNAPSHOT"
     repositories {
         maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }// 阿里云镜像
         maven { url 'http://maven.aliyun.com/nexus/content/repositories/jcenter' }

fetch/build.gradle

@@ -56,7 +56,7 @@ repositories {
     mavenCentral()
 }
 group 'com.qmai.android.fetch'
-version '1.2.40-SNAPSHOT'
+version '1.2.41-SNAPSHOT'
 
 gradlePublish {
 

fetch/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

-#Wed Feb 03 15:07:42 CST 2021
+#Sun Apr 18 15:47:32 CST 2021

fetch/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt

@@ -390,6 +390,7 @@ color button_material_dark
 color button_material_light
 color color_222222
 color color_777777
+color color_80
 color dim_foreground_disabled_material_dark
 color dim_foreground_disabled_material_light
 color dim_foreground_material_dark
@@ -414,6 +415,7 @@ color material_grey_850
 color material_grey_900
 color notification_action_color_filter
 color notification_icon_bg_color
+color notification_material_background_media_default_color
 color primary_dark_material_dark
 color primary_dark_material_light
 color primary_material_dark
@@ -556,6 +558,10 @@ dimen notification_small_icon_size_as_large
 dimen notification_subtext_size
 dimen notification_top_pad
 dimen notification_top_pad_large_text
+dimen subtitle_corner_radius
+dimen subtitle_outline_width
+dimen subtitle_shadow_offset
+dimen subtitle_shadow_radius
 dimen tooltip_corner_radius
 dimen tooltip_horizontal_padding
 dimen tooltip_margin
@@ -659,6 +665,7 @@ drawable btn_radio_off_to_on_mtrl_animation
 drawable btn_radio_on_mtrl
 drawable btn_radio_on_to_off_mtrl_animation
 drawable btn_shape
+drawable griddivide
 drawable notification_action_background
 drawable notification_bg
 drawable notification_bg_low
@@ -730,6 +737,7 @@ id accessibility_custom_action_6
 id accessibility_custom_action_7
 id accessibility_custom_action_8
 id accessibility_custom_action_9
+id action0
 id action_bar
 id action_bar_activity_content
 id action_bar_container
@@ -760,6 +768,7 @@ id async
 id blocking
 id bottom
 id buttonPanel
+id cancel_action
 id check
 id checkbox
 id checked
@@ -773,6 +782,7 @@ id default_activity_button
 id dialog_button
 id edit_query
 id end
+id end_padder
 id expand_activities_button
 id expanded_menu
 id forever
@@ -790,6 +800,7 @@ id line3
 id listMode
 id list_item
 id llToast
+id media_actions
 id message
 id multiply
 id none
@@ -829,6 +840,7 @@ id src_atop
 id src_in
 id src_over
 id start
+id status_bar_latest_event_content
 id submenuarrow
 id submit_area
 id tabMode
@@ -901,8 +913,17 @@ layout custometoast
 layout loading
 layout notification_action
 layout notification_action_tombstone
+layout notification_media_action
+layout notification_media_cancel_action
+layout notification_template_big_media
+layout notification_template_big_media_custom
+layout notification_template_big_media_narrow
+layout notification_template_big_media_narrow_custom
 layout notification_template_custom_big
 layout notification_template_icon_group
+layout notification_template_lines_media
+layout notification_template_media
+layout notification_template_media_custom
 layout notification_template_part_chronometer
 layout notification_template_part_time
 layout qm_alert_content
@@ -952,6 +973,7 @@ string abc_shareactionprovider_share_with
 string abc_shareactionprovider_share_with_application
 string abc_toolbar_collapse_description
 string app_name
+string hello_blank_fragment
 string search_menu_title
 string status_bar_notification_info_overflow
 style AlertDialog_AppCompat
@@ -1115,7 +1137,6 @@ style Base_Widget_AppCompat_TextView
 style Base_Widget_AppCompat_TextView_SpinnerItem
 style Base_Widget_AppCompat_Toolbar
 style Base_Widget_AppCompat_Toolbar_Button_Navigation
-style DialogFragment
 style Platform_AppCompat
 style Platform_AppCompat_Light
 style Platform_ThemeOverlay_AppCompat
@@ -1242,9 +1263,14 @@ style TextAppearance_AppCompat_Widget_Switch
 style TextAppearance_AppCompat_Widget_TextView_SpinnerItem
 style TextAppearance_Compat_Notification
 style TextAppearance_Compat_Notification_Info
+style TextAppearance_Compat_Notification_Info_Media
 style TextAppearance_Compat_Notification_Line2
+style TextAppearance_Compat_Notification_Line2_Media
+style TextAppearance_Compat_Notification_Media
 style TextAppearance_Compat_Notification_Time
+style TextAppearance_Compat_Notification_Time_Media
 style TextAppearance_Compat_Notification_Title
+style TextAppearance_Compat_Notification_Title_Media
 style TextAppearance_Widget_AppCompat_ExpandedMenu_Item
 style TextAppearance_Widget_AppCompat_Toolbar_Subtitle
 style TextAppearance_Widget_AppCompat_Toolbar_Title
@@ -1353,6 +1379,7 @@ style Widget_AppCompat_Toolbar
 style Widget_AppCompat_Toolbar_Button_Navigation
 style Widget_Compat_NotificationActionContainer
 style Widget_Compat_NotificationActionText
+style Widget_DialogFragment
 style Widget_Support_CoordinatorLayout
 styleable ActionBar background backgroundSplit backgroundStacked contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation customNavigationLayout displayOptions divider elevation height hideOnContentScroll homeAsUpIndicator homeLayout icon indeterminateProgressStyle itemPadding logo navigationMode popupTheme progressBarPadding progressBarStyle subtitle subtitleTextStyle title titleTextStyle
 styleable ActionBarLayout android_layout_gravity

fetch/build/kotlin/compileReleaseKotlin/caches-jvm/jvm/kotlin/proto.tab.values.s

-


+--broken encoding: IBM420_ltr
\ No newline at end of file

fetch/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/counters.tab

-41
-2
+40
+0
\ No newline at end of file

fetch/build/publications/maven/pom-default.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.qmai.android.fetch</groupId>
   <artifactId>fetch</artifactId>
-  <version>1.2.40-SNAPSHOT</version>
+  <version>1.2.41-SNAPSHOT</version>
   <packaging>aar</packaging>
   <dependencies>
     <dependency>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>com.qmai.android.sdk</groupId>
       <artifactId>widgetlib</artifactId>
-      <version>1.1.26-SNAPSHOT</version>
+      <version>1.1.33-SNAPSHOT</version>
       <scope>runtime</scope>
       <exclusions/>
     </dependency>

fetch/build/tmp/publishMavenPublicationToMavenRepository/module-maven-metadata.xml

@@ -3,47 +3,11 @@
   <groupId>com.qmai.android.fetch</groupId>
   <artifactId>fetch</artifactId>
   <versioning>
-    <latest>1.2.40-SNAPSHOT</latest>
+    <latest>1.2.41-SNAPSHOT</latest>
     <versions>
-      <version>1.2.3-SNAPSHOT</version>
-      <version>1.2.4-SNAPSHOT</version>
-      <version>1.2.5-SNAPSHOT</version>
-      <version>1.2.6-SNAPSHOT</version>
-      <version>1.2.7-SNAPSHOT</version>
-      <version>1.2.8-SNAPSHOT</version>
-      <version>1.2.9-SNAPSHOT</version>
-      <version>1.2.10-SNAPSHOT</version>
-      <version>1.2.11-SNAPSHOT</version>
-      <version>1.2.12-SNAPSHOT</version>
-      <version>1.2.13-SNAPSHOT</version>
-      <version>1.2.14-SNAPSHOT</version>
-      <version>1.2.2-SNAPSHOT</version>
-      <version>1.2.15-SNAPSHOT</version>
-      <version>1.2.16-SNAPSHOT</version>
-      <version>1.2.17-SNAPSHOT</version>
-      <version>1.2.18-SNAPSHOT</version>
-      <version>1.2.19-SNAPSHOT</version>
-      <version>1.2.20-SNAPSHOT</version>
-      <version>1.2.21-SNAPSHOT</version>
-      <version>1.2.22-SNAPSHOT</version>
-      <version>1.2.23-SNAPSHOT</version>
-      <version>1.2.24-SNAPSHOT</version>
-      <version>1.2.25-SNAPSHOT</version>
-      <version>1.2.26-SNAPSHOT</version>
-      <version>1.2.27-SNAPSHOT</version>
-      <version>1.2.28-SNAPSHOT</version>
-      <version>1.2.30-SNAPSHOT</version>
-      <version>1.2.31-SNAPSHOT</version>
-      <version>1.2.32-SNAPSHOT</version>
-      <version>1.2.33-SNAPSHOT</version>
-      <version>1.2.34-SNAPSHOT</version>
-      <version>1.2.35-SNAPSHOT</version>
-      <version>1.2.36-SNAPSHOT</version>
-      <version>1.2.37-SNAPSHOT</version>
-      <version>1.2.38-SNAPSHOT</version>
-      <version>1.2.39-SNAPSHOT</version>
       <version>1.2.40-SNAPSHOT</version>
+      <version>1.2.41-SNAPSHOT</version>
     </versions>
-    <lastUpdated>20210218064847</lastUpdated>
+    <lastUpdated>20210418075341</lastUpdated>
   </versioning>
 </metadata>

fetch/build/tmp/publishMavenPublicationToMavenRepository/snapshot-maven-metadata.xml

@@ -2,29 +2,29 @@
 <metadata modelVersion="1.1.0">
   <groupId>com.qmai.android.fetch</groupId>
   <artifactId>fetch</artifactId>
-  <version>1.2.40-SNAPSHOT</version>
+  <version>1.2.41-SNAPSHOT</version>
   <versioning>
     <snapshot>
-      <timestamp>20210218.064843</timestamp>
-      <buildNumber>1</buildNumber>
+      <timestamp>20210418.075338</timestamp>
+      <buildNumber>2</buildNumber>
     </snapshot>
-    <lastUpdated>20210218064843</lastUpdated>
+    <lastUpdated>20210418075338</lastUpdated>
     <snapshotVersions>
+      <snapshotVersion>
+        <extension>aar</extension>
+        <value>1.2.41-20210418.075338-2</value>
+        <updated>20210418075338</updated>
+      </snapshotVersion>
       <snapshotVersion>
         <classifier>sources</classifier>
         <extension>jar</extension>
-        <value>1.2.40-20210218.064843-1</value>
-        <updated>20210218064843</updated>
+        <value>1.2.41-20210418.075338-2</value>
+        <updated>20210418075338</updated>
       </snapshotVersion>
       <snapshotVersion>
         <extension>pom</extension>
-        <value>1.2.40-20210218.064843-1</value>
-        <updated>20210218064843</updated>
-      </snapshotVersion>
-      <snapshotVersion>
-        <extension>aar</extension>
-        <value>1.2.40-20210218.064843-1</value>
-        <updated>20210218064843</updated>
+        <value>1.2.41-20210418.075338-2</value>
+        <updated>20210418075338</updated>
       </snapshotVersion>
     </snapshotVersions>
   </versioning>

fetch/src/main/java/com/qimai/android/fetch/Response/ErrorData.kt

+package com.qimai.android.fetch.Response
+
+/**
+ * <pre>
+ *     author : leiwang
+ *     e-mail : xxx@xx
+ *     time   : 2021/04/18
+ *     desc   :
+ *     version: 1.0
+ * </pre>
+ */
+data class ErrorData(
+    var code: String? = null,
+    var errorMsg: String? = null,
+    var others: Any? = null,
+    var originThrowable: Throwable? = null
+) {
+}
\ No newline at end of file

fetch/src/main/java/com/qimai/android/fetch/Response/Resource.kt

@@ -8,7 +8,7 @@ package com.qimai.android.fetch.Response
 @Description
 @email wangwei_5521@163.com
  **/
-data class Resource<out T>(val status: Status, val data: T? = null, val message: String? = null) {
+data class Resource<out T>(val status: Status, val data: T? = null, val message: String? = null,val errorData:ErrorData? = null) {
     companion object {
         fun <T> success(data: T?): Resource<T> {
             return Resource(
@@ -18,11 +18,11 @@ data class Resource<out T>(val status: Status, val data: T? = null, val message:
             )
         }
 
-        fun <T> error(msg: String? = null, data: T? = null): Resource<T> {
+        fun <T> error(msg: String? = null, errData: ErrorData? = null): Resource<T> {
             return Resource(
                 Status.ERROR,
-                data,
-                msg
+                message = msg,
+                errorData = errData,
             )
         }
 

fetch/src/main/java/com/qimai/android/fetch/extention/ViewModelExtention.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.liveData
 import androidx.lifecycle.viewModelScope
+import com.qimai.android.fetch.Response.ErrorData
 import com.qimai.android.fetch.Response.Resource
 import com.qimai.android.fetch.Response.Status
 import com.qimai.android.fetch.convert.BizException
@@ -94,35 +95,36 @@ fun <T> ViewModel.flowSafeCall(request: () -> T) = liveData<Resource<T>> {
 fun <T> handleResponseError(throwable: Throwable?): Resource<T> {
     Log.d(TAG, "handleResponseError: throwable= $throwable")
     return when (throwable) {
-        null -> Resource.error("程序出错", null)
+        null -> Resource.error("程序出错", ErrorData(originThrowable = throwable))
         is HttpException -> when (throwable.code()) {
             UNAUTHORIZED, FORBIDDEN, NOT_FOUND, REQUEST_TIMEOUT,
             INTERNAL_SERVER_ERROR, BAD_GATEWAY, SERVICE_UNAVAILABLE, GATEWAY_TIMEOUT -> {
-                Resource.error("当前网络状态不稳定,请检查当前网络", null)
+                Resource.error("当前网络状态不稳定,请检查当前网络", ErrorData(originThrowable = throwable))
             }
             else -> {
-                Resource.error("当前网络状态不稳定,请检查当前网络", null)
+                Resource.error("当前网络状态不稳定,请检查当前网络", ErrorData(originThrowable = throwable))
             }
         }
         is TOKENExpireException ->
-            Resource.error(throwable.message ?: "token过期", null)
+            Resource.error(throwable.message ?: "token过期", ErrorData(originThrowable = throwable))
 
         is ServerResponseException -> // 解析json
-            Resource.error("服务端返回格式错误", null)
+            Resource.error("服务端返回格式错误", ErrorData(originThrowable = throwable))
         is ConnectException, is UnknownHostException ->
-            Resource.error("当前网络状态不稳定,请检查当前网络", null)
+            Resource.error("当前网络状态不稳定,请检查当前网络", ErrorData(originThrowable = throwable))
         is BizException ->
             Resource.error(
                 throwable.message!!,
-                BaseData(throwable.code, null, "", "false") as T
+                ErrorData(throwable.code.toString(),errorMsg= throwable.message,originThrowable = throwable)
+
             )
         is UnknownHostException ->
-            Resource.error("当前网络状态不稳定,请检查当前网络", null)
+            Resource.error("当前网络状态不稳定,请检查当前网络", ErrorData(originThrowable = throwable))
         else -> {
             if (!TextUtils.isEmpty(throwable.message)) {
-                Resource.error(throwable.message!!, null)
+                Resource.error(throwable.message!!, ErrorData(originThrowable = throwable))
             } else {
-                Resource.error("当前网络状态不稳定,请检查当前网络", null)
+                Resource.error("当前网络状态不稳定,请检查当前网络", ErrorData(originThrowable = throwable))
             }
         }
 

printer/build.gradle

@@ -51,7 +51,7 @@ repositories {
 }
 
 group 'com.qmai.android.print'
-version '1.1.29-SNAPSHOT'
+version '1.1.33.21-SNAPSHOT'
 
 gradlePublish {
 

printer/src/main/java/zs/qimai/com/printer2/callback/OnConnectCallBack.kt

+package zs.qimai.com.printer2.callback
+
+import zs.qimai.com.printer2.manager.DeviceManager
+
+interface OnConnectCallBack {
+    fun onConnectStart()
+    fun onConnectSuccess(device: DeviceManager?)
+    fun onConnectError(errCode: Int,errMsg:String?=null)
+}
\ No newline at end of file

printer/src/main/java/zs/qimai/com/printer2/manager/DeviceManager.kt

@@ -30,6 +30,9 @@ abstract class DeviceManager {
 
         //usb
         val USB = 2
+
+        //wifi（网线）
+        const val WIFI = 3
     }
 
     //连接
@@ -41,5 +44,17 @@ abstract class DeviceManager {
     abstract fun readData(bytes: ByteArray): Int
     abstract fun writeData(bytes: ByteArray)
 
+    override fun equals(other: Any?): Boolean {
+        if (other == null || other !is DeviceManager) {
+            return false
+        } else {
+            return other.deviceId == this.deviceId
+        }
+    }
+
+    override fun hashCode(): Int {
+        return deviceId.hashCode()
+    }
+
 
 }
\ No newline at end of file