haruzira_sdk 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f8b4cb58621ea51d5794d2176b63da252df9f06
-  data.tar.gz: b2a4b193133278438074d40eef9ee33bd96611ad
+  metadata.gz: b233100b4997210602e835e6f5e8d90d2e0627e9
+  data.tar.gz: ca3bc2426ab15b4c9f33a26a0cf4b4e20c2ac64c
 SHA512:
-  metadata.gz: 4dfe83ea4581b257e93b25eb39e47f3b58eefa65e386986c31539ff62999da27f0c568b542fa64e5b226e083fa69ed798f0df7eb79a66a1bd692bfe52c85933b
-  data.tar.gz: 7a45dc7de6547413cbfe5d078c99058066e0b9b0cf4159eccfafb86ae821fa9d92f60148238071ed34ae42605cbe483e370674c90488b1835560d3d9ef1c29ee
+  metadata.gz: eaeadd0a25800f281812e54709526abf03b6123817dcaad41780d8e5d49e6f53c171113d5c8f1ccc96747d62238ada5558f650e0f435bf40c3ddd73d02e3a5c5
+  data.tar.gz: 7c06161322476ccf9e54d48a616ec7b2068fdbaef1269376282ab6c367be7d503066d8c563d04b0c057fa3a549996611c8ed75e8a1a82fedfeed9bbfeecf133f

data/lib/haruzira_sdk/HzClientTcpCommunication.rb

@@ -33,6 +33,25 @@ module HzSpeechGender
     Male = 0x01          #男性
     Neutral = 0x02       #未指定
 end
+
+# <summary>
+# SDK language type
+# </summary>
+module HzSdkLangType
+    Unknown = 0x00       #不明
+    DotNet = 0x01        #.Net
+    Ruby = 0x02          #Ruby
+    Python = 0x03        #Python
+    Java = 0x04          #Java
+end
+
+# <summary>
+# Necessity of sending Speech Completion Notice message
+# </summary>
+module HzSpCompletionNoticeNecessity
+    Need = 0x00          #送信必要
+    NoNeed = 0x01        #送信不要
+end
 #endregion
 
 class ClientTcpCommunication
@@ -48,6 +67,9 @@ class ClientTcpCommunication
         @DISCONNECT_REASON_CLIENT_IREGULAR = 0x13  #クライアント側でイレギュラー障害発生
         @QUEUE_RECEIVED = "OK" 
 
+        @SDK_LANG_TYPE = HzSdkLangType::Ruby
+        @Version = "2.1.0.0"     #SDKバージョン
+        
         @encryption = Encryption.new
         #@encryption = nil
 
@@ -71,12 +93,13 @@ class ClientTcpCommunication
         @ReqSendDataSpeechGender = HzSpeechGender::Neutral
         @ReqSendDataSpeechAge = 25
         @ReqSendDataSpeechRepeat = 0
+        @ReqSendDataCompletionNoticeNecessity = HzSpCompletionNoticeNecessity::Need
         @ReceivedDataDecryptionKey = ""
         @SendDataHexStr = ""
         @SendDataLength = 0
         @ReceiveStatus = 0x00
         @ReceiveAckTimeOut = RECEIVE_TIME_OUT
-        @Version = "2.0.0.0"     #SDKバージョン
+        @SdkVersions = [@Version.split(".")[0].to_i, @Version.split(".")[1].to_i]      #SDKバージョン(送信用) 
 
         #メッセージ受信時イベント定義
         @EvNotifyCompeteSpeech = nil                    #読み上げ完了通知受信時イベント
@@ -89,7 +112,8 @@ class ClientTcpCommunication
     #define accessor
     attr_accessor   :ServerPortNo, :ServerIP, :ReceivePort, :ReqSendDataText, :ReqSendDataEncrypt, :ReqSendDataEncryptKey, :ReqSendDataAccountName, :ReqSendDataPasswd, \
                     :ReqSendDataSpeechMode, :ReqSendDataSpeechLevel, :ReqSendDataSpeechLocaleId, :ReqSendDataSpeechGender, :ReqSendDataSpeechAge, :ReqSendDataSpeechRepeat, \
