|
@@ -571,6 +571,8 @@ public class DataSenderService extends Service {
|
|
|
outputStream.writeObject(result);
|
|
|
outputStream.close();
|
|
|
Log.d("ServerThread", "result 보냄 : " + result);
|
|
|
+ } else{
|
|
|
+ outputStream.close();
|
|
|
}
|
|
|
inputStream.close();
|
|
|
socket.close(); // 연결을 유지할 필요 없으면 끊어줌.
|
|
@@ -968,8 +970,8 @@ public class DataSenderService extends Service {
|
|
|
}
|
|
|
}
|
|
|
int ret = mKnxAPI.SetLightOnOff((byte) (index), define.DEVICE_ALL_OR_NOTHING, OnOff);
|
|
|
- if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
- else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
+ //if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
+ //else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -987,8 +989,8 @@ public class DataSenderService extends Service {
|
|
|
}
|
|
|
}
|
|
|
int ret = mKnxAPI.SetLightSwitchOnOff((byte) (index), define.DEVICE_ALL_OR_NOTHING, OnOff);
|
|
|
- if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
- else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
+ //if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
+ //else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -1040,8 +1042,8 @@ public class DataSenderService extends Service {
|
|
|
Log.e(TAG, "[Device_LightOnOff] - Error (" + ret + ") ErrorCode = " + mKnxAPI.ErrorCode.ErrStr());
|
|
|
}
|
|
|
}
|
|
|
- if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
- else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
+ //if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
+ //else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
ret = JSON.ERROR.RuntimeException;
|
|
@@ -1113,8 +1115,8 @@ public class DataSenderService extends Service {
|
|
|
Log.e(TAG, "[Device_LightOnOff] - Error (" + ret + ") ErrorCode = " + mKnxAPI.ErrorCode.ErrStr());
|
|
|
}
|
|
|
}
|
|
|
- if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
- else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
+ //if (ret >= 0) mSound.Play(WpadSound.SND.effect.TOUCH_LATCHED);
|
|
|
+ //else mSound.Play(WpadSound.SND.effect.TOUCH_UNLATCHED);
|
|
|
} catch (RuntimeException re) {
|
|
|
LogUtil.errorLogInfo("", TAG, re);
|
|
|
ret = JSON.ERROR.RuntimeException;
|