#IQRV #comment [DeviceControl] 适配器文件列表获取

addin/res/ManagerDesktop/guide.html

@@ -138,7 +138,7 @@
                                     <div class="text-left guide_error hide" id="text_guide_init_param_ip_tips"></div>
                                 </div>
                             </div>
-                            <div id="gui_init_param_audio_output_outfree_div" class="clearboth" style="padding-top:14px;">
+                            <div id="gui_init_param_vendor_div" class="clearboth" style="padding-top:14px;">
                                 <div class="pull-left" style="width:330px;">
                                     <div class="text-right guide_input_label">设备厂商</div>
                                 </div>
@@ -210,7 +210,7 @@
                 </div>
             </div>
             <div class="clearboth"></div>
-            <div id="guide_media_config_page" style="margin: 0px auto; width: 1000px; padding-top: 133px; display: block;">
+            <div id="guide_media_config_page" style="margin: 0px auto; width: 1000px; padding-top: 133px; display: none;">
                 <div id="guide_media_config_content" style="margin:0 auto;position:absolute;">
                     <div class="guide_table_top">&nbsp;</div>
                     <div class="margin_bottom_box2 color_background_white" style="min-height:556px;">
@@ -259,7 +259,7 @@
                                     <div class="pull-left" style="width:330px;">&nbsp;</div>
                                     <div class="pull-left">
                                         <div class="text-left guide_input_descript" id="text_guide_media_config_audio_ouput_outfree_tips">
-                                            提示：信创设备请选择<strong>内置音频</strong>(如有)
+                                            提示：信创设备请选择<strong>内置音频</strong>（如有）
                                         </div>
                                     </div>
                                 </div>
@@ -305,7 +305,7 @@
                                     <div class="pull-left" style="width:330px;">&nbsp;</div>
                                     <div class="pull-left">
                                         <div class="text-left guide_input_descript" id="text_guide_media_config_audio_ouput_outfree_tips">
-                                            提示：信创设备请选择<strong>内置音频</strong>(如有)
+                                            提示：信创设备请选择<strong>内置音频</strong>（如有）
                                         </div>
                                     </div>
                                 </div>
@@ -323,6 +323,150 @@
                 </div>
             </div>
             <div class="clearboth"></div>
