SONY APIコマンドの個別入力に対応。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SendRequestDialog.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SendRequestDialog.java
index 0d0a459..40fbcb3 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SendRequestDialog.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SendRequestDialog.java
@@ -32,7 +32,7 @@ public class SendRequestDialog  extends DialogFragment
     private String method = "";
     private int selectedPosition = 0;
     private SendRequestDialog.Callback callback = null;
-    Dialog myDialog = null;
+    private Dialog myDialog = null;
 
     /**
      *
@@ -78,17 +78,18 @@ public class SendRequestDialog  extends DialogFragment
 
         // Get the layout inflater
         LayoutInflater inflater = activity.getLayoutInflater();
-        final View alertView = inflater.inflate(R.layout.request_edit_layout, null, false);
+        final View alertView = inflater.inflate(R.layout.sony_request_edit_layout, null, false);
         alertDialog.setView(alertView);
 
         alertDialog.setIcon(R.drawable.ic_linked_camera_black_24dp);
         alertDialog.setTitle("API : " + method);
         final Spinner spinner = alertView.findViewById(R.id.spinner_selection_service);
-        final TextView methodName = alertView.findViewById(R.id.method_name);
+        final EditText methodName = alertView.findViewById(R.id.edit_method_name);
         final EditText parameter = alertView.findViewById(R.id.edit_parameter);
         final EditText version = alertView.findViewById(R.id.edit_version);
-        try {
-            methodName.setText("");
+        try
+        {
+            methodName.setText(method);
             version.setText(activity.getString(R.string.dialog_version_hint));
             ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, android.R.layout.simple_spinner_item);
             adapter.addAll(cameraApi.getSonyApiServiceList());
@@ -142,7 +143,7 @@ public class SendRequestDialog  extends DialogFragment
                             {
                                 if (callback != null)
                                 {
-                                    callback.sendRequest((String) spinner.getAdapter().getItem(selectedPosition), method, parameter.getText().toString(), version.getText().toString());
+                                    callback.sendRequest((String) spinner.getAdapter().getItem(selectedPosition), methodName.getText().toString(), parameter.getText().toString(), version.getText().toString());
                                 }
                             }
                         }

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SonyCameraApiListFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SonyCameraApiListFragment.java
index 66395db..138778e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SonyCameraApiListFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/camera/vendor/sony/cameraproperty/SonyCameraApiListFragment.java
@@ -171,6 +171,14 @@ public class SonyCameraApiListFragment extends ListFragment implements SendReque
                 Log.v(TAG, "FINISH GET API LIST");
                 try
                 {
+                    // 追加の追加する
+                    String addMethodText = "(free)";
+                    if (getActivity() != null)
+                    {
+                        addMethodText = getActivity().getString(R.string.free_method_name);
+                    }
+                    dataItems.add(addMethodText);
+
                     final FragmentActivity activity = getActivity();
                     if (activity != null)
                     {

diff --git a/app/src/main/res/layout/request_edit_layout.xml b/app/src/main/res/layout/sony_request_edit_layout.xml
similarity index 79%
rename from app/src/main/res/layout/request_edit_layout.xml
rename to app/src/main/res/layout/sony_request_edit_layout.xml
index 1980924..79e1eda 100644 (file)
--- a/app/src/main/res/layout/request_edit_layout.xml
+++ b/app/src/main/res/layout/sony_request_edit_layout.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:id="@+id/info_edit_data"
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -22,15 +22,21 @@
                 android:text="@string/blank"
                 android:visibility="visible" />
 
-            <TextView
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dp"
+                android:background="@android:color/darker_gray"/>
+
+            <EditText
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/method_name"
+                android:id="@+id/edit_method_name"
                 android:tag="title"
-                android:maxWidth="130dp"
-                android:minWidth="130dp"
+                android:linksClickable="true"
+                android:inputType="text"
+                android:hint="@string/dialog_method_name_hint"
                 android:layout_gravity="start">
-            </TextView>
+            </EditText>
 
             <EditText android:id="@+id/edit_parameter"
                 android:layout_width="fill_parent"

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 381813d..31c5645 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -258,11 +258,13 @@
     <string name="camera_detected">発見 : </string>
     <string name="pref_sony_api_list">カメラAPI一覧</string>
     <string name="dialog_title_reply">応答</string>
+    <string name="dialog_method_name_hint">(Method Name)</string>
     <string name="dialog_parameter_hint">(parameter)</string>
     <string name="dialog_version_hint">1.0</string>
     <string name="dialog_command_hint">(command)</string>
     <string name="dialog_service_hint">(service)</string>
     <string name="action_share">共有</string>
+    <string name="free_method_name">(Method Name)</string>
 
     <string name="pref_exit_power_off_panasonic">アプリ終了</string>
     <string name="pref_exit_power_off_sony">アプリ終了</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 54b8eca..0154839 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,11 +259,13 @@
 
     <string name="pref_sony_api_list">Sony Camera Api List</string>
     <string name="dialog_title_reply">Reply</string>
+    <string name="dialog_method_name_hint">(Method Name)</string>
     <string name="dialog_parameter_hint">(parameter)</string>
     <string name="dialog_version_hint">1.0</string>
     <string name="dialog_command_hint">(command)</string>
     <string name="dialog_service_hint">(service)</string>
     <string name="action_share">Share</string>
+    <string name="free_method_name">()</string>
 
     <string name="pref_exit_power_off_panasonic">Exit Application</string>
     <string name="pref_exit_power_off_sony">Exit Application</string>