fix: update the D50 nfc UI

Author: believemeng

pos_android_studio_demo/pos_android_app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "com.dspread.pos_android_app"
         minSdk 24
         targetSdk 34
-        versionCode 124
-        versionName "8.2.6-2601131600"
+        versionCode 125
+        versionName "8.2.7-2601141900"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             // Set up supported SO library architecture
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: ['dspread_pos_sdk_8.2.6-min.aar'])
+    implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: ['dspread_pos_sdk_8.2.7-min.aar'])
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'

pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.2.6-min.aar

@@ -10,6 +10,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.databinding.DataBindingUtil;
 
 import com.dspread.pos.posAPI.ConnectionServiceCallback;
@@ -69,11 +70,11 @@ public class PaymentActivity extends BaseActivity<ActivityPaymentDefaultBinding,
     @Override
     public int initContentView(Bundle savedInstanceState) {
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        if (DeviceUtils.getScreenSize(this) <= 3.0) {
-            return R.layout.activity_payment_small_screen;//todo 名字
+        if(DeviceUtils.getScreenSize(this) <=3.0){
+            return R.layout.activity_payment_small_screen;
         } else if (DeviceUtils.isFrontNFCDevices()) {
-            return R.layout.activity_payment_front_nfc;//todo
-        } else {
+            return R.layout.activity_payment_front_nfc;
+        }else {
             return R.layout.activity_payment_default;
         }
     }
@@ -149,12 +150,16 @@ private void initFrontNFCUI() {
 
     private void setupFrontNFCAnimation() {
         if (frontNfcBinding != null) {
+            ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams)
+                    frontNfcBinding.animationView.getLayoutParams();
             String deviceModel = DeviceUtils.getPhoneModel();
             if ("D35".equals(deviceModel)) {
+                params.topMargin = DeviceUtils.dpToPx(this,25);//50.25mm
                 if (frontNfcBinding.ivCardGuide != null) {
                     frontNfcBinding.ivCardGuide.setImageResource(R.drawable.ic_payguide_d35);
                 }
             } else if ("D50".equals(deviceModel)) {
+                params.topMargin = DeviceUtils.dpToPx(this,0);//40.7mm
                 if (frontNfcBinding.ivCardGuide != null) {
                     frontNfcBinding.ivCardGuide.setImageResource(R.mipmap.ic_payguide_d50);
                 }

pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.2.6.aar

@@ -119,6 +119,10 @@ public static String getPhoneDetail() {
         return "Brand:" + DeviceUtils.getPhoneBrand() + " || Name:" + DeviceUtils.getDeviceName() + " || Model:" + DeviceUtils.getPhoneModel() + " || Version:" + DeviceUtils.getVersionRelease();
     }
 
+    public static int dpToPx(Context context,int dp) {
+        return (int) (dp * context.getResources().getDisplayMetrics().density);
+    }
+
     public static String convertAmountToCents(String original) {
         System.out.println("convertAmountToCents:" + original);
         String result = "";

pos_android_studio_demo/pos_android_app/libs/dspread_pos_sdk_8.2.7-min.aar

@@ -32,8 +32,8 @@
         <com.airbnb.lottie.LottieAnimationView
             android:id="@+id/animation_view"
             android:layout_width="0dp"
-            android:layout_height="350dp"
-            android:layout_marginTop="20dp"
+            android:layout_height="340dp"
+            android:layout_marginTop="0dp"
             android:visibility="@{viewModel.showPinpad ? View.GONE : View.VISIBLE}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"