-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CMakeSettings">
<configurations>
applicationId "net.osdn.gokigen.pkremote"
minSdkVersion 14
targetSdkVersion 34
- versionCode 10805
- versionName "1.8.5"
+ versionCode 10806
+ versionName "1.8.6"
multiDexEnabled true
}
buildTypes {
else
{
Log.v(TAG, " onReceivedFtpResponse($command/$code) [${response.length}] $response")
+ when (command)
+ {
+ "receiveFromDevice(data)" -> onReceivedDataError(response)
+ }
}
}
catch (e: Exception)
}
}
+ private fun onReceivedDataError(response: String)
+ {
+ try
+ {
+ // Occurs data receive timeout, so disconnect ftp
+ ftpClient.enqueueCommand(FtpCommand("quit", "QUIT\r\n"))
+ }
+ catch (e: Exception)
+ {
+ e.printStackTrace()
+ }
+ }
+
private fun inputUser(response: String)
{
try
<item>Sony</item>
<item>Canon</item>
<item>Nikon</item>
- <item>Vision Kids</item>
+ <item>VisionKids / myFirst</item>
</string-array>
<string-array name="connection_method_value">
<string name="pref_canon_small_picture_type">スモール画像取得シーケンス</string>
<string name="pref_summary_canon_small_picture_type">スモール画像がうまく取得できない場合、設定を変更してみてください。 (初期値: TYPE0)</string>
- <string name="pref_visionkids_host_ip">カメラIPアドレス</string>
- <string name="pref_summary_visionkids_host_ip">通常、変更は不要です (初期値:192.168.4.100)</string>
+ <string name="pref_visionkids_host_ip">カメラIP(初期値:192.168.4.100)</string>
+ <string name="pref_summary_visionkids_host_ip">VisionKids:192.168.4.100, myFirst:192.168.1.1 </string>
<string name="pref_visionkids_ftp_user">カメラアクセス用設定(User)</string>
<string name="pref_summary_visionkids_ftp_user">通常、変更は不要です (初期値:ftp)</string>
<item>Sony</item>
<item>Canon</item>
<item>Nikon</item>
- <item>Vision Kids</item>
+ <item>VisionKids / myFirst</item>
</string-array>
<string-array name="connection_method_value">
<string name="pref_canon_small_picture_type">Small Picture Getting Sequence</string>
<string name="pref_summary_canon_small_picture_type">default: TYPE0 </string>
- <string name="pref_visionkids_host_ip">Camera IP Address</string>
- <string name="pref_summary_visionkids_host_ip">default: 192.168.4.100 </string>
+ <string name="pref_visionkids_host_ip">Camera IP(default: 192.168.4.100)</string>
+ <string name="pref_summary_visionkids_host_ip">VisionKids:192.168.4.100, myFirst:192.168.1.1</string>
<string name="pref_visionkids_ftp_user">Camera Access User</string>
<string name="pref_summary_visionkids_ftp_user">default: ftp </string>