RubyGems - haruzira_sdk - Versions diffs - 1.1.0 → 1.2.0 - Mend

haruzira_sdk 1.1.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

checksums.yaml +4 -4
data/lib/haruzira_sdk/HzClientTcpCommunication.rb +133 -124
data/lib/haruzira_sdk/MsgSendSpeechData.rb +1 -1
data/lib/haruzira_sdk/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa594674fbe30ed8a085540fd0ba3118e9b00ef
-  data.tar.gz: 5b14300a56f1f62769fdba6183fc15e0a9ef821e
+  metadata.gz: 5f6c0e61251fba110613e04fc3ab42d8d0834db8
+  data.tar.gz: f2ae5ef6f61ce270a3210101168e3ead1ec37f40
 SHA512:
-  metadata.gz: d54af33d8a6af7d0ee4845e28d49f590aca0e9e96ec0e5b867becb5e8ce684aaa1b768e83f70d9cd40b169105c9a3abbe79d74ad2d0c7895ccb9a1221c80b85a
-  data.tar.gz: 67c2d47786c7d0774684dcaf2ddcd58991c5709ded6ae7a2796734407eebb129c50765ad535527f6c9cfcaeba776fc14f1a8ed1ee93ea4596e27763dfdf4f682
+  metadata.gz: a7f26b3b879e9033c1ccabee540a4d64f6672bb5d52f14e09f656dc528f49d710817798d2183c7eb1c157879d1c179612c095981645cd606fedaa8e954ea042c
+  data.tar.gz: 6e002295dde6e100e2caaca4688203d572aa9073c170221dea4670d40812d3f683c74cc4d7e4b4d0ec8c47457f02dd8066f8a65c5c6467b145365dd82227e321

data/lib/haruzira_sdk/HzClientTcpCommunication.rb CHANGED Viewed

@@ -90,6 +90,139 @@ class ClientTcpCommunication
                     :EvNotifyCompeteSpeech, :EvNotifyMessageEvent, :EvNotifyReceivedDisConnectEvent
     attr_reader     :SendDataHexStr, :SendDataLength, :ReceiveStatus, :Version