-                    :ReceivedDataDecryptionKey, :EvNotifyCompeteSpeech, :EvNotifyMessageEvent, :EvNotifyReceivedDisConnectEvent, :EvNotifySendSpeechRecognitionCommand
+                    :ReceivedDataDecryptionKey, :EvNotifyCompeteSpeech, :EvNotifyMessageEvent, :EvNotifyReceivedDisConnectEvent, :EvNotifySendSpeechRecognitionCommand, \
+                    :ReqSendDataCompletionNoticeNecessity
     attr_reader     :SendDataHexStr, :SendDataLength, :ReceiveStatus, :Version
 
     # <summary>
@@ -734,6 +758,8 @@ class ClientTcpCommunication
                 reqStartComm.passwd_len = reqStartComm.passwd.length
                 #puts "account[#{reqStartComm.name.pack("C*")}] len:#{reqStartComm.name_len}, passwd len: #{reqStartComm.passwd_len}"
             end 
+            reqStartComm.sdk_lang_type = @SDK_LANG_TYPE
+            reqStartComm.sdk_versions = @SdkVersions
             len, data = reqStartComm.makeSendData()
             #p len, data
             if(len > 0)
@@ -746,9 +772,9 @@ class ClientTcpCommunication
             end 
 
             #HzTrace.traceCommMessage("【CL】通信開始要求送信(0x%02x)：Cer[%d] Enc[%d], Port[%d], Name[%s], Passwd[%s], Name Len[%d], Passwd Len[%d]" % \
-            HzTrace.traceCommMessage("[CL]Send, Communication Start Request(0x%02x)：Cer[%d] Enc[%d], Port[%d], Name[%s], Passwd[%s], Name Len[%d], Passwd Len[%d]" % \
-                [reqStartComm.id, reqStartComm.cer_flg, reqStartComm.enc_flg, reqStartComm.port, reqStartComm.name != nil ? name : "", \
-                reqStartComm.passwd != nil ? passwd : "", reqStartComm.name_len, reqStartComm.passwd_len])
+            HzTrace.traceCommMessage("[CL]Send, Communication Start Request(0x%02x)：Cer[%d] Enc[%d], Lang Type[%d], Port[%d], Name[%s], Passwd[%s], Name Len[%d], Passwd Len[%d], Version[%d].[%d]" % \
+                [reqStartComm.id, reqStartComm.cer_flg, reqStartComm.enc_flg, reqStartComm.sdk_lang_type, reqStartComm.port, reqStartComm.name != nil ? name : "", \
+                reqStartComm.passwd != nil ? passwd : "", reqStartComm.name_len, reqStartComm.passwd_len, reqStartComm.sdk_versions[0], reqStartComm.sdk_versions[1]])
 
             #通信開始応答受信(0x10)
             begin
@@ -905,6 +931,7 @@ class ClientTcpCommunication
             sendSpeechData.age = @ReqSendDataSpeechAge
             sendSpeechData.repeat = @ReqSendDataSpeechRepeat
             sendSpeechData.time_stamp = timeStamp.unpack("C*")
+            sendSpeechData.completion_notice_necessity = @ReqSendDataCompletionNoticeNecessity
             sendSpeechData.size = sendSpeechData.data.length
             @SendDataLength = sendSpeechData.size         #Debug用
 
@@ -921,7 +948,7 @@ class ClientTcpCommunication
             end 
 
             #HzTrace.traceCommMessage("【CL】読み上げデータ送信(0x%02x)：Enc[%d], Size[%d]" % [sendSpeechData.id, sendSpeechData.enc_flg, sendSpeechData.size])
-            HzTrace.traceCommMessage("[CL]Send, Send Speech Data(0x%02x)：Enc[%d], Size[%d]" % [sendSpeechData.id, sendSpeechData.enc_flg, sendSpeechData.size])
+            HzTrace.traceCommMessage("[CL]Send, Send Speech Data(0x%02x)：Enc[%d], Size[%d], CompleteMsg[%d]" % [sendSpeechData.id, sendSpeechData.enc_flg, sendSpeechData.size, sendSpeechData.completion_notice_necessity])
 
 
             #読み上げデータ送信応答待機(0x12)

