MIDI関連のイベントのGETボタンを追加。プロファイル一覧画面に戻るボタンを追加。

Author: masaru-takano

dConnectJavascriptApp/js/profile/midi.js

@@ -9,6 +9,10 @@ function showMidi(serviceId) {
   initAll();
   setTitle('MIDI Profile');
 
+  let btnStr = getBackButton('Device Top', 'searchSystem', serviceId);
+  reloadHeader(btnStr);
+  reloadFooter(btnStr);
+
   let str = '';
 
   // MIDI デバイス情報

dConnectJavascriptApp/js/profile/soundController.js

@@ -9,16 +9,26 @@ function showSoundController(serviceId) {
   initAll();
   setTitle('SoundController Profile');
 
+  let btnStr = getBackButton('Device Top', 'searchSystem', serviceId);
+  reloadHeader(btnStr);
+  reloadFooter(btnStr);
+
   let str = '';
   str += '<div>イベント登録状態: <span id="eventStatus"></span></div>';
-  str += '<fieldset class="ui-grid-a">';
-  str += '<div class="ui-block-a"><button id="btnRegisterOnNoteEvent">登録</button></div>';
-  str += '<div class="ui-block-b"><button id="btnUnegisterOnNoteEvent">解除</button></div>';
+  str += '<fieldset class="ui-grid-b">';
+  str += '<div class="ui-block-a"><button id="btnGetOnNoteEvent">GET</button></div>';
+  str += '<div class="ui-block-b"><button id="btnRegisterOnNoteEvent">登録</button></div>';
+  str += '<div class="ui-block-c"><button id="btnUnegisterOnNoteEvent">解除</button></div>';
   str += '</fieldset>';
-  str += '<div id="evaneLog"></div>';
+  str += '<hr>';
+  str += '<div>イベントログ:</div>';
+  str += '<textarea id="evaneLog" data-autogrow="false" rows="10"></textarea>';
 
   reloadContent(str);
 
+  $('#btnGetOnNoteEvent').on('click', function() {
+    getOnNoteEvent(serviceId);
+  });
   $('#btnRegisterOnNoteEvent').on('click', function() {
     registerOnNoteEvent(serviceId);
   });
@@ -33,6 +43,20 @@ function showOnNoteEventStatus(str) {
   $('#eventStatus').text(str);
 }
 
+function getOnNoteEvent(serviceId) {
+  sdk.get({
+    profile: 'soundController',
+    attribute: 'onNote',
+    params: {
+      serviceId
+    }
+  }).then(json => {
+    showOnNoteMessage(json, 'GET');
+  }).catch(e => {
+    showError('GET /soundController/onNote', e.errorCode, e.errorMessage);
+  });
+}
+
 function registerOnNoteEvent(serviceId) {
   showOnNoteEventStatus('登録処理中...');
   sdk.addEventListener({
@@ -46,7 +70,7 @@ function registerOnNoteEvent(serviceId) {
     if (DEBUG) {
       console.log('Event: /soundController/onNote: ', json);
     }
-    showOnNoteEvent(json);
+    showOnNoteMessage(json, 'EVENT');
   }).then(json => {
     if (DEBUG) {
       console.log('Response: ', json);
@@ -58,11 +82,14 @@ function registerOnNoteEvent(serviceId) {
   });
 }
 
-function showOnNoteEvent(json) {
+function showOnNoteMessage(json, type) {
   if (json) {
-    let note = json.note;
     let channel = json.channel;
-    $('#evaneLog').html(`音階=${note} チャンネル=${channel}`);
+    let note = json.note;
+    let state = json.state;
+
+    let log = $('#evaneLog').text();
+    $('#evaneLog').text(`[${toLocaleDateTime(new Date())}][${type}] チャンネル=${channel} 音階=${note} 状態=${state}\n${log}`);
   }
 }
 

dConnectJavascriptApp/js/profile/soundModule.js

@@ -9,6 +9,10 @@ function showSoundModule(serviceId) {
   initAll();
   setTitle('SoundModule Profile');
 
+  let btnStr = getBackButton('Device Top', 'searchSystem', serviceId);
+  reloadHeader(btnStr);
+  reloadFooter(btnStr);
+
   let str = '';
   str += '<table width="100%">';
   str += '<tbody>';

dConnectJavascriptApp/js/profile/volumeController.js

@@ -9,16 +9,26 @@ function showVolumeController(serviceId) {
   initAll();
   setTitle('VolumeController Profile');
 
+  let btnStr = getBackButton('Device Top', 'searchSystem', serviceId);
+  reloadHeader(btnStr);
+  reloadFooter(btnStr);
+
   let str = '';
   str += '<div>イベント登録状態: <span id="eventStatus"></span></div>';
-  str += '<fieldset class="ui-grid-a">';
-  str += '<div class="ui-block-a"><button id="btnRegisterOnVolumeChangeEvent">登録</button></div>';
-  str += '<div class="ui-block-b"><button id="btnUnegisterOnVolumeChangeEvent">解除</button></div>';
+  str += '<fieldset class="ui-grid-b">';
+  str += '<div class="ui-block-a"><button id="btnGetOnVolumeChangeEvent">GET</button></div>';
+  str += '<div class="ui-block-b"><button id="btnRegisterOnVolumeChangeEvent">登録</button></div>';
+  str += '<div class="ui-block-c"><button id="btnUnegisterOnVolumeChangeEvent">解除</button></div>';
   str += '</fieldset>';
-  str += '<div id="evaneLog"></div>';
+  str += '<hr>';
+  str += '<div>イベントログ:</div>';
+  str += '<textarea id="evaneLog" data-autogrow="false" rows="10"></textarea>';
 
   reloadContent(str);
 
+  $('#btnGetOnVolumeChangeEvent').on('click', function() {
+    getOnVolumeChangeEvent(serviceId);
+  });
   $('#btnRegisterOnVolumeChangeEvent').on('click', function() {
     registerOnVolumeChangeEvent(serviceId);
   });
@@ -33,6 +43,20 @@ function showOnVolumeChangeEventStatus(str) {
   $('#eventStatus').text(str);
 }
 
+function getOnVolumeChangeEvent(serviceId) {
+  sdk.get({
+    profile: 'volumeController',
+    attribute: 'onVolumeChange',
+    params: {
+      serviceId
+    }
+  }).then(json => {
+    showOnVolumeChangeMessage(json, 'GET');
+  }).catch(e => {
+    showError('GET /volumeController/onVolumeChange', e.errorCode, e.errorMessage);
+  });
+}
+
 function registerOnVolumeChangeEvent(serviceId) {
   showOnVolumeChangeEventStatus('登録処理中...');
   sdk.addEventListener({
@@ -46,7 +70,7 @@ function registerOnVolumeChangeEvent(serviceId) {
     if (DEBUG) {
       console.log('Event: /volumeController/onVolumeChange: ', json);
     }
-    showOnVolumeChangeEvent(json);
+    showOnVolumeChangeMessage(json, 'EVENT');
   }).then(json => {
     if (DEBUG) {
       console.log('Response: ', json);
@@ -58,11 +82,13 @@ function registerOnVolumeChangeEvent(serviceId) {
   });
 }
 
-function showOnVolumeChangeEvent(json) {
+function showOnVolumeChangeMessage(json, type) {
   if (json) {
-    let value = json.value;
     let channel = json.channel;
-    $('#evaneLog').html(`ボリューム値=${value} チャンネル=${channel}`);
+    let value = json.value;
+
+    let log = $('#evaneLog').text();
+    $('#evaneLog').text(`[${toLocaleDateTime(new Date())}][${type}] チャンネル=${channel} ボリューム値=${value}\n${log}`);
   }
 }
 

dConnectJavascriptApp/js/sdk/util.js

@@ -244,3 +244,17 @@ function showError(profileName, errorCode, errorMessage) {
         '\n errorCode:' + errorCode);
   }
 }
+
+/**
+ * 指定した Date オブジェクトの文字列表現を取得する.
+ * 
+ * ミリ秒まで含めた、かつ、ロケールに合わせた日時の文字列を返す.
+ * 
+ * @param {Object} date Date オブジェクト
+ */
+function toLocaleDateTime(date) {
+  let dateStr = date.toLocaleDateString();
+  let timeStr = date.toLocaleTimeString();
+  let msStr = (date.getMilliseconds() / 1000).toFixed(3).slice(2, 5);
+  return `${dateStr} ${timeStr}.${msStr}`;
+}