+            <div id="guide_adapter_config_page" style="margin: 0px auto; width: 1000px; padding-top: 133px; display: none;">
+                <div id="guide_adapter_config_content" style="margin:0 auto;position:absolute;">
+                    <div class="guide_table_top">&nbsp;</div>
+                    <div class="margin_bottom_box2 color_background_white" style="min-height:556px;">
+                        <div style="padding-top:20px;height:48px;" class="border_bottom" align="center">
+                            <div class="guide_sub_tip" style="font-size:18px;">硬件配置</div>
+                        </div>
+                        <div align="center" style="padding-top:40px; width:570px; display: none;">
+                            <div class="pull-left text-left" style="width:540px"></div>
+                        </div>
+                        <div id="adapter_config_content" style="padding-top:10px; max-height: 510px; width: 998px;">
+                            <div id="gui_adapter_config_device_div" class="clearboth" style="padding-top:14px;">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">硬件模块</div>
+                                </div>
+                                <div class="controls text-left">
+                                    <div id="gui_adapter_config_device" class="select_on_normal device_selected_save_btn"
+                                        onclick="SelectItem(this)" value="*"></div>
+                                    <div id="gui_adapter_config_device_list" class="select_list hide">
+                                        <div id="gui_adapter_config_device_list_item_0" option="PinPad" class="select_medium">
+                                            密码键盘
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_1" option="CardIssuer" class="select_medium">
+                                            发卡器
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_2" option="IDCertificate" class="select_medium">
+                                            身份证阅读器
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_3" option="ContactlessCard" class="select_medium">
+                                            非接读卡器
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_4" option="HSPScanner" class="select_medium">
+                                            高拍仪
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_5" option="FingerPrint" class="select_medium">
+                                            指纹仪
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_6" option="WatchDog" class="select_medium">
+                                            看门狗
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_7" option="Gpio" class="select_medium">
+                                            GPIO
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_8" option="Ups" class="select_medium">
+                                            UPS
+                                        </div>
+                                        <div id="gui_adapter_config_device_list_item_9" option="*" class="select_medium">
+                                            全部
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="gui_adapter_config_vendor_div" class="clearboth" style="padding-top:30px;">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">设备厂商</div>
+                                </div>
+                                <div class="controls text-left">
+                                    <div id="gui_adapter_config_vendor" class="select_on_normal btn_disabled"
+                                        onclick="SelectItem(this)" value="*"></div>
+                                    <div id="gui_adapter_config_vendor_list" class="select_list hide">
+                                        <div id="gui_adapter_config_vendor_list_item_0" option="CW" class="select_medium">
+                                            恒银金融
+                                        </div>
+                                        <div id="gui_adapter_config_vendor_list_item_1" option="KEBA" class="select_medium">
+                                            中钞科堡
+                                        </div>
+                                        <div id="gui_adapter_config_vendor_list_item_2" option="GRG" class="select_medium">
+                                            广电运通
+                                        </div>
+                                        <div id="gui_adapter_config_vendor_list_item_3" option="NANTIAN" class="select_medium">
+                                            云南南天
+                                        </div>
+                                        <div id="gui_adapter_config_vendor_list_item_4" option="GWI" class="select_medium">
+                                            长城信息
+                                        </div>
+                                        <div id="gui_adapter_config_vendor_list_item_5" option="*" class="select_medium">
+                                            全部
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="clearboth border_bottom" style="height:45px;width:480px; margin-left:100px; margin-right: 200px;"></div>
+                            <div id="gui_adapter_config_adapter_div" class="clearboth" style="padding-top:30px;">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">适配器列表</div>
+                                </div>
+                                <div class="controls text-left">
+                                    <div id="gui_adapter_config_adapter" class="select_on_normal"
+                                        onclick="SelectItem(this)" value="*"></div>
+                                    <div id="gui_adapter_config_adapter_list" class="select_list hide">
+                                    </div>
+                                </div>
+                            </div>
+                            <div id="guide_adapter_config_terminalno_tips" class="clearboth">
+                                <div class="pull-left" style="width:330px;">&nbsp;</div>
+                                <div class="pull-left">
+                                    <div class="text-left guide_error hide" id="text_guide_adapter_config_terminalno_tips"></div>
+                                </div>
+                            </div>
+                            <div class="clearboth" style="padding-top:14px;" id="guide_adapter_config_port">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">端口号
+                                    </div>
+                                </div>
+                                <div class="pull-left input_normal text-left">
+                                    <input id="guide_adapter_config_port_input" type="text" autocomplete="off"
+                                        onfocus="showInputBorder(this)" onblur="hideInputBorder(this)" maxlength="8" value="">
+                                </div>
+                            </div>
+                            <div id="guide_adapter_config_port_tips" class="clearboth">
+                                <div class="pull-left" style="width:330px;">&nbsp;</div>
+                                <div class="pull-left">
+                                    <div class="text-left guide_error hide" id="text_guide_adapter_config_port_tips"></div>
+                                </div>
+                            </div>
+                            <div class="clearboth" style="padding-top:14px;" id="guide_adapter_config_baudrate">
+                                <div class="pull-left" style="width:330px;">
+                                    <div class="text-right guide_input_label">波特率
+                                    </div>
+                                </div>
+                                <div class="pull-left input_normal text-left">
+                                    <input id="guide_adapter_config_baudrate_input" type="text" autocomplete="off" placeholder=""
+                                        onfocus="showInputBorder(this)" onblur="hideInputBorder(this)" maxlength="10" value="">
+                                </div>
+                            </div>
+                            <div id="guide_adapter_config_badurate_tips" class="clearboth">
+                                <div class="pull-left" style="width:330px;">&nbsp;</div>
+                                <div class="pull-left">
+                                    <div class="text-left guide_error hide" id="text_guide_adapter_config_badurate_tips"></div>
+                                </div>
+                            </div>
+                            
+                            <div class="clearboth" style="padding-top:30px">
+                                <div class="controls" style="margin-left: 140px;"><button class="btn_normal_short"
+                                        id="guide_adapter_config_check">测试</button></div>
+                                <div class="controls"><button class="btn_normal_short"
+                                    id="guide_adapter_config_next">保存</button></div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="guide_table_bottom">&nbsp;</div>
+                </div>
+            </div>
+            <div class="clearboth"></div>
             <div id="guide_sync_centersetting_page" style="margin: 0px auto; width: 1000px; padding-top: 133px; display: none;">
                 <div id="guide_sync_centersetting_content" style="margin:0 auto;position:absolute;">
                     <div class="guide_table_top">&nbsp;</div>

addin/res/ManagerDesktop/js/guide.js