+    # <summary>
+    # トレース出力設定
+    # </summary>
+    # <returns></returns>
+    def setTraceOutPut(val)
+        HzTrace.setTraceOutPut(val)
+    end
+    # <summary>
+    # 応答受信時タイムアウト取得
+    # </summary>
+    # <param name="value">タイムアウト値</param>
+    def ReceiveAckTimeOut
+        #Get
+        return @ReceiveAckTimeOut
+    end
+    # <summary>
+    # 応答受信時タイムアウト設定
+    # </summary>
+    # <param name="value">タイムアウト値</param>
+    def ReceiveAckTimeOut=(value)
+        #Set
+        if(value > RECEIVE_MAX_TIME_OUT)
+            @ReceiveAckTimeOut = RECEIVE_MAX_TIME_OUT
+        elsif(value < RECEIVE_MIN_TIME_OUT)
+            @ReceiveAckTimeOut = RECEIVE_MIN_TIME_OUT
+        else
+            @ReceiveAckTimeOut = value
+        end
+    end
+    # <summary>
+    # 読み上げデータ送信（自動）
+    # </summary>
+    # <returns>OK:タイムスタンプ文字列(00:00:00形式), NG:nil</returns>
+    def sendSpeechDataEx()
+        timeStamp = ""
+        notifyEndComm = MsgNotifyEndComm.new()
+        begin
+            #電文シーケンス開始
+            #通信開始要求(0x00)
+            if (@ReqSendDataAccountName != nil && @ReqSendDataPasswd != nil && @ReqSendDataEncryptKey != nil)
+                #暗号化パスワード認証
+                retStatus = reqStartCommProc(@ReqSendDataAccountName, @ReqSendDataPasswd, @ReqSendDataEncryptKey)
+            elsif (@ReqSendDataAccountName != nil && @ReqSendDataPasswd != nil)
+                #パスワード認証
+                retStatus = reqStartCommProc(@ReqSendDataAccountName, @ReqSendDataPasswd)
+            else
+                #認証無
+                retStatus = reqStartCommProc()
+            end
+            if (!retStatus)
+                #puts("【CL】通信開始応答受信(0x%02x)：待機結果[%s]" % [reqStartComm.id, "Time Out"])
+                #raise("通信開始要求メッセージ送信に失敗しました。\r\n通信処理を中断します。")
+                puts("[CL]Received, Responce of Communication Start Request(0x%02x)：Waiting Result[%s]" % [reqStartComm.id, "Time Out"])
+                raise("Sending the message of Communication Strat Request has failed. and then the communication stop.")
+            end
+            #非同期メッセージ受信タスク起動
+            if(@listenTask == nil)
+                @listenTask = Thread.start do
+                    listenerTask()
+                end
+            end
+            #読み上げデータ送信(0x03)
+            if (@ReqSendDataAccountName != nil && @ReqSendDataEncryptKey != nil)
+                #暗号化(アカウント名および暗号化キー有)
+                @ReqSendDataEncrypt = true
+            elsif (@ReqSendDataAccountName == nil && @ReqSendDataEncryptKey != nil)
+                #暗号化（暗号化キーのみ）エラーケース
+                @ReqSendDataAccountName = ""
+                @ReqSendDataEncrypt = true
+            elsif (@ReqSendDataAccountName != nil && @ReqSendDataEncryptKey == nil)
+                #平文（アカウント名のみ）
+                @ReqSendDataEncrypt = false
+                @ReqSendDataEncryptKey = ""
+            else
+                #平文(認証が有効の場合はエラーとなる)
+                @ReqSendDataAccountName = ""
+                @ReqSendDataEncrypt = false
+                @ReqSendDataEncryptKey = ""
+            end
+            timeStamp = sendSpeechData()
+            #通信終了通知(0x01)
+            if(timeStamp == nil || @ReceiveStatus != 0x00)
+                notifyEndCommProc(notifyEndComm.ERR_CODE_OTHER_REASONS)
+            else
+                notifyEndCommProc(notifyEndComm.ERR_CODE_NONE)
+            end
+        rescue => ex
+            HzTrace.traceCommMessage("%s" % [ex])
+            timeStamp = nil
+        ensure
+            return timeStamp
+        end
+    end
+    # <summary>
+    # 非同期メッセージ受信スレッドの終了
+    # </summary>
+    def cancelAsynchronousListener()
+        if (@listenTask != nil)
+            @listenTask.kill
+            @listenTask = nil
+            #HzTrace.traceCommMessage("非同期メッセージ受信スレッドをキャンセルしました。")
+            HzTrace.traceCommMessage("The thread for receiving some asynchronous messsages was canceled.")
+        end
+    end
+    # <summary>
+    # 読み上げデータ送信の停止（中断）
+    # </summary>
+    def stopSendSpeechData()
+        if (@tcpSvr != nil)
+            @tcpSvr.kill
+            @tcpSvr = nil
+            #HzTrace.traceCommMessage("読み上げデータ送信処理をキャンセルしました。")
+            HzTrace.traceCommMessage("The sending proccess for send of Speech Data was canceled.")
+        end
+    end
+    #****************************************
+    #Private Methods define
+    #****************************************
+    private
     #region イベントコールバック関数ラッパー
     def evNotifyMessageEvent(msg, msg_id, err_code)
         if(@EvNotifyMessageEvent != nil)
@@ -110,34 +243,6 @@ class ClientTcpCommunication
     end
     #endregion
-    # <summary>
-    # トレース出力設定
-    # </summary>
-    # <returns></returns>
-    def setTraceOutPut(val)
-        HzTrace.setTraceOutPut(val)
-    end
-    # <summary>
-    # 応答受信時タイムアウト取得・設定
-    # </summary>
-    # <param name="value">タイムアウト値</param>
-    def receiveAckTimeOut(value = nil)
-        if(value == nil)
-            #Get
-            return @ReceiveAckTimeOut
-        else
-            #Set
-            if(value > RECEIVE_MAX_TIME_OUT)
-                @ReceiveAckTimeOut = RECEIVE_MAX_TIME_OUT
-            elsif(value < RECEIVE_MIN_TIME_OUT)
-                @ReceiveAckTimeOut = RECEIVE_MIN_TIME_OUT
-            else
-                @ReceiveAckTimeOut = value
-            end
-        end
-    end
     # <summary>
     # 非同期メッセージ受信用リスナータスク
     # </summary>
@@ -755,100 +860,4 @@ class ClientTcpCommunication
         end
     end
