Merge remote-tracking branch 'origin/master'

KeyBoardView/build.gradle

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

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

@@ -77,7 +77,10 @@ class NumberKeyBoard : QmKeyboardView {
         }
 
         override fun onKey(primaryCode: Int, keyCodes: IntArray?) {
-
+            //判断没有初始化
+            if (!::editWidget.isInitialized) {
+                return
+            }
             val editable = editWidget.editableText
             when (primaryCode) {
                 Code.CLEAR.code -> {

app/build.gradle

@@ -15,6 +15,11 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false

app/src/main/AndroidManifest.xml

@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <application
         android:name=".App"
             android:allowBackup="true"

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

@@ -70,7 +70,7 @@ class BtListActivity : AppCompatActivity(), View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_bt_list)
-        Log.d(TAG, "onCreate: ")
+        Log.d(TAG, "onCreate: model= ${Build.MODEL} brand = ${Build.BRAND} ")
         PrintManagerUtils.getInstance().getSearchBlueToothList(object : BlueToothSearchCallBack {
             override fun onRefuseGrantPermission() {
 

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

@@ -39,10 +39,12 @@ class MainActivityPtinter : AppCompatActivity(), PrintConnOrDisCallBack {
     private val TAG = "MainActivity"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
+        Log.d(TAG, "onCreate: brand= ${Build.BRAND} model= ${Build.MODEL}")
         setContentView(R.layout.activity_main_printer)
         DeviceManagerUtils.getInstance().addConnectStatusCallBack(this)
         initUsbPrinter()
+        val value = Utils.getSN()
+        Log.d(TAG, "onCreate: value= $value")
         tv_connect_bt.setOnClickListener {
             startActivity(Intent(this, BtListActivity::class.java))
         }

app/src/main/java/com/qimai/android/widget/Utils.java

+package com.qimai.android.widget;
+
+import android.os.Build;
+
+import java.lang.reflect.Method;
+
+/**
+ * <pre>
+ *     author : leiwang
+ *     e-mail : xxx@xx
+ *     time   : 2021/08/12
+ *     desc   :
+ *     version: 1.0
+ * </pre>
+ */
+public class Utils {
+
+    /**
+     * 获取SN
+     * @return
+     */
+    public static String getSN()
+    {
+        String serial = "";
+        //通过android.os获取sn号
+        try {
+            serial = android.os.Build.SERIAL;
+            if (!serial.equals("") && !serial.equals("unknown")) {
+                return serial;
+            }
+        } catch (Exception e) {
+            serial = "";
+        }
+
+        //通过反射获取sn号
+        try {
+            Class<?> c = Class . forName ("android.os.SystemProperties");
+            Method get = c . getMethod ("get", String.class);
+            serial = (String) get . invoke (c, "ro.serialno");
+            if (!serial.equals("") && !serial.equals("unknown")) return serial;
+
+            //9.0及以上无法获取到sn，此方法为补充，能够获取到多数高版本手机 sn
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) serial = Build.getSerial();
+        } catch (Exception e) {
+            serial = "";
+        }
+        return serial;
+
+    }
+}

build.gradle

@@ -20,7 +20,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

fetch/build/generated/source/buildConfig/release/com/qimai/android/tool_network/BuildConfig.java

-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.qimai.android.tool_network;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.qimai.android.tool_network";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.qimai.android.tool_network";
-  public static final String BUILD_TYPE = "release";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0";
-}

fetch/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qimai.android.tool_network"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="28" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-</manifest>
\ No newline at end of file

fetch/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json

-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"fetch-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.qimai.android.tool_network","split":""}}]
\ No newline at end of file

fetch/build/intermediates/annotation_processor_list/release/annotationProcessors.json

-{}
\ No newline at end of file

fetch/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/jniLibs"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/mergeReleaseShaders/merger.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/shaders"/></dataSet></merger>
\ No newline at end of file

fetch/build/intermediates/incremental/packageReleaseAssets/merger.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/assets"/><source path="/Users/leiwang/project/widget/fetch/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/assets"/></dataSet></merger>
\ No newline at end of file

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

-#Wed Jul 07 11:19:30 CST 2021

fetch/build/intermediates/incremental/packageReleaseResources/merged.dir/values/values.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">tool_network</string>
-</resources>
\ No newline at end of file

fetch/build/intermediates/incremental/packageReleaseResources/merger.xml

-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/release"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/main/res"><file path="/Users/leiwang/project/widget/fetch/src/main/res/values/strings.xml" qualifiers=""><string name="app_name">tool_network</string></file></source><source path="/Users/leiwang/project/widget/fetch/build/generated/res/rs/release"/><source path="/Users/leiwang/project/widget/fetch/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/leiwang/project/widget/fetch/src/release/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file

fetch/build/intermediates/library_manifest/release/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.qimai.android.tool_network"
-    android:versionCode="1"
-    android:versionName="1.0" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="28" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-</manifest>
\ No newline at end of file

fetch/build/intermediates/local_only_symbol_list/release/parseReleaseLibraryResources/R-def.txt

-R_DEF: Internal format may change without notice
-local
-string app_name

fetch/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.qimai.android.tool_network"
-4    android:versionCode="1"
-5    android:versionName="1.0" >
-6
-7    <uses-sdk
-8        android:minSdkVersion="19"
-8-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
-9        android:targetSdkVersion="28" />
-9-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml
-10
-11    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:5-78
-11-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:3:22-76
-12    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:5-81
-12-->/Users/leiwang/project/widget/fetch/src/main/AndroidManifest.xml:4:22-78
-13
-14</manifest>

fetch/build/intermediates/merged_manifests/release/output.json

-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"fetch-release.aar","fullName":"release","baseName":"release"},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.qimai.android.tool_network","split":""}}]
\ No newline at end of file

fetch/build/intermediates/packaged_res/release/values/values.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">tool_network</string>
-</resources>
\ No newline at end of file

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

-ݷ

\ No newline at end of file