OSDN Git Service
(root)
/
gokigen
/
A01d.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9f5f952
)
使えないボタンを消す。
author
MRSa
<mrsa@myad.jp>
Sun, 5 Jan 2020 11:11:43 +0000
(20:11 +0900)
committer
MRSa
<mrsa@myad.jp>
Sun, 5 Jan 2020 11:11:43 +0000
(20:11 +0900)
app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenCameraConnectSequence.java
patch
|
blob
|
history
app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
patch
|
blob
|
history
diff --git
a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenCameraConnectSequence.java
b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenCameraConnectSequence.java
index
c61f677
..
9d8a715
100644
(file)
--- a/
app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenCameraConnectSequence.java
+++ b/
app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/connection/OlympusPenCameraConnectSequence.java
@@
-35,7
+35,7
@@
class OlympusPenCameraConnectSequence implements Runnable
final String getCommandListUrl = "http://192.168.0.10/get_commandlist.cgi";
final String getConnectModeUrl = "http://192.168.0.10/get_connectmode.cgi";
final String switchCameraModeUrl = "http://192.168.0.10/switch_cammode.cgi";
final String getCommandListUrl = "http://192.168.0.10/get_commandlist.cgi";
final String getConnectModeUrl = "http://192.168.0.10/get_connectmode.cgi";
final String switchCameraModeUrl = "http://192.168.0.10/switch_cammode.cgi";
- //final String getCameraStatusUrl = "http://192.168.0.10/get_
st
ate.cgi";
+ //final String getCameraStatusUrl = "http://192.168.0.10/get_
activ
ate.cgi";
final int TIMEOUT_MS = 5000;
try
final int TIMEOUT_MS = 5000;
try
@@
-59,7
+59,7
@@
class OlympusPenCameraConnectSequence implements Runnable
String response4 = SimpleHttpClient.httpGetWithHeader(lvUrl, headerMap, null, TIMEOUT_MS);
Log.v(TAG, " " + lvUrl + " " + response4);
String response4 = SimpleHttpClient.httpGetWithHeader(lvUrl, headerMap, null, TIMEOUT_MS);
Log.v(TAG, " " + lvUrl + " " + response4);
- // カメラのステータス取得
+ //
//
カメラのステータス取得
//String response5 = SimpleHttpClient.httpGetWithHeader(getCameraStatusUrl, headerMap, null, TIMEOUT_MS);
//Log.v(TAG, " " + getCameraStatusUrl + " " + response5);
//String response5 = SimpleHttpClient.httpGetWithHeader(getCameraStatusUrl, headerMap, null, TIMEOUT_MS);
//Log.v(TAG, " " + getCameraStatusUrl + " " + response5);
diff --git
a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
index
00237b9
..
2bfd501
100644
(file)
--- a/
app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
+++ b/
app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
@@
-110,7
+110,7
@@
public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
*
*/
@Override
*
*/
@Override
- public void onAttach(Context context)
+ public void onAttach(
@NonNull
Context context)
{
super.onAttach(context);
Log.v(TAG, "onAttach()");
{
super.onAttach(context);
Log.v(TAG, "onAttach()");
@@
-297,19
+297,14
@@
public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
}
else if (connectionMethod == ICameraConnection.CameraConnectionMethod.OLYMPUS)
{
}
else if (connectionMethod == ICameraConnection.CameraConnectionMethod.OLYMPUS)
{
- /*
- if (favoriteButton != null)
- {
- favoriteButton.setVisibility(View.VISIBLE);
- favoriteButton.setOnClickListener(onClickTouchListener);
- }
if (manualFocus != null)
{
manualFocus.setVisibility(View.INVISIBLE);
}
if (manualFocus != null)
{
manualFocus.setVisibility(View.INVISIBLE);
}
- if (
changeLiveViewScale
!= null)
+ if (
favoriteButton
!= null)
{
{
- changeLiveViewScale.setVisibility(View.INVISIBLE);
+ favoriteButton.setVisibility(View.INVISIBLE);
+ //favoriteButton.setOnClickListener(onClickTouchListener);
}
if (focusIndicator != null)
{
}
if (focusIndicator != null)
{
@@
-317,9
+312,13
@@
public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
}
if (propertyButton != null)
{
}
if (propertyButton != null)
{
- propertyButton.setOnClickListener(onClickTouchListener);
+ propertyButton.setVisibility(View.INVISIBLE);
+ //propertyButton.setOnClickListener(onClickTouchListener);
+ }
+ if (changeLiveViewScale != null)
+ {
+ changeLiveViewScale.setVisibility(View.INVISIBLE);
}
}
- */
}
}
if (manualFocus != null)
}
}
if (manualFocus != null)