在线地址修改为HHLocal

激活码在线可配
Web地址在线可配

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.hanghui.senic"
         minSdkVersion 22
         targetSdkVersion 22
-        versionCode 118//115
-        versionName "1.1.8.241004" //1.1.5.241003
+        versionCode 119//115
+        versionName "1.1.9.241009" //1.1.5.241003
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi-v7a"   //armeabi-v7a 'arm64-v8a'

app/src/main/java/com/hanghui/senic/baiduface/BaiduFaceUtil.java

@@ -15,8 +15,10 @@ import com.hanghui.senic.MyAppliction;
 import com.hanghui.senic.R;
 import com.hanghui.senic.common.AppHandler;
 import com.hanghui.senic.common.CommonUtil;
+import com.hanghui.senic.common.Constants;
 import com.hanghui.senic.common.UserInfoManager;
 import com.hanghui.senic.common.gson.GsonUtil;
+import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
 public class BaiduFaceUtil {
@@ -42,7 +44,7 @@ public class BaiduFaceUtil {
         PreferencesUtil.initPrefs(MyAppliction.getContext().getApplicationContext());
         //百度技术支持给的测试序列号，使用在线激活（离线激活需要繁杂的操作流程）
         //String licenseOnlineKey = "JH4U-PUXX-TXSP-SGRX";//224F010T01400261
-        //String licenseOnlineKey = "XJGK-25XM-LMDF-DRAX"; //224F010T01400827
+//        String licenseOnlineKey = "XJGK-25XM-LMDF-DRAX"; //224F010T01400827
 //        String licenseOnlineKey = "AZS2-XAPD-EF9Q-XWGE"; //224F010T01400858
         //String licenseOnlineKey = "EGNN-JVEC-EDXC-BGVL";
 //        String licenseOnlineKey = "BJ3F-FHXX-DNPH-8XAT";//224F010T01400359
@@ -71,9 +73,9 @@ public class BaiduFaceUtil {
 //        String licenseOnlineKey = "WZWV-76NC-S7GC-PXRP";//224F010T01400576
 //        String licenseOnlineKey = "TZDE-YKLZ-X5R6-MPAZ";//224F010T01400355
 //        String licenseOnlineKey = "DHMU-XVJB-7ZDY-KHZX";//224F010T01400353
-        String licenseOnlineKey = "8SCN-DRNU-KJYD-XD25";//224F010T01400573
+//        String licenseOnlineKey = "8SCN-DRNU-KJYD-XD25";//224F010T01400573
 //        String licenseOnlineKey = "BKJT-X3QX-BXHD-JQFS";//ZP2415000037
-        PreferencesUtil.putString("activate_online_key", licenseOnlineKey);
+        PreferencesUtil.putString("activate_online_key", ConfigManager.getAuthenticationBeanListBean().getLicenseOnlineKey());
 
 
         FaceSDKLiscenseManager.getInstance().init(MyAppliction.getContext(), new SdkInitListener() {

app/src/main/java/com/hanghui/senic/baiduface/WebsocketService.java

@@ -22,6 +22,7 @@ import com.hanghui.senic.R;
 import com.hanghui.senic.common.CommonUtil;
 import com.hanghui.senic.common.gson.GsonUtil;
 import com.hanghui.senic.service.usbserialdemo.utile.ConfigManager;
+import com.hanghui.senic.service.usbserialdemo.utile.StringIsNull;
 import com.hanghui.senic.service.usbserialdemo.utile.loacat.AppLogUtils;
 
 import java.util.ArrayList;
@@ -148,8 +149,12 @@ public class WebsocketService extends Service {
 
 
     private String getFaceDataUrl() {
-        String url = getResources().getString(R.string.hhface_baidu_face_data);
-        url = url + "sn=" + ConfigManager.SN + "&source=" + BaiduFaceConstant.SOURCE_HHFACE;
+        String url = ConfigManager.getAuthenticationBeanListBean().getWebsocketSubscribeUrl();
+        if (StringIsNull.IsStringNull(url)){
+            AppLogUtils.e(true,TAG + " ,getFaceDataUrl","WS连接地址为空");
+            return "";
+        }
+        url = url + "?sn=" + ConfigManager.SN + "&source=" + BaiduFaceConstant.SOURCE_HHFACE;
         return url;
     }
 
@@ -177,9 +182,12 @@ public class WebsocketService extends Service {
                 .build();
 
         String faceDataUrl = getFaceDataUrl();
-        Request request = new Request.Builder().url(faceDataUrl).build();
-        mWebSocket = mOkHttpClient.newWebSocket(request, mWebSocketListener);
-
+        if (!StringIsNull.IsStringNull(faceDataUrl)){
+            Request request = new Request.Builder().url(faceDataUrl).build();
+            mWebSocket = mOkHttpClient.newWebSocket(request, mWebSocketListener);
+        } else {
+            AppLogUtils.e(true,TAG + " ,WebSocket, startWebSocket","WS在线配置地址为空，请检查在线配置");
+        }
     }
 
 

app/src/main/java/com/hanghui/senic/bean/AuthenticationBean.java

@@ -417,6 +417,26 @@ public class AuthenticationBean {
         private Integer inOutFilterRepeatTime;//进出记录滤重时间(0-1200s)
         @SerializedName("scanFaceFailedPageUrl")
         private String scanFaceFailedPageUrl;//刷脸失败结果页图片配置
+        @SerializedName("licenseOnlineKey")
+        private String licenseOnlineKey;
+        @SerializedName("websocketSubscribeUrl")
+        private String websocketSubscribeUrl;
+
+        public String getWebsocketSubscribeUrl() {
+            return websocketSubscribeUrl;
+        }
+
+        public void setWebsocketSubscribeUrl(String websocketSubscribeUrl) {
+            this.websocketSubscribeUrl = websocketSubscribeUrl;
+        }
+
+        public String getLicenseOnlineKey() {
+            return licenseOnlineKey;
+        }
+
+        public void setLicenseOnlineKey(String licenseOnlineKey) {
+            this.licenseOnlineKey = licenseOnlineKey;
+        }
 
         public String getScanFaceFailedPageUrl() {
             return scanFaceFailedPageUrl;

app/src/main/java/com/hanghui/senic/common/gson/CompleteDataUtil.java

@@ -450,6 +450,12 @@ public class CompleteDataUtil {
         if (authenticationBean.getData().get(0).getScanFaceFailedPageUrl() == null){
             authenticationBean.getData().get(0).setScanFaceFailedPageUrl("");
         }
+        if (authenticationBean.getData().get(0).getLicenseOnlineKey() == null){
+            authenticationBean.getData().get(0).setLicenseOnlineKey("");
+        }
+        if (authenticationBean.getData().get(0).getWebsocketSubscribeUrl() == null){
+            authenticationBean.getData().get(0).setWebsocketSubscribeUrl("");
+        }
         return authenticationBean;
     }
 

app/src/main/java/com/hanghui/senic/model/MyModel.java

@@ -45,8 +45,8 @@ public class MyModel {
         Api api = RetrofitUtil.getUtil().gets(Api.class);
         String url = MyAppliction.getContext().getResources().getString(R.string.url_test_default)
                 +
-                MyAppliction.getContext().getResources().getString(R.string.url_config);
-        api.Post(MyAppliction.getContext().getResources().getString(R.string.url_config), map)
+                MyAppliction.getContext().getResources().getString(R.string.url_HHLocalConfig);
+        api.Post(MyAppliction.getContext().getResources().getString(R.string.url_HHLocalConfig), map)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new Subscriber<ResponseBody>() {

app/src/main/res/values/strings.xml

@@ -4,8 +4,10 @@
 
     <string name="resource_location">values</string>
 
-    <!--  配置 -->
-    <string name="url_config">api/v1/tenant/list?</string>
+    <!--  HHFace配置 -->
+    <string name="url_FaceConfig">api/v1/tenant/list?</string>
+    <!-- HHLocal配置-->
+    <string name="url_HHLocalConfig">api/v1/hh/local/device/sn/config?</string>
     <!--  配置路径 -->
     <string name="url_config_path">hanghui-server-platform/api/v1/tenant/sn/op/config</string>
     <!--默认地址 -->
@@ -27,7 +29,7 @@
     <!-- 测试地址 -->
 <!--    <string name="hhface_baidu_face_data">wss://test.hz-hanghui.com:18890/hhfacews?</string>-->
     <!-- 正式地址 -->
-    <string name="hhface_baidu_face_data">wss://hhomc.hz-hanghui.com:18096/hhfacews?</string>
+<!--    <string name="hhface_baidu_face_data">wss://hhomc.hz-hanghui.com:18096/hhfacews?</string>-->
 
     <!-- 本地黑名单配置-->
     <string name="url_Local_Blacklist_Config">https://tx.hz-hanghui.com:8088/hanghui-server-platform/api/v1/open/device/blacklist/query</string>