data/lib/haruzira_sdk/MsgReqStartComm.rb

@@ -16,11 +16,11 @@ class MsgReqStartComm
         @INDEX_ID = 0              #メッセージID
         @INDEX_ENC_FLG = 1         #暗号化フラグ
         @INDEX_CER_FLG = 2         #認証フラグ
-        @INDEX_PADDING = 3         #アライメント
+        @INDEX_SDK_LANG_TYPE = 3   #SDK言語タイプ
         @INDEX_PORT = 4            #ポート番号
         @INDEX_NAME_LEN = 6        #接続元名称サイズ
         @INDEX_PASSWD_LEN = 8      #パスワードサイズ
-        @INDEX_PADDING2 = 10       #アライメント
+        @INDEX_SDK_VERSIONS = 10   #SDKバージョン
         @INDEX_NAME = 12           #接続元名称
         #endregion
 
@@ -37,26 +37,26 @@ class MsgReqStartComm
         @id = MSG_REQ_START_COMM                #メッセージID
         @enc_flg = 0x00           #暗号化フラグ
         @cer_flg = 0x00             #認証フラグ
-        @padding = 0x00           #アライメント
+        @sdk_lang_type = 0x00           #SDK言語タイプ
         @port = 46000            #ポート番号
         @name_len = 0x00        #接続元名称サイズ
         @passwd_len = 0x00      #パスワードサイズ
-        @padding2 = Array.new(2, 0x00)        #アライメント
+        @sdk_versions = Array.new(2, 0x00)        #SDK バージョン
         @name = nil            #接続元名称
         @passwd = nil          #パスワード
         #@byte[] reserve { get; set; }        #予備
-        @head_len = (1 * 4) + (2 * 3) + @padding2.size                        #ヘッダーサイズ（読み上げデータを除いたサイズ）
+        @head_len = (1 * 4) + (2 * 3) + @sdk_versions.size                        #ヘッダーサイズ（読み上げデータを除いたサイズ）
         @total_len = 0                       #送信フィールド合計サイズ
     end
 
     #アクセサ定義(メンバーIndex offset)
-    attr_reader     :INDEX_ID, :INDEX_ENC_FLG, :INDEX_CER_FLG, :INDEX_PADDING, :INDEX_PORT, :INDEX_NAME_LEN, :INDEX_PASSWD_LEN, :INDEX_PADDING2, :INDEX_NAME
+    attr_reader     :INDEX_ID, :INDEX_ENC_FLG, :INDEX_CER_FLG, :INDEX_SDK_LANG_TYPE, :INDEX_PORT, :INDEX_NAME_LEN, :INDEX_PASSWD_LEN, :INDEX_SDK_VERSIONS, :INDEX_NAME
 
     #アクセサ定義(送信メンバデータ値)
     attr_reader     :ENC_FLG_OFF, :ENC_FLG_ON, :CER_FLG_OFF, :CER_FLG_ON
 
     #アクセサ定義
-    attr_accessor   :enc_flg, :cer_flg, :port, :name_len, :passwd_len, :name, :passwd
+    attr_accessor   :enc_flg, :cer_flg, :sdk_lang_type, :port, :name_len, :passwd_len, :sdk_versions, :name, :passwd
     attr_reader     :id, :head_len, :total_len
 
     public
@@ -84,12 +84,13 @@ class MsgReqStartComm
             bPasswdLen = [passwd_len].pack("n*").unpack("C*")
 
             if(@name != nil && @passwd != nil)
-                data = [@id] + [@enc_flg] + [@cer_flg] + [@padding] + bPort + bUserLen + bPasswdLen + @padding2 + @name + @passwd
+                data = [@id] + [@enc_flg] + [@cer_flg] + [@sdk_lang_type] + bPort + bUserLen + bPasswdLen + @sdk_versions + @name + @passwd
             else