-    # <summary>
-    # 読み上げデータ送信（自動）
-    # </summary>
-    # <returns>OK:タイムスタンプ文字列(00:00:00形式), NG:nil</returns>
-    def sendSpeechDataEx()
-        timeStamp = ""
-        notifyEndComm = MsgNotifyEndComm.new()
-        begin
-            #電文シーケンス開始
-            #通信開始要求(0x00)
-            if (@ReqSendDataAccountName != nil && @ReqSendDataPasswd != nil && @ReqSendDataEncryptKey != nil)
-                #暗号化パスワード認証
-                retStatus = reqStartCommProc(@ReqSendDataAccountName, @ReqSendDataPasswd, @ReqSendDataEncryptKey)
-            elsif (@ReqSendDataAccountName != nil && @ReqSendDataPasswd != nil)
-                #パスワード認証
-                retStatus = reqStartCommProc(@ReqSendDataAccountName, @ReqSendDataPasswd)
-            else
-                #認証無
-                retStatus = reqStartCommProc()
-            end
-            if (!retStatus)
-                #puts("【CL】通信開始応答受信(0x%02x)：待機結果[%s]" % [reqStartComm.id, "Time Out"])
-                #raise("通信開始要求メッセージ送信に失敗しました。\r\n通信処理を中断します。")
-                puts("[CL]Received, Responce of Communication Start Request(0x%02x)：Waiting Result[%s]" % [reqStartComm.id, "Time Out"])
-                raise("Sending the message of Communication Strat Request has failed. and then the communication stop.")
-            end
-            #非同期メッセージ受信タスク起動
-            if(@listenTask == nil)
-                @listenTask = Thread.start do
-                    listenerTask()
-                end
-            end
-            #読み上げデータ送信(0x03)
-            if (@ReqSendDataAccountName != nil && @ReqSendDataEncryptKey != nil)
-                #暗号化(アカウント名および暗号化キー有)
-                @ReqSendDataEncrypt = true
-            elsif (@ReqSendDataAccountName == nil && @ReqSendDataEncryptKey != nil)
-                #暗号化（暗号化キーのみ）エラーケース
-                @ReqSendDataAccountName = ""
-                @ReqSendDataEncrypt = true
-            elsif (@ReqSendDataAccountName != nil && @ReqSendDataEncryptKey == nil)
-                #平文（アカウント名のみ）
-                @ReqSendDataEncrypt = false
-                @ReqSendDataEncryptKey = ""
-            else
-                #平文(認証が有効の場合はエラーとなる)
-                @ReqSendDataAccountName = ""
-                @ReqSendDataEncrypt = false
-                @ReqSendDataEncryptKey = ""
-            end
-            timeStamp = sendSpeechData()
-            #通信終了通知(0x01)
-            if(timeStamp == nil || @ReceiveStatus != 0x00)
-                notifyEndCommProc(notifyEndComm.ERR_CODE_OTHER_REASONS)
-            else
-                notifyEndCommProc(notifyEndComm.ERR_CODE_NONE)
-            end
-        rescue => ex
-            HzTrace.traceCommMessage("%s" % [ex])
-            timeStamp = nil
-        ensure
-            return timeStamp
-        end
-    end
-    # <summary>
-    # 非同期メッセージ受信スレッドの終了
-    # </summary>
-    def cancelAsynchronousListener()
-        if (@listenTask != nil)
-            @listenTask.kill
-            @listenTask = nil
-            #HzTrace.traceCommMessage("非同期メッセージ受信スレッドをキャンセルしました。")
-            HzTrace.traceCommMessage("The thread for receiving some asynchronous messsages was canceled.")
-        end
-    end
-    # <summary>
-    # 読み上げデータ送信の停止（中断）
-    # </summary>
-    def stopSendSpeechData()
-        if (@tcpSvr != nil)
-            @tcpSvr.kill
-            @tcpSvr = nil
-            #HzTrace.traceCommMessage("読み上げデータ送信処理をキャンセルしました。")
-            HzTrace.traceCommMessage("The sending proccess for send of Speech Data was canceled.")
-        end
-    end
 end

data/lib/haruzira_sdk/MsgSendSpeechData.rb CHANGED Viewed

@@ -72,7 +72,7 @@ class MsgSendSpeechData
     end
     #アクセサ定義(メンバーIndex offset)
-    attr_reader     :INDEX_ID, :INDEX_ENC_FLG, :INDEX_DATA_TYPE, :INDEX_PRIORITY, :INDEX_LANG_CODE, :INDEX_LANG_CODE, \
+    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_SIZE, :INDEX_NAME

data/lib/haruzira_sdk/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module HaruziraSdk
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haruzira_sdk
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Symmetry Soft
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler