6 Commit-ok cb433cf8b6 ... cee2204e23

Szerző SHA1 Üzenet Dátum
  xwh cee2204e23 upgrade:人员列表-item优化 2 hete
  xwh e1b80b7015 Merge branch 'FaceScenic_V2_baiduface' of http://218.108.80.158:8081/shangyp/FaceScenic into FaceScenic_V2_baiduface 2 hete
  xwh 9f637ab03f Merge branch 'FaceScenic_V2_baiduface' of http://218.108.80.158:8081/shangyp/FaceScenic into FaceScenic_V2_baiduface 2 hete
  xwh 81073209c9 upgrade:人员列表-显示可配置代码放开 2 hete
  xwh 840347e733 upgrade:"1.4.0.241226" 2 hete
  xwh 8f5217a03b upgrade:悬浮 无核验 后台配置 2 hete

+ 2 - 2
app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.hanghui.senic"
         minSdkVersion 22
         targetSdkVersion 22
-        versionCode 147
-        versionName "1.3.2.241226"
+        versionCode 148
+        versionName "1.4.0.241226"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a"   //armeabi-v7a 'arm64-v8a'

+ 2 - 2
app/src/main/java/com/hanghui/senic/activity/setup/PersonnelDataActivity.java

@@ -151,7 +151,7 @@ public class PersonnelDataActivity extends BaseActivity implements View.OnClickL
                 , PersonnelDataActivity.this);
         personnelData_RecyclerView.setAdapter(mAdapter);
         personnelData_RecyclerView.setPullRefreshEnabled(false);//禁止下拉刷新
-       /* List<Integer> configs=  ConfigManager.getAuthenticationBeanListBean().getSetPersonalList();
+        List<Integer> configs=  ConfigManager.getAuthenticationBeanListBean().getSetPersonalList();
         if (configs != null) {
             boolean isShowPhoto = false;
             boolean isShowIDCard = false;
@@ -173,7 +173,7 @@ public class PersonnelDataActivity extends BaseActivity implements View.OnClickL
                 }
             }
             mAdapter.setConfig(isShowPhoto, isShowIDCard, isShowPhone);
-        }*/
+        }
 
     }
 

+ 1 - 1
app/src/main/java/com/hanghui/senic/baiduface/BaiduFaceController.java

@@ -100,7 +100,7 @@ public class BaiduFaceController extends BaseController {
                     BaiDuFaceView.PAGE_TYPE_PERSON_CARD_HINT,
                     ConfigManager.getAuthenticationBean().getData().get(0).getOneToOneVoice());
 
-            if(ConfigManager.getAuthenticationBeanListBean().getLocalBaiduFace()){
+            if(ConfigManager.isNoVerificationFloatingPages()){
                 EventBus.getDefault().post(new ShowBaiDuFaceResultEvent(
                         ConfigManager.getAuthenticationBean().getData().get(0).getOneToOneTips()
                 ,ConfigManager.getAuthenticationBean().getData().get(0).getOneToOneVoice(),true));

+ 2 - 2
app/src/main/java/com/hanghui/senic/baiduface/BaiduFacePreviewActivity.java

@@ -604,7 +604,7 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity implements B
                         if (isNeedVerify) {
 
 
-                            if(ConfigManager.getAuthenticationBeanListBean().getLocalBaiduFace()){
+                            if(ConfigManager.isNoVerificationFloatingPages()){
                                 baiduResultView.result(livenessModel,bdFaceCheckConfig.getFeatureCheckMode());
                                 return;
                             }
@@ -1211,7 +1211,7 @@ public class BaiduFacePreviewActivity extends BaiduFaceMainActivity implements B
         isCreatedRunnable = false;
         startTime = 0L;
 
-        if (baiduResultView != null && ConfigManager.getAuthenticationBeanListBean().getLocalBaiduFace()) {
+        if (baiduResultView != null && ConfigManager.isNoVerificationFloatingPages()) {
             baiduResultView.showResultPageUI(false, msg, openVoiceMsg);
             return;
         }

+ 0 - 13
app/src/main/java/com/hanghui/senic/bean/AuthenticationBean.java

@@ -505,19 +505,6 @@ public class AuthenticationBean {
             this.successShowPersonalInfoList = successShowPersonalInfoList;
         }
 
-
-
-        @SerializedName("isLocalBaiduFace")
-        private Boolean isLocalBaiduFace =false;
-
-        public Boolean getLocalBaiduFace() {
-            return isLocalBaiduFace;
-        }
-
-        public void setLocalBaiduFace(Boolean localBaiduFace) {
-            isLocalBaiduFace = localBaiduFace;
-        }
-
         public Integer getSameFaceInterval() {
             return sameFaceInterval;
         }

+ 14 - 0
app/src/main/java/com/hanghui/senic/service/usbserialdemo/utile/ConfigManager.java

@@ -970,6 +970,20 @@ public class ConfigManager {
         return false;
     }
 
+    /**
+     *
+     * @author xwh
+     * Time 悬浮(无核验)
+     * Description: 
+     *
+    **/
+    public static boolean isNoVerificationFloatingPages() {
+        if (authenticationBean.getData().get(0).getResultPageTemplate() == 3) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 检查特殊码换取三要素
      *

+ 16 - 6
app/src/main/res/layout/personneldata_adapter.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_208"
+    android:layout_height="@dimen/dp_235"
     android:orientation="vertical">
     <LinearLayout
         android:layout_width="match_parent"
@@ -17,11 +17,18 @@
             android:layout_width="@dimen/dp_160"
             android:layout_height="@dimen/dp_160"
             android:src="@mipmap/ic_person_default" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
+            android:layout_weight="1"
             android:layout_toRightOf="@+id/personnelDataAdapter_titleImage"
             android:layout_marginLeft="@dimen/dp_28"
             android:layout_marginTop="@dimen/dp_20">
@@ -32,7 +39,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="   I D: "
+                    android:text="I D  : "
                     android:textSize="@dimen/dp_28"
                     android:textColor="@color/f4E8FFF"/>
                 <TextView
@@ -83,8 +90,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="@dimen/dp_88">
+            android:layout_weight="1"
+            android:layout_marginLeft="@dimen/dp_5"
+
+
+         >
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -121,7 +131,7 @@
                     android:textSize="@dimen/dp_26"/>
             </LinearLayout>
         </LinearLayout>
-
+        </LinearLayout>
     </LinearLayout>
     <View
         android:layout_width="match_parent"