@@ -4,7 +4,8 @@ var CONST = {
     DeployStep_FetchCenterSettings : 2,
     DeployStep_AccessAuthorize : 3,
     DeployStep_MediaConfig : 4,
-    DeployStep_Finished : 5
+    DeployStep_Finished : 5,
+    DeployStep_AdapterConfig : 6
 };
 
 var SETCTION = {
@@ -109,6 +110,9 @@ $(function () {
                 case CONST.DeployStep_MediaConfig :
                     select_page = 'guide_media_config_page';
                 break;
+                case CONST.DeployStep_AdapterConfig : 
+                    select_page = 'guide_adapter_config_page';
+                break;
                 case CONST.DeployStep_Finished  :
                     select_page = 'guide_finish_page';
                 break; 
@@ -131,6 +135,9 @@ $(function () {
                 case CONST.DeployStep_MediaConfig:
                     FulfillMediaDeviceList();
                     break;
+                case CONST.DeployStep_AdapterConfig:
+                    FulfillDevAdapterFileList();
+                    break;
                 default:
                     break;
             }
@@ -412,6 +419,30 @@ $(function () {
         }
     }
 
+    function generateAdapterSelect(devices, status, select_id) {
+        var deviceLength = 0;
+        if ((devices) instanceof Array) {
+            deviceLength = devices.length;
+        } else {
+            deviceLength = 1
+        }
+        var devicesHtml = '';
+        var selectid = select_id;
+        $('#' + selectid).empty();
+        for (var loop = 0; loop < deviceLength; loop++) {
+            var cur = devices[loop];
+            var deviceTemplateData = {
+                loop: loop,
+                deviceName : cur,
+                type: selectid
+            };
+            var pushHtml = '';
+            pushHtml = '<div id="{{type}}_item_{{loop}}" option="{{deviceName}}" class="select_medium hide_with_ellipsis">'
+            pushHtml += '{{deviceName}}</div>'
+            $('#' +  selectid).secureAppend(pushHtml, deviceTemplateData);
+        }
+    }
+
     function FulfillMediaDeviceList(flag)
     {
         let req = new Request();
@@ -459,6 +490,41 @@ $(function () {
                 }
 
 
+            } else if(typeof flag !== 'undefined'){
+                RVC.CameraConfigEntity.commErrorCallback(ret);
+            }
+        });
+    }
+
+    function FulfillDevAdapterFileList(flag)
+    {
+        let req = new Request();
+        req.root = false;
+        req.adapter="";
+        req.vendor="";
+        req.version="";
+        req.batch="";
+
+        RVC.DeviceControlEntityCtrl.GetVendorFileList(req, function(ret) {
+            if(ret.errorCode === 0) {
+                let result = JSON.parse(ret[RVC.EntityController.sigResponseUUID])
+                if(result.result == 0) {
+                    var libs = [];
+                    var status = [];
+                    for (var n = 0; n < result.filenames.length; n++) {
+                        console.log(result.filenames[n] + ' ' + result.status[n]);
+                        libs.push(result.filenames[n]);
+                        status.push(result.status[n]);
+                    }
+                    generateAdapterSelect(libs, status, 'gui_adapter_config_adapter_list');
+
+                } else if(typeof flag !== 'undefined') {
+                    utilStartAlertDialog("操作失败：[" + result.result + "] " + result.msg);
+                }
+
+
+
+
             } else if(typeof flag !== 'undefined'){
                 RVC.CameraConfigEntity.commErrorCallback(ret);
             }
@@ -640,7 +706,7 @@ $(function () {
                 });
             }
         } else {
-            //RVC.GuideController.gotoPage(CONST.DeployStep_Begin);
+            RVC.GuideController.gotoPage(CONST.DeployStep_AdapterConfig);
         }
     }
 

addin/res/ManagerDesktop/js/public.js

@@ -1648,13 +1648,17 @@ $(function () {
             QueryHardwareInfo: 4,
             ReadCenterConfigStr: 5,
             ReadConfigValue: 6,
-            TestConnectivity: 7
+            TestConnectivity: 7,
+            GetVendorFileList: 8,
+            TestAdapterFileAvailable: 9
         },
         methodSignature: {
             QueryHardwareInfo: 1706767096,
             ReadCenterConfigStr: -673154017,
             ReadConfigValue: 730234720,
-            TestConnectivity : -42627632
+            TestConnectivity : -42627632,
+            GetVendorFileList: 1902033390,
+            TestAdapterFileAvailable: 1059104594
         },
 
         QueryHardwareInfo: function (req, callback) {
@@ -1682,6 +1686,16 @@ $(function () {
             this.webSocketInvokeEx(req, 
                 ({id:this.methodID.TestConnectivity, sig:this.methodSignature.TestConnectivity}),
                  callback);
+        },
+        GetVendorFileList: function (req, callback) {
+            this.webSocketInvokeEx(req, 
+                ({id:this.methodID.GetVendorFileList, sig:this.methodSignature.GetVendorFileList}),
+                 callback);
+        },
+        TestAdapterFileAvailable: function (req, callback) {
+            this.webSocketInvokeEx(req, 
+                ({id:this.methodID.TestAdapterFileAvailable, sig:this.methodSignature.TestAdapterFileAvailable}),
+                 callback);
         }
     });