1、用例完善；

ScbcCopyKey/test.py

@@ -68,20 +68,20 @@ EnterFactory：进入工厂模式
     用例为完整的调用流程：Open->EnterFactory->所有协议操作->LeaveFactory->Close;
 '''
 
-if __name__ == "__main__":
-    # HTTP接口，获取UserId
-    if 1:
-        # 测试环境： http://test.dsp.server.qhmoka.com
-        # 正式环境：https://dsp.server.qhmoka.com
-        # 正式使用时，请使用正式环境的url地址替换测试环境url;
-        token = ScbcCopyKey.HTTPLogin("http://test.dsp.server.qhmoka.com/login", "auto", "123456", 1)
-        if token.__len__():
-            print token
-            userId = ScbcCopyKey.HTTPGetUserId("http://test.dsp.server.qhmoka.com/api/automation/getUserId", token, "MOKA-AF-MS6586-0000L", "fe6015c2966118d45e745d3bdeabc052f87e7847", "5c:ad:76:e0:55:79")
-            if userId == -1:
-                print u"获取userId失败"
-            print userId
-        
+# 使用测试地址,测试数据进行测试;
+def testGetUserId():
+    userName = "auto"
+    password = "123456"
+    token = ScbcCopyKey.HTTPLogin("http://test.dsp.server.qhmoka.com/login", userName, password, 1)
+    if token.__len__():
+        print u"login token = ", token      
+        userId = ScbcCopyKey.HTTPGetUserId("http://test.dsp.server.qhmoka.com/api/automation/getUserId", token, "MOKA-AF-MS6586-0000L", "fe6015c2966118d45e745d3bdeabc052f87e7847", "5c:ad:76:e0:55:79")
+        if userId == -1:
+            print u"获取userId失败"
+        else:
+            print u"userId=",userId
+
+if __name__ == "__main__":        
     # 打开串口;
     result = ScbcCopyKey.Open(int(sat_environment.getSerialCOM()[3:]), 115200, 8, 0, 1)
     if result:
@@ -89,9 +89,17 @@ if __name__ == "__main__":
         if ScbcCopyKey.EnterFactory():
             print u"获取ProjectId",ScbcCopyKey.GetProjectId()           
             print u"获取软件版本",ScbcCopyKey.GetSoftVersion()
-            print u"获取DeviceID",ScbcCopyKey.GetDeviceId()
-            print u"获取ClientType",ScbcCopyKey.GetClientType()
-            print u"获取MAC",ScbcCopyKey.GetMAC()
+            
+            # HTTPGetUserId所需要参数;
+            deviceId = ScbcCopyKey.GetDeviceId()
+            print u"获取DeviceID",deviceId
+            # HTTPGetUserId所需要参数;
+            clientType = ScbcCopyKey.GetClientType()
+            print u"获取ClientType",clientType
+            # HTTPGetUserId所需要参数;
+            mac = ScbcCopyKey.GetMAC()
+            print u"获取MAC",mac
+            
             print u"获取HDCP",ScbcCopyKey.GetHDCPKey()
             print u"获取HDCP22",ScbcCopyKey.GetHDCPKey22()
             print u"GetWidi",ScbcCopyKey.GetWidi()
@@ -101,6 +109,25 @@ if __name__ == "__main__":
             print u"GetOSDLanguage",ScbcCopyKey.GetOSDLanguage()
             print u"GetShopLanguage",ScbcCopyKey.GetShopLanguage()
             print u"GetChannel",ScbcCopyKey.GetChannel()
+            
+            # 获取UserId;
+            if 1:
+                # 测试环境： http://test.dsp.server.qhmoka.com
+                # 正式环境：https://dsp.server.qhmoka.com
+                # 正式使用时，请使用正式环境的url地址替换测试环境url;
+                userName = "auto"
+                password = "123456"
+                token = ScbcCopyKey.HTTPLogin("http://test.dsp.server.qhmoka.com/login", userName, password, 1)
+                
+                # token长度不为0, 表示成功获取token值;
+                if token.__len__():
+                    print u"login token = ", token                    
+                    userId = ScbcCopyKey.HTTPGetUserId("http://test.dsp.server.qhmoka.com/api/automation/getUserId", token, clientType, deviceId, mac.replace('-', ':'))
+                    # userId==-1表示获取失败;
+                    if userId == -1:
+                        print u"获取userId失败"
+                    else:
+                        print u"userId=",userId
 
             if 0:
                 file = r"D:\SAT\Allkey\RT2851-1PCS\DID\did1711.bin"