UPDATE flutter-hms-scan 2.1.0+300

Author: serdar-can

Diff for: flutter-hms-scan/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.1.0.300
+* Nullsafety migration.
+* Scan Kit SDK is updated to the newest version.
+
 ## 1.3.0.300
 * Scan Kit SDK is updated to the newest version.
 * [**Breaking Change**] HmsCustomizedView.startCustomizedView doesn't return ScanResponse anymore. All ScanResponse objects can be listenable from customizedCameraListener callback on CustomizedViewRequest.

Diff for: flutter-hms-scan/android/build.gradle

@@ -41,7 +41,7 @@ android {
 }
 
 dependencies{
-    implementation 'com.huawei.hms:scan:1.3.0.300'
+    implementation 'com.huawei.hms:scan:2.1.0.300'
     implementation 'com.huawei.hms:hianalytics:5.1.0.301'
     implementation 'android.arch.lifecycle:common:1.1.1'
     implementation 'com.google.code.gson:gson:2.8.5'

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/ScanPlugin.java

@@ -54,7 +54,7 @@ public class ScanPlugin implements FlutterPlugin, ActivityAware {
     private MethodChannel remoteViewChannel;
 
     private void initChannels(final BinaryMessenger messenger) {
-        //init channels
+        // init channels
         permissionChannel = new MethodChannel(messenger, "permissionChannel");
         scanUtilsChannel = new MethodChannel(messenger, "scanUtilsChannel");
         multiProcessorChannel = new MethodChannel(messenger, "multiProcessorChannel");
@@ -103,7 +103,7 @@ private void removeHandlers() {
     }
 
     private void removeChannels() {
-        //remove channels
+        // remove channels
         permissionChannel = null;
         scanUtilsChannel = null;
         multiProcessorChannel = null;

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/customizedview/CustomizedViewActivity.java

@@ -69,19 +69,19 @@ public class CustomizedViewActivity extends Activity {
     boolean continuouslyScan;
     Intent intent;
 
-    //Flash button image
+    // Flash button image
     private int[] img = {R.drawable.flashlight_on, R.drawable.flashlight_off};
 
-    //Declare the key. It is used to obtain the value returned from Scan Kit.
+    // Declare the key. It is used to obtain the value returned from Scan Kit.
     public static final int REQUEST_CODE_PHOTO = 0X1113;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        //HMS Logger
+        // HMS Logger
         mHMSLogger = HMSLogger.getInstance(this.getApplicationContext());
         intent = getIntent();
-        //Window options.
+        // Window options.
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_defined);
 
@@ -102,10 +102,10 @@ protected void onCreate(Bundle savedInstanceState) {
         ImageView scanFrame = findViewById(R.id.scan_area);
         flashButton = findViewById(R.id.flush_btn);
 
-        //1. Obtain the screen density to calculate the viewfinder's rectangle.
+        // 1. Obtain the screen density to calculate the viewfinder's rectangle.
         DisplayMetrics dm = getResources().getDisplayMetrics();
         float density = dm.density;
-        //2. Obtain the screen size.
+        // 2. Obtain the screen size.
         mScreenWidth = dm.widthPixels;
         mScreenHeight = dm.heightPixels;
 
@@ -115,8 +115,8 @@ protected void onCreate(Bundle savedInstanceState) {
         int scanFrameSizeHeight = (int) (SCAN_FRAME_SIZE_HEIGHT * density);
         int scanFrameSizeWidth = (int) (SCAN_FRAME_SIZE_WIDTH * density);
 
-        //3. Calculate the viewfinder's rectangle, which in the middle of the layout.
-        //Set the scanning area. (Optional. Rect can be null. If no settings are specified, it will be located in the middle of the layout.)
+        // 3. Calculate the viewfinder's rectangle, which in the middle of the layout.
+        // Set the scanning area. (Optional. Rect can be null. If no settings are specified, it will be located in the middle of the layout.)
         Rect rect = new Rect();
         rect.left = mScreenWidth / 2 - scanFrameSizeWidth / 2;
         rect.right = mScreenWidth / 2 + scanFrameSizeWidth / 2;
@@ -126,10 +126,10 @@ protected void onCreate(Bundle savedInstanceState) {
         scanFrame.getLayoutParams().height = rect.height();
         scanFrame.getLayoutParams().width = rect.width();
 
-        //Continuously Scan option from Flutter.
+        // Continuously Scan option from Flutter.
         continuouslyScan = intent.getExtras().getBoolean("continuouslyScan");
 
-        //Initialize the RemoteView instance, and set callback for the scanning result.
+        // Initialize the RemoteView instance, and set callback for the scanning result.
         RemoteView.Builder builder = new RemoteView.Builder().setContext(this)
                 .setBoundingBox(rect)
                 .setContinuouslyScan(continuouslyScan)
@@ -141,7 +141,7 @@ protected void onCreate(Bundle savedInstanceState) {
             remoteView = builder.build();
         }
 
-        //Set Method Call Handler for pause and resume actions of remote view.
+        // Set Method Call Handler for pause and resume actions of remote view.
         if (remoteViewChannel != null) {
             RemoteViewHandler remoteViewHandler = new RemoteViewHandler(remoteView, flashButton, mHMSLogger);
             remoteViewChannel.setMethodCallHandler(remoteViewHandler);
@@ -152,7 +152,7 @@ protected void onCreate(Bundle savedInstanceState) {
         remoteView.setOnResultCallback(new OnResultCallback() {
             @Override
             public void onResult(HmsScan[] result) {
-                //Check the result.
+                // Check the result.
                 if (result == null || result.length == 0 || result[0] == null || TextUtils.isEmpty(result[0].getOriginalValue())) {
                     return;
                 }
@@ -193,7 +193,7 @@ public void onResult(HmsScan[] result) {
         // Set the back, photo scanning, and flashlight operations.
         setBackOperation();
 
-        //Flash button visibility
+        // Flash button visibility
         flashButton.setVisibility(View.INVISIBLE);
 
         // When the light is dim, this API is called back to display the flashlight switch.
@@ -213,20 +213,20 @@ public void onVisibleChanged(boolean visible) {
             mHMSLogger.sendSingleEvent("remoteView.setOnLightVisibleCallback");
         }
 
-        //Flash Button option from Flutter.
+        // Flash Button option from Flutter.
         if (intent.getExtras().getBoolean("isFlashAvailable")) {
             flashButton.setVisibility(View.VISIBLE);
             setFlashOperation();
         }
 
-        //Gallery Button option from Flutter
+        // Gallery Button option from Flutter
         if (intent.getExtras().getBoolean("gallery")) {
             galleryButton.setVisibility(View.VISIBLE);
             setPictureScanOperation();
         }
     }
 
-    //Gallery button
+    // Gallery button
     private void setPictureScanOperation() {
         ImageView galleryButton = findViewById(R.id.img_btn);
         galleryButton.setOnClickListener(new View.OnClickListener() {
@@ -240,7 +240,7 @@ public void onClick(View v) {
         });
     }
 
-    //Normal flash button
+    // Normal flash button
     private void setFlashOperation() {
         flashButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -260,7 +260,7 @@ public void onClick(View v) {
         });
     }
 
-    //Back button
+    // Back button
     private void setBackOperation() {
         ImageView backButton = findViewById(R.id.back_img);
         backButton.setOnClickListener(new View.OnClickListener() {
@@ -332,6 +332,9 @@ protected void onStop() {
 
     /**
      * Handle the return results from the gallery.
+     * @param requestCode requestCode
+     * @param resultCode resultCode
+     * @param data Intent
      */
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/customizedview/CustomizedViewMethodCallHandler.java

@@ -56,7 +56,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
     }
 
     private void customizedView(MethodCall call, MethodChannel.Result result) {
-        //Arguments from call
+        // Arguments from call
         int scanType = ValueGetter.getInt("scanType", call);
         List<Integer> additionalScanTypes = call.argument("additionalScanTypes");
         int[] scanTypesIntArray = null;
@@ -71,18 +71,18 @@ private void customizedView(MethodCall call, MethodChannel.Result result) {
         boolean continuouslyScan = ValueGetter.getBoolean("continuouslyScan", call);
         boolean enableReturnBitmap = ValueGetter.getBoolean("enableReturnBitmap", call);
 
-        //List<Integer> to int[]
+        // List<Integer> to int[]
         if (additionalScanTypes != null) {
             scanTypesIntArray = ValueGetter.scanTypesListToArray(additionalScanTypes);
         }
 
-        //Intent
+        // Intent
         Intent intent = new Intent(mActivity, CustomizedViewActivity.class);
 
         intent.putExtra(Constants.CHANNEL_ID_KEY, customizedChannelId);
         intent.putExtra(Constants.CHANNEL_REMOTE_KEY, remoteChannelId);
 
-        //Intent extras
+        // Intent extras
         intent.putExtra("scanType", scanType);
         if (additionalScanTypes != null) {
             intent.putExtra("additionalScanTypes", scanTypesIntArray);
@@ -96,7 +96,7 @@ private void customizedView(MethodCall call, MethodChannel.Result result) {
         intent.putExtra("continuouslyScan", continuouslyScan);
         intent.putExtra("enableReturnBitmap", enableReturnBitmap);
 
-        //Start intent for customized view
+        // Start intent for customized view
         mActivity.startActivity(intent);
         result.success(true);
     }

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/customizedview/RemoteViewHandler.java

@@ -44,7 +44,7 @@ public class RemoteViewHandler implements MethodChannel.MethodCallHandler {
     @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result result) {
         switch (call.method) {
-            //remote view pause
+            // remote view pause
             case "pause":
                 mHMSLogger.startMethodExecutionTimer("remoteView.pauseContinuouslyScan");
                 if (remoteView != null) {
@@ -56,7 +56,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
                         Errors.remoteViewError.getErrorCode());
                 }
                 break;
-            //remote view resume
+            // remote view resume
             case "resume":
                 mHMSLogger.startMethodExecutionTimer("remoteView.resumeContinuouslyScan");
                 if (remoteView != null) {
@@ -68,7 +68,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
                         Errors.remoteViewError.getErrorCode());
                 }
                 break;
-            //Switch light
+            // Switch light
             case "switchLight":
                 mHMSLogger.startMethodExecutionTimer("remoteView.switchLight");
                 if (remoteView != null) {
@@ -87,7 +87,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull MethodChannel.Result
                     mHMSLogger.sendSingleEvent("remoteView.switchLight", Errors.remoteViewError.getErrorCode());
                 }
                 break;
-            //get light status
+            // get light status
             case "getLightStatus":
                 mHMSLogger.startMethodExecutionTimer("remoteView.getLightStatus");
                 if (remoteView != null) {

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/logger/HMSLogger.java

@@ -40,7 +40,7 @@ public final class HMSLogger {
 
     private static final String PLATFORM = "Flutter";
 
-    private static final String VERSION = "1.3.0.300";
+    private static final String VERSION = "1.3.1.300";
 
     private static final String SERVICE = "Cross-Platform";
 

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/multiprocessor/MultiProcessorActivity.java

@@ -79,15 +79,15 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Window window = getWindow();
 
-        //HMS Logger
+        // HMS Logger
         mHMSLogger = HMSLogger.getInstance(this.getApplicationContext());
 
-        //Window options
+        // Window options
         window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_multiprocessor);
 
-        //MultiProcessor mode
+        // MultiProcessor mode
         mode = Objects.requireNonNull(getIntent().getExtras()).getInt("scanMode");
 
         mMultiProcessorCamera = new MultiProcessorCamera();
@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
             multiProcessorChannel = ScanPlugin.SCAN_CHANNELS.get(channelId);
         }
 
-        //Gallery option from Flutter.
+        // Gallery option from Flutter.
         if (multiIntent.getExtras().getBoolean("gallery")) {
             galleryButton.setVisibility(View.VISIBLE);
             setPictureScanOperation();
@@ -124,7 +124,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     }
 
-    //Adjust camera and surface.
+    // Adjust camera and surface.
     private void adjustSurface(SurfaceView cameraPreview) {
         FrameLayout.LayoutParams paramSurface = (FrameLayout.LayoutParams) cameraPreview.getLayoutParams();
         if (getSystemService(Context.WINDOW_SERVICE) != null) {
@@ -157,7 +157,7 @@ private void adjustSurface(SurfaceView cameraPreview) {
         }
     }
 
-    //Back button
+    // Back button
     private void setBackOperation() {
         ImageView backButton = findViewById(R.id.back_img);
         backButton.setOnClickListener(new View.OnClickListener() {
@@ -177,7 +177,7 @@ public void onBackPressed() {
         MultiProcessorActivity.this.finish();
     }
 
-    //Gallery button
+    // Gallery button
     private void setPictureScanOperation() {
         galleryButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -189,7 +189,7 @@ public void onClick(View v) {
         });
     }
 
-    //Camera Lifecycle
+    // Camera Lifecycle
     @Override
     protected void onResume() {
         super.onResume();
@@ -218,13 +218,13 @@ protected void onDestroy() {
         super.onDestroy();
     }
 
-    //Camera start method.
+    // Camera start method.
     private void initCamera() {
         try {
             mMultiProcessorCamera.open(surfaceHolder);
             if (handler == null) {
                 Intent intent = getIntent();
-                //Options from Flutter.
+                // Options from Flutter.
                 long[] colorList = Objects.requireNonNull(intent.getExtras()).getLongArray("colorList");
 
                 int textColor = intent.getExtras().getInt("textColor");
@@ -238,7 +238,7 @@ private void initCamera() {
                 int minTextSize = intent.getExtras().getInt("minTextSize");
                 int granularity = intent.getExtras().getInt("granularity");
 
-                //Handler for multi processor camera -- this is where camera continuously scan barcode.
+                // Handler for multi processor camera -- this is where camera continuously scan barcode.
                 if (mAnalyzer != null && multiProcessorChannel != null) {
                     handler = new MultiProcessorHandler(MultiProcessorActivity.this, multiProcessorChannel,
                         mMultiProcessorCamera, mode, colorList, textColor, textSize, strokeWidth, textBackgroundColor,
@@ -270,7 +270,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
     }
 
-    //Multi Async mode for image based scanning mode.
+    // Multi Async mode for image based scanning mode.
     private void decodeMultiAsync(Bitmap bitmap) {
         MLFrame image = MLFrame.fromBitmap(bitmap);
         if (analyzerIsAvailableWithLogger(this.getApplicationContext(), mAnalyzer, "MultiProcessorActivity")) {
@@ -301,7 +301,7 @@ public void onFailure(Exception e) {
         }
     }
 
-    //Multi Sync mode for image based scanning mode.
+    // Multi Sync mode for image based scanning mode.
     private void decodeMultiSync(Bitmap bitmap) {
         MLFrame image = MLFrame.fromBitmap(bitmap);
         if (analyzerIsAvailableWithLogger(this.getApplicationContext(), mAnalyzer, "MultiProcessorActivity")) {

Diff for: flutter-hms-scan/android/src/main/java/com/huawei/hms/flutter/scan/multiprocessor/MultiProcessorCamera.java

@@ -35,6 +35,8 @@ class MultiProcessorCamera {
 
     /**
      * Open up the camera.
+     * @param holder SurfaceHolder
+     * @throws IOException
      */
     synchronized void open(SurfaceHolder holder) throws IOException {
         camera = Camera.open();
@@ -73,7 +75,7 @@ synchronized void callbackFrame(Handler handler, double zoomValue) {
             frameCallback.setProperties(handler);
             double defaultZoom = 1.0;
             if (camera.getParameters().isZoomSupported() && zoomValue != defaultZoom) {
-                //Auto zoom.
+                // Auto zoom.
                 parameters.setZoom(convertZoomInt(zoomValue));
                 camera.setParameters(parameters);
             }