public class CameraPropertyArrayAdapter extends ArrayAdapter<CameraPropertyArrayItem>
{
- private LayoutInflater inflater = null;
+ private LayoutInflater inflater;
private final int textViewResourceId;
- private List<CameraPropertyArrayItem> listItems = null;
+ private List<CameraPropertyArrayItem> listItems;
CameraPropertyArrayAdapter(Context context, int textId, List<CameraPropertyArrayItem> items)
{
public class CameraPropertyArrayItem
{
- private int iconResource = 0;
+ private int iconResource;
private final String propertyName;
private final String propertyTitle;
private final String initialValue;
private final String initialValueTitle;
private final int initialIconResource;
- private String propertyValue = "";
- private String propertyValueTitle = "";
+ private String propertyValue;
+ private String propertyValueTitle;
- public CameraPropertyArrayItem(String name, String title, String valueTitle, String value, int iconId1)
+ CameraPropertyArrayItem(String name, String title, String valueTitle, String value, int iconId1)
{
iconResource = iconId1;
propertyName = name;
private final IPropertyLoaderCallback callback;
private ArrayList<CameraPropertyArrayItem> propertyItems = null;
- public CameraPropertyLoader(IOlyCameraPropertyProvider propertyInterface, IPropertyLoaderCallback callback)
+ CameraPropertyLoader(IOlyCameraPropertyProvider propertyInterface, IPropertyLoaderCallback callback)
{
this.propertyInterface = propertyInterface;
this.callback = callback;
private final CameraPropertyLoader loader;
- public CameraPropertyOperator(Context context, CameraPropertyLoader loader)
+ CameraPropertyOperator(Context context, CameraPropertyLoader loader)
{
this.context = context;
this.loader = loader;
*
*
*/
- public CameraPropertyValueSelector(Context context, IOlyCameraPropertyProvider propertyInterface, ICametaPropertyUpdateNotify updater)
+ CameraPropertyValueSelector(Context context, IOlyCameraPropertyProvider propertyInterface, ICametaPropertyUpdateNotify updater)
{
this.context = context;
this.propertyInterface = propertyInterface;
interface ILoadSaveCameraProperties
{
- static final int MAX_STORE_PROPERTIES = 256; // お気に入り設定の最大記憶数...
- static final String TITLE_KEY = "CameraPropTitleKey";
- static final String DATE_KEY = "CameraPropDateTime";
+ int MAX_STORE_PROPERTIES = 256; // お気に入り設定の最大記憶数...
+ String TITLE_KEY = "CameraPropTitleKey";
+ String DATE_KEY = "CameraPropDateTime";
void loadCameraSettings(final String id, final String dataName);
void saveCameraSettings(final String id, final String dataName);
private boolean saveCameraSettingsImpl(String idHeader, String dataName)
{
boolean ret = false;
- Map<String, String> values = null;
+ Map<String, String> values;
try
{
values = propertyProvider.getCameraPropertyValues(propertyProvider.getCameraPropertyNames());
{
// 現在の設定値を全部とってくる
- Map<String, String> propertyValues = null;
+ Map<String, String> propertyValues;
try
{
propertyValues = propertyProvider.getCameraPropertyValues(propertyProvider.getCameraPropertyNames());
try
{
View view = inflater.inflate(R.layout.dialog_my_camera_properties, container);
- tabHost = (FragmentTabHost) view.findViewById(R.id.tabHost01);
+ tabHost = view.findViewById(R.id.tabHost01);
tabHost.setup(getActivity(), getChildFragmentManager());
tabHost.addTab(tabHost.newTabSpec("Load").setIndicator(getString(R.string.title_tab_title_load)), Fragment.class, null);
tabHost.addTab(tabHost.newTabSpec("Save").setIndicator(getString(R.string.title_tab_title_save)), Fragment.class, null);
LoadSaveMyCameraPropertyPagerAdapter adapter = new LoadSaveMyCameraPropertyPagerAdapter(getChildFragmentManager(), this);
adapter.setTitles(new String[]{getString(R.string.title_tab_title_load), getString(R.string.title_tab_title_save)});
- viewPager = (ViewPager) view.findViewById(R.id.pager);
+ viewPager = view.findViewById(R.id.pager);
viewPager.setAdapter(adapter);
//viewPager.setOnPageChangeListener(this);
viewPager.addOnPageChangeListener(this);
package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
import android.content.Context;
+import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
class MyCameraPropertyLoadArrayAdapter extends ArrayAdapter<MyCameraPropertySetItems>
{
- private LayoutInflater inflater = null;
+ private LayoutInflater inflater;
private final int textViewResourceId;
- private List<MyCameraPropertySetItems> listItems = null;
+ private List<MyCameraPropertySetItems> listItems;
MyCameraPropertyLoadArrayAdapter(Context context, int resource, List<MyCameraPropertySetItems> objects)
{
*
*/
@Override
- public View getView(int position, View convertView, ViewGroup parent)
+ public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent)
{
View view;
if(convertView != null)
MyCameraPropertySetItems item = listItems.get(position);
try
{
- TextView idView = (TextView) view.findViewWithTag("id");
+ TextView idView = view.findViewWithTag("id");
idView.setText(item.getItemId());
- TextView titleView = (TextView)view.findViewWithTag("title");
+ TextView titleView = view.findViewWithTag("title");
titleView.setText(item.getItemName());
- TextView infoView = (TextView) view.findViewWithTag("info");
+ TextView infoView = view.findViewWithTag("info");
infoView.setText(item.getItemInfo());
}
package net.osdn.gokigen.a01d.camera.olympus.myolycameraprops;
import android.content.Context;
+import android.support.annotation.NonNull;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
{
private final String TAG = toString();
private final Context context;
- private LayoutInflater inflater = null;
+ private LayoutInflater inflater;
private final int textViewResourceId;
- private List<MyCameraPropertySetItems> listItems = null;
+ private List<MyCameraPropertySetItems> listItems;
private final ILoadSaveMyCameraPropertyDialogDismiss dialogDismiss;
*
*/
@Override
- public View getView(int position, View convertView, ViewGroup parent)
+ public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent)
{
View view;
if(convertView != null)
{
final MyCameraPropertySetItems item = listItems.get(position);
- TextView idView = (TextView) view.findViewWithTag("id");
+ TextView idView =view.findViewWithTag("id");
idView.setText(item.getItemId());
- final EditText titleView = (EditText)view.findViewWithTag("title");
+ final EditText titleView = view.findViewWithTag("title");
titleView.setText(item.getItemName());
- TextView infoView = (TextView) view.findViewWithTag("info");
+ TextView infoView = view.findViewWithTag("info");
infoView.setText(item.getItemInfo());
- Button button = (Button) view.findViewWithTag("button");
+ Button button = view.findViewWithTag("button");
button.setOnClickListener(new Button.OnClickListener()
{
@Override
class MyCameraPropertySetItems
{
private final String itemId;
- private String itemName = "";
- private String itemInfo = "";
- private int iconResource = 0;
+ private String itemName;
+ private String itemInfo;
+ private int iconResource;
MyCameraPropertySetItems(int iconResource, String itemId, String itemName, String itemInfo)
{
private final OLYCamera camera;
private final IIndicatorControl indicator;
- private IAutoFocusFrameDisplay frameDisplayer = null;
+ private IAutoFocusFrameDisplay frameDisplayer;
private RectF focusFrameRect = null;
/**
private final Context context;
private final OLYCamera camera;
private final IIndicatorControl indicator;
- private IAutoFocusFrameDisplay frameDisplayer = null;
+ private IAutoFocusFrameDisplay frameDisplayer;
private IIndicatorControl.shootingStatus currentStatus = IIndicatorControl.shootingStatus.Unknown;
private final OLYCamera camera;
private final IIndicatorControl indicator;
- private IAutoFocusFrameDisplay frameDisplayer = null;
+ private IAutoFocusFrameDisplay frameDisplayer;
/**
* コンストラクタ
private final String TAG = toString();
private final SingleShotControl singleShotControl;
- public OlyCameraCaptureControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
+ OlyCameraCaptureControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
{
singleShotControl = new SingleShotControl(wrapper.getOLYCamera(), frameDisplayer, indicator);
}
*/
public class OlyCameraFocusControl implements IFocusingControl
{
- private final String TAG = toString();
private final OlympusAutoFocusControl afControl;
private final IAutoFocusFrameDisplay frameDisplay;
- public OlyCameraFocusControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
+ OlyCameraFocusControl(OlyCameraWrapper wrapper, IAutoFocusFrameDisplay frameDisplayer, IIndicatorControl indicator)
{
this.frameDisplay = frameDisplayer;
afControl = new OlympusAutoFocusControl(wrapper.getOLYCamera(), frameDisplayer, indicator);
/**
*
*/
- public OlyCameraHardwareStatus(OLYCamera camera)
+ OlyCameraHardwareStatus(OLYCamera camera)
{
this.camera = camera;
}
Log.v(TAG,context.getString(R.string.connect_check_wifi));
String action = intent.getAction();
- try {
- if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION))
+ try
+ {
+ if ((action != null)&&(action.equals(ConnectivityManager.CONNECTIVITY_ACTION)))
{
Log.v(TAG, "onReceiveBroadcastOfConnection() : CONNECTIVITY_ACTION");
WifiManager wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
- WifiInfo info = wifiManager.getConnectionInfo();
- if (wifiManager.isWifiEnabled() && info != null )
- {
- if (info.getNetworkId() != -1)
- {
- Log.v(TAG, "Network ID is -1, there is no currently connected network.");
- }
- // 自動接続が指示されていた場合は、カメラとの接続処理を行う
- connectToCamera();
- }
- else
- {
- if (info == null)
- {
- Log.v(TAG, "NETWORK INFO IS NULL.");
- }
- else
- {
- Log.v(TAG, "isWifiEnabled : " + wifiManager.isWifiEnabled() + " NetworkId : " + info.getNetworkId());
+ if (wifiManager != null) {
+ WifiInfo info = wifiManager.getConnectionInfo();
+ if (wifiManager.isWifiEnabled() && info != null) {
+ if (info.getNetworkId() != -1) {
+ Log.v(TAG, "Network ID is -1, there is no currently connected network.");
+ }
+ // 自動接続が指示されていた場合は、カメラとの接続処理を行う
+ connectToCamera();
+ } else {
+ if (info == null) {
+ Log.v(TAG, "NETWORK INFO IS NULL.");
+ } else {
+ Log.v(TAG, "isWifiEnabled : " + wifiManager.isWifiEnabled() + " NetworkId : " + info.getNetworkId());
+ }
}
}
}
{
private final String TAG = toString();
private final Context context;
- private LayoutInflater inflater = null;
+ private LayoutInflater inflater;
private final int textViewResourceId;
private final IOlyCameraSetDialogDismiss dialogDismiss;
- private List<OlyCameraSetArrayItem> listItems = null;
+ private List<OlyCameraSetArrayItem> listItems;
OlyCameraSetArrayAdapter(Context context, int textId, List<OlyCameraSetArrayItem> items, IOlyCameraSetDialogDismiss dialogDismiss)
{
class OlyCameraSetArrayItem
{
private final String dataId;
- private String btName = "";
- private String btPassCode = "";
- private String information = "";
+ private String btName;
+ private String btPassCode;
+ private String information;
/*
private final String initialBtName;
private final String initialBtPassCode;
import android.util.Log;
-import net.osdn.gokigen.a01d.R;
import net.osdn.gokigen.a01d.camera.utils.SimpleHttpClient;
public class RicohGr2CameraDisconnectSequence implements Runnable
package net.osdn.gokigen.a01d.camera.sony.cameraproperty;
import android.app.Activity;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.ListFragment;
import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.LayoutInflater;
import org.json.JSONObject;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
try
{
ConfirmationDialog dialog = ConfirmationDialog.newInstance(getActivity());
- String replyString = "";
+ String replyString;
try
{
replyString = reply.getString("result");
import android.view.MotionEvent;
import net.osdn.gokigen.a01d.camera.IFocusingControl;
-import net.osdn.gokigen.a01d.camera.olympus.operation.takepicture.OlympusAutoFocusControl;
import net.osdn.gokigen.a01d.camera.sony.operation.takepicture.SonyAutoFocusControl;
import net.osdn.gokigen.a01d.camera.sony.wrapper.ISonyCameraApi;
import net.osdn.gokigen.a01d.liveview.IAutoFocusFrameDisplay;
package net.osdn.gokigen.a01d.camera.sony.operation.takepicture;
-import android.graphics.RectF;
import android.support.annotation.NonNull;
import android.util.Log;
package net.osdn.gokigen.a01d.camera.sony.wrapper.connection;
import android.app.Activity;
-import android.content.Context;
import android.support.annotation.NonNull;
import android.util.Log;
package net.osdn.gokigen.a01d.liveview;
-import android.graphics.Bitmap;
-
import net.osdn.gokigen.a01d.liveview.message.IMessageDrawer;
/**
*/
public class ScalableImageViewPanel extends AppCompatImageView
{
-
- private static enum GestureMode {
+ private enum GestureMode
+ {
None,
Move,
Zoom,
public void setImageDrawable(Drawable drawable) {
super.setImageDrawable(drawable);
reset();
- };
+ }
@Override
public void setImageBitmap(Bitmap bm) {
super.setImageBitmap(bm);
reset();
- };
+ }
@Override
public void setImageURI(Uri uri) {
/**
* Constructs a new CapturedImageView.
*
- * @param context
+ *
*/
public ScalableImageViewPanel(Context context) {
super(context);
/**
* Constructs a new CapturedImageView.
*
- * @param context
- * @param attrs
+ *
+ *
*/
public ScalableImageViewPanel(Context context, AttributeSet attrs) {
super(context, attrs);
/**
* Constructs a new CapturedImageView.
*
- * @param context
- * @param attrs
- * @param defStyle
+ *
+ *
+ *
*/
public ScalableImageViewPanel(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
if (touchCount >= 2) {
// Starts zooming and takes in the center point.
mGestureMode = GestureMode.Zoom;
- float distance = (float)Math.hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1));
- mScalingBaseDistance = distance;
+ mScalingBaseDistance = (float)Math.hypot(event.getX(0) - event.getX(1), event.getY(0) - event.getY(1));
mScalingCenterX = (event.getX(0) + event.getX(1)) / 2;
mScalingCenterY = (event.getY(0) + event.getY(1)) / 2;
}
public static IPreviewImageConverter getImageConverter(int id)
{
- IPreviewImageConverter drawer = new ConvertNothing();
- return (drawer);
+ return (new ConvertNothing());
}
}
package net.osdn.gokigen.a01d.liveview.message;
import android.graphics.Color;
-import android.view.ViewDebug;
/**
*
OSDN Git Service
