9 Commits 9de928e941 ... 1cda0cafa4

Tác giả SHA1 Thông báo Ngày
  Trishia 1cda0cafa4 This includles iotivity library passed CT4.1.1 Bridge, VOD and VOD List behaviour with CTT 2002.4.2 fully. 4 năm trước cách đây
  Trishia f8c08c4b47 code cleansing 4 năm trước cách đây
  Trishia b133f55169 Read files for pki certs and idd was modified to add 0x00 at the end of byte array. 4 năm trước cách đây
  Trishia ac5c051667 jni library was updated. 4 năm trước cách đây
  Trishia 0199dd5fbd onboarding and pairwising interval was increased for stable operation. 4 năm trước cách đây
  Trishia a0c98c750c x86_64 folder was removed in .gitignore 4 năm trước cách đây
  Trishia a6ccabcec2 VOD reset issue was solved via modifying oc_sec_ael_init() in oc_ael.c. 4 năm trước cách đây
  Trishia 524094cde9 And ocfbridge branch 2020.09.29 was merged. 4 năm trước cách đây
  Trishia f5dc626e40 jni library was updated. 4 năm trước cách đây

+ 1 - 1
OnBoardingTool/app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion = '28.0.3'
     buildToolsVersion = '28.0.3'
     defaultConfig {
     defaultConfig {
         applicationId "org.iotivity.onboardingtool"
         applicationId "org.iotivity.onboardingtool"
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 26
         targetSdkVersion 26
         versionCode 1
         versionCode 1
         versionName "1.0"
         versionName "1.0"

BIN
OnBoardingTool/app/libs/iotivity-lite.jar


+ 9 - 3
OnBoardingTool/app/src/main/java/org/iotivity/onboardingtool/FactoryPresetsHandler.java

@@ -9,6 +9,7 @@ import org.iotivity.oc.OcObt;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
+import java.util.Arrays;
 
 
 public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
 public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
 
 
@@ -117,8 +118,6 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             Log.e(TAG, "Error installing root ca3 certificate");
             Log.e(TAG, "Error installing root ca3 certificate");
             return;
             return;
         }
         }
-
-
     }
     }
 
 
     public byte[] getFileBytes(String filepath) {
     public byte[] getFileBytes(String filepath) {
@@ -159,6 +158,13 @@ public class FactoryPresetsHandler implements OCFactoryPresetsHandler {
             Log.e(TAG, "Failed to read " + filepath);
             Log.e(TAG, "Failed to read " + filepath);
         }
         }
 
 
-        return ((baos != null) ? baos.toByteArray() : null);
+        if(baos!=null) {
+            int len = baos.toByteArray().length ;
+            byte[] result = Arrays.copyOf(baos.toByteArray(), len + 1);
+            result[len] = (byte)0x00;
+            Log.d(TAG, "bytes length = " + result.length);
+            return result ;
+        }
+        return null ;
     }
     }
 }
 }

+ 3 - 4
OnBoardingTool/app/src/main/java/org/iotivity/onboardingtool/OnBoardingActivity.java

@@ -99,7 +99,6 @@ public class OnBoardingActivity extends AppCompatActivity {
             obtPlatform.systemInit(handler);
             obtPlatform.systemInit(handler);
             obt = new OcObt();
             obt = new OcObt();
 
 
-            //this.scheduledTaskInit();
         }
         }
     }
     }
 
 
@@ -1450,7 +1449,7 @@ public class OnBoardingActivity extends AppCompatActivity {
                         removeUnownedDevice(deviceInfo);
                         removeUnownedDevice(deviceInfo);
                     }
                     }
                 }
                 }
-            }, 3000 * index);
+            }, 4000 * index); // 3000 -> 4000
         }
         }
 
 
     }
     }
@@ -1523,7 +1522,7 @@ public class OnBoardingActivity extends AppCompatActivity {
                                 }
                                 }
 
 
                                 try {
                                 try {
-                                    Thread.sleep(1500);
+                                    Thread.sleep(2500); // 1500 -> 2500
                                 } catch (InterruptedException e) {
                                 } catch (InterruptedException e) {
                                     e.printStackTrace();
                                     e.printStackTrace();
                                 }
                                 }
@@ -1578,7 +1577,7 @@ public class OnBoardingActivity extends AppCompatActivity {
                                 removeOwnedDevice(deviceInfo);
                                 removeOwnedDevice(deviceInfo);
                             }
                             }
                         }
                         }
-                    }, 1000 * iLoop);
+                    }, 1500 * iLoop);  // 1000 -> 1500
 
 
                 }
                 }
             }
             }

BIN
OnBoardingTool/app/src/main/jniLibs/arm64-v8a/libiotivity-lite-jni.so


BIN
OnBoardingTool/app/src/main/jniLibs/armeabi-v7a/libiotivity-lite-jni.so


BIN
OnBoardingTool/app/src/main/jniLibs/x86/libiotivity-lite-jni.so


+ 1 - 1
OnBoardingTool/app/src/main/jniLibs/x86_64/.gitignore

@@ -1,2 +1,2 @@
-*.so
+
 
 

BIN
OnBoardingTool/app/src/main/jniLibs/x86_64/libiotivity-lite-jni.so