From 99757f1bffd1986a675eb3d22af518f721e50708 Mon Sep 17 00:00:00 2001
From: xtc <tcymac@126.com>
Date: Thu, 19 Oct 2023 16:03:00 +0800
Subject: [PATCH] android update ttlock sdk version to 3.3.7

---
 .idea/gradle.xml                              |  1 -
 .idea/runConfigurations.xml                   | 12 ----------
 app/build.gradle                              | 13 +++++++---
 proguard-rules.pro => app/proguard-rules.pro  | 10 ++++----
 .../main/java/ttlock/demo/AuthActivity.java   |  1 +
 .../main/java/ttlock/demo/BaseActivity.java   |  5 ++++
 .../demo/gateway/InitGatewayActivity.java     |  2 ++
 .../ttlock/demo/lock/LockApiActivity.java     |  5 ++++
 .../ttlock/demo/lock/PassageModeActivity.java |  2 +-
 .../WirelessKeyboardActivity.java             | 24 ++++++++++---------
 .../res/layout/activity_admin_passcode.xml    |  2 +-
 build.gradle                                  |  7 +++++-
 12 files changed, 50 insertions(+), 34 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 rename proguard-rules.pro => app/proguard-rules.pro (99%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9bba60d..0836aa5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f5a904f..60ecbd4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,9 +11,16 @@ android {
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
+        debug {
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
+        }
         release {
-            buildConfigField "String", "API_URL", '"http://120.26.119.23:8085"'
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -47,7 +54,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation 'com.google.code.gson:gson:2.6.2'
-    implementation 'com.ttlock:ttlock:3.2.6'
+    implementation 'com.ttlock:ttlock:3.3.7'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
 }
diff --git a/proguard-rules.pro b/app/proguard-rules.pro
similarity index 99%
rename from proguard-rules.pro
rename to app/proguard-rules.pro
index 431eeca..0749dd2 100644
--- a/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -128,9 +128,7 @@
 -dontwarn okio.**
 #
 
-#库的公共对外类和方法不被混淆
--keep public class com.ttlock.bl.sdk.** {*;}
--keep class com.ttlock.bl.sdk.api.PassageModeData {*;}
+
 
 #============================Gson Start==============================
 # Gson uses generic type information stored in a class file when working with fields. Proguard
@@ -150,4 +148,8 @@
 #===========DFU======
 -keep class com.ttlock.bl.sdk.service.DfuService.**{*;}
 -keep class no.nordicsemi.android.dfu.** { *; }
-#===========DFU======
\ No newline at end of file
+#===========DFU======
+#库的公共对外类和方法不被混淆
+-keep public class com.ttlock.bl.sdk.** {*;}
+-keep class com.ttlock.bl.sdk.api.PassageModeData {*;}
+
diff --git a/app/src/main/java/ttlock/demo/AuthActivity.java b/app/src/main/java/ttlock/demo/AuthActivity.java
index 4195f5b..d557bf8 100644
--- a/app/src/main/java/ttlock/demo/AuthActivity.java
+++ b/app/src/main/java/ttlock/demo/AuthActivity.java
@@ -2,6 +2,7 @@
 
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import com.ttlock.bl.sdk.util.DigitUtil;
diff --git a/app/src/main/java/ttlock/demo/BaseActivity.java b/app/src/main/java/ttlock/demo/BaseActivity.java
index d695db3..9e5520e 100644
--- a/app/src/main/java/ttlock/demo/BaseActivity.java
+++ b/app/src/main/java/ttlock/demo/BaseActivity.java
@@ -8,6 +8,7 @@
 
 import com.ttlock.bl.sdk.api.TTLockClient;
 import com.ttlock.bl.sdk.entity.LockError;
+import com.ttlock.bl.sdk.keypad.model.KeypadError;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -51,6 +52,10 @@ public void makeErrorToast(LockError error){
         Toast.makeText(this,error.getDescription(),Toast.LENGTH_LONG).show();
     }
 
+    public void makeErrorToast(KeypadError error){
+        Toast.makeText(this,error.getDescription(),Toast.LENGTH_LONG).show();
+    }
+
 
     /**
      * make sure Bluetooth is enabled.
diff --git a/app/src/main/java/ttlock/demo/gateway/InitGatewayActivity.java b/app/src/main/java/ttlock/demo/gateway/InitGatewayActivity.java
index dba7131..b34e175 100644
--- a/app/src/main/java/ttlock/demo/gateway/InitGatewayActivity.java
+++ b/app/src/main/java/ttlock/demo/gateway/InitGatewayActivity.java
@@ -116,6 +116,8 @@ private void initListener() {
             //TODO:
             configureGatewayInfo.plugName = device.getAddress();
 
+            configureGatewayInfo.plugVersion = device.getGatewayType();
+
             GatewayClient.getDefault().initGateway(configureGatewayInfo, new InitGatewayCallback() {
                 @Override
                 public void onInitGatewaySuccess(DeviceInfo deviceInfo) {
diff --git a/app/src/main/java/ttlock/demo/lock/LockApiActivity.java b/app/src/main/java/ttlock/demo/lock/LockApiActivity.java
index 569b39a..cb26dbc 100644
--- a/app/src/main/java/ttlock/demo/lock/LockApiActivity.java
+++ b/app/src/main/java/ttlock/demo/lock/LockApiActivity.java
@@ -242,6 +242,11 @@ public void onGetLockStatusSuccess(int status) {
                 makeToast("lock status is now " + status);
             }
 
+            @Override
+            public void onGetDoorSensorStatusSuccess(int status) {
+
+            }
+
             @Override
             public void onFail(LockError error) {
                 makeErrorToast(error);
diff --git a/app/src/main/java/ttlock/demo/lock/PassageModeActivity.java b/app/src/main/java/ttlock/demo/lock/PassageModeActivity.java
index 4248819..0b4936a 100644
--- a/app/src/main/java/ttlock/demo/lock/PassageModeActivity.java
+++ b/app/src/main/java/ttlock/demo/lock/PassageModeActivity.java
@@ -67,7 +67,7 @@ private void setPassageMode2Lock(){
         modeData.setEndDate(18 * 60);//pm:  6:00
         modeData.setModeType(PassageModeType.Weekly);
         //if mode is Weekly,then the WeekDays is
-        int[] mCircleWeeksArray = {1,2,3,4,5};
+        int[] mCircleWeeksArray = {1,2,3,4};
         modeData.setRepeatWeekOrDays(GsonUtil.toJson(mCircleWeeksArray));
         showConnectLockToast();
         TTLockClient.getDefault().setPassageMode(modeData, mCurrentLock.getLockData(), mCurrentLock.getLockMac(), new SetPassageModeCallback() {
diff --git a/app/src/main/java/ttlock/demo/wireless_keyboard/WirelessKeyboardActivity.java b/app/src/main/java/ttlock/demo/wireless_keyboard/WirelessKeyboardActivity.java
index 9b24e46..83870ce 100644
--- a/app/src/main/java/ttlock/demo/wireless_keyboard/WirelessKeyboardActivity.java
+++ b/app/src/main/java/ttlock/demo/wireless_keyboard/WirelessKeyboardActivity.java
@@ -12,12 +12,14 @@
 
 import com.google.gson.reflect.TypeToken;
 import com.ttlock.bl.sdk.api.TTLockClient;
-import com.ttlock.bl.sdk.api.WirelessKeypadClient;
-import com.ttlock.bl.sdk.callback.InitKeypadCallback;
-import com.ttlock.bl.sdk.callback.ScanKeypadCallback;
 import com.ttlock.bl.sdk.constant.FeatureValue;
 import com.ttlock.bl.sdk.device.WirelessKeypad;
 import com.ttlock.bl.sdk.entity.LockError;
+import com.ttlock.bl.sdk.keypad.InitKeypadCallback;
+import com.ttlock.bl.sdk.keypad.ScanKeypadCallback;
+import com.ttlock.bl.sdk.keypad.WirelessKeypadClient;
+import com.ttlock.bl.sdk.keypad.model.InitKeypadResult;
+import com.ttlock.bl.sdk.keypad.model.KeypadError;
 import com.ttlock.bl.sdk.util.FeatureValueUtil;
 
 import java.util.HashMap;
@@ -96,15 +98,15 @@ public void onClick(WirelessKeypad device) {
          * String lockmac: the lock which need add wireless key pad Mac address
          * InitKeypadCallback callback :
          */
-        WirelessKeypadClient.getDefault().initializeKeypad(device, mCurrentLock.getLockMac(), new InitKeypadCallback() {
+        WirelessKeypadClient.getDefault().initializeKeypad(device, mCurrentLock.getLockMac(),  new InitKeypadCallback() {
             @Override
-            public void onInitKeypadSuccess(int specialValue) {
+            public void onInitKeypadSuccess(InitKeypadResult initKeypadResult) {
                 makeToast("=---add success-- upload to server to finish-");
-                uploadToServer(device,specialValue);
+                uploadToServer(device, initKeypadResult);
             }
 
             @Override
-            public void onFail(LockError error) {
+            public void onFail(KeypadError error) {
                 makeErrorToast(error);
             }
         });
@@ -124,8 +126,8 @@ public void onScanKeyboardSuccess(WirelessKeypad device) {
             }
 
             @Override
-            public void onFail(LockError error) {
-                makeErrorToast(error);
+            public void onScanFailed(int error) {
+
             }
         });
     }
@@ -154,7 +156,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
         }
     }
 
-    private void uploadToServer(WirelessKeypad device, int specialValue){
+    private void uploadToServer(WirelessKeypad device, InitKeypadResult initKeypadResult){
         ApiService apiService = RetrofitAPIManager.provideClientApi();
         HashMap<String,String> params = new HashMap<>(8);
         String wirelessKeypadAlias = "MyTestPad-" + DateUtils.getMillsTimeFormat(System.currentTimeMillis());
@@ -164,7 +166,7 @@ private void uploadToServer(WirelessKeypad device, int specialValue){
         params.put("wirelessKeyboardNumber",device.getName());
         params.put("wirelessKeyboardName",wirelessKeypadAlias);
         params.put("wirelessKeyboardMac",String.valueOf(device.getAddress()));
-        params.put("wirelessKeyboardSpecialValue",String.valueOf(specialValue));
+        params.put("wirelessKeypadFeatureValue", initKeypadResult.getFeatureValue());
         params.put("date",String.valueOf(System.currentTimeMillis()));
 
 
diff --git a/app/src/main/res/layout/activity_admin_passcode.xml b/app/src/main/res/layout/activity_admin_passcode.xml
index 639244c..eba3853 100644
--- a/app/src/main/res/layout/activity_admin_passcode.xml
+++ b/app/src/main/res/layout/activity_admin_passcode.xml
@@ -10,7 +10,7 @@
         <Button
             android:layout_width="wrap_content"
             android:layout_height="60dp"
-            app:layout_constraintTop_toBottomOf="@id/tv_end_date"
+            app:layout_constraintTop_toBottomOf="parent"
             android:id="@+id/btn_get"
             android:textAllCaps="false"
             android:text="@string/get_admin_passcode"/>
diff --git a/build.gradle b/build.gradle
index cafa0ce..a11fef8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     
+    ext {
+        agp_version = '7.2.2'
+    }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools:r8:8.0.40'
+
+        classpath "com.android.tools.build:gradle:4.1.2"
 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'