From: MRSa <mrsa@myad.jp>
Date: Sat, 29 Jul 2023 14:09:32 +0000 (+0900)
Subject: myFirst対応。
X-Git-Url: http://git.osdn.net/view?p=gokigen%2FPKRemote.git;a=commitdiff_plain;h=74ee14898ca0176683f707a8bb817c50b3110a63

myFirst対応。
---

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a68fe43..11ab538 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CMakeSettings">
     <configurations>
diff --git a/app/build.gradle b/app/build.gradle
index 0e73118..c11cdd1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "net.osdn.gokigen.pkremote"
         minSdkVersion 14
         targetSdkVersion 34
-        versionCode 10805
-        versionName "1.8.5"
+        versionCode 10806
+        versionName "1.8.6"
         multiDexEnabled true
     }
     buildTypes {
diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/visionkids/wrapper/playback/VisionKidsCameraContentProvider.kt b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/visionkids/wrapper/playback/VisionKidsCameraContentProvider.kt
index 374c25a..5af4496 100644
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/visionkids/wrapper/playback/VisionKidsCameraContentProvider.kt
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/visionkids/wrapper/playback/VisionKidsCameraContentProvider.kt
@@ -94,6 +94,10 @@ class VisionKidsCameraContentProvider(context: AppCompatActivity) : IFtpServiceC
             else
             {
                 Log.v(TAG, " onReceivedFtpResponse($command/$code) [${response.length}] $response")
+                when (command)
+                {
+                    "receiveFromDevice(data)" -> onReceivedDataError(response)
+                }
             }
         }
         catch (e: Exception)
@@ -102,6 +106,19 @@ class VisionKidsCameraContentProvider(context: AppCompatActivity) : IFtpServiceC
         }
     }
 
+    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
diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
index 6bad100..9fafdad 100644
--- a/app/src/main/res/values-ja/arrays.xml
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -11,7 +11,7 @@
         <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">
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a1d4ecf..2eeaa8d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -382,8 +382,8 @@
     <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>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ba1bb3e..68647ea 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -11,7 +11,7 @@
         <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">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b308e7..e86e9f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -384,8 +384,8 @@
     <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>