-                data = [@id] + [@enc_flg] + [@cer_flg] + [@padding] + bPort + bUserLen + bPasswdLen + @padding2
+                data = [@id] + [@enc_flg] + [@cer_flg] + [@sdk_lang_type] + bPort + bUserLen + bPasswdLen + @sdk_versions
             end
 
         rescue Exception => ex
+            puts("makeSendData error")
             p ex
             @total_len = 0
         ensure

data/lib/haruzira_sdk/MsgSendSpeechData.rb

@@ -19,7 +19,7 @@ class MsgSendSpeechData
         @INDEX_AGE = 7             #年齢
         @INDEX_REPEAT = 8          #リピート回数
         @INDEX_TIME_STAMP = 9      #タイムスタンプ(00:00:00)
-        @INDEX_PADDING = 17        #アライメント
+        @INDEX_COMPLETION_NOTICE_NECESSITY = 17 #読み上げ完了通知の送信要否
         @INDEX_NAME_LEN = 18       #接続元名称サイズ
         @INDEX_SIZE = 20           #読み上げデータサイズ
         @INDEX_NAME = 24           #接続元名称(可変)
@@ -61,7 +61,7 @@ class MsgSendSpeechData
         @age = 0x00                                              #年齢
         @repeat = 0x00                                           #リピート回数
         @time_stamp = Array.new(8, 0x00)                         #タイムスタンプ(00:00:00)
-        @padding = 0x00                                          #アライメント
+        @completion_notice_necessity = 0x00                      #読み上げ完了通知の送信要否(0x00:必要, 0x01:不要)
         @name_len = 0x00                                         #接続元名称サイズ
         @size = 0x00                                             #読み上げデータサイズ
         @name = nil                                              #接続元名称（可変）
@@ -73,7 +73,7 @@ class MsgSendSpeechData
     
     #アクセサ定義(メンバーIndex offset)
     attr_reader     :INDEX_ID, :INDEX_ENC_FLG, :INDEX_DATA_TYPE, :INDEX_PRIORITY, :INDEX_LANG_CODE, \
-                    :INDEX_GENDER, :INDEX_AGE, :INDEX_REPEAT, :INDEX_TIME_STAMP, :INDEX_PADDING, :INDEX_NAME_LEN, \
+                    :INDEX_GENDER, :INDEX_AGE, :INDEX_REPEAT, :INDEX_TIME_STAMP, :INDEX_COMPLETION_NOTICE_NECESSITY, :INDEX_NAME_LEN, \
                     :INDEX_SIZE, :INDEX_NAME
 
     #アクセサ定義(送信メンバデータ値)
@@ -82,7 +82,7 @@ class MsgSendSpeechData
                     :GENDER_UNKNOWN, :REPEAT_NONE, :REPEAT_INFINITY 
 
     #アクセサ定義
-    attr_accessor   :enc_flg, :data_type, :priority, :lang_code, :gender, :age, :repeat, :time_stamp, :padding, \
+    attr_accessor   :enc_flg, :data_type, :priority, :lang_code, :gender, :age, :repeat, :time_stamp, :completion_notice_necessity, \
                     :name_len, :size, :name, :data
     attr_reader     :id, :head_len, :total_len
 
@@ -103,10 +103,10 @@ class MsgSendSpeechData
 
             if(@name != nil )
                 mdata = [@id] + [@enc_flg] + [@data_type] + [@priority] + bLangCode + [@gender] + [@age] + [@repeat] + \
-                        @time_stamp + [@padding] + bNameLen + bSize + @name + @data
+                        @time_stamp + [@completion_notice_necessity] + bNameLen + bSize + @name + @data
             else
                 mdata = [@id] + [@enc_flg] + [@data_type] + [@priority] + bLangCode + [@gender] + [@age] + [@repeat] + \
-                        @time_stamp + [@padding] + bNameLen + bSize + @data
+                        @time_stamp + [@completion_notice_necessity] + bNameLen + bSize + @data
             end
 
         rescue Exception => ex

data/lib/haruzira_sdk/version.rb

@@ -1,3 +1,3 @@
 module HaruziraSdk
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haruzira_sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Symmetry Soft
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler