Skip to content

Commit 7639ebb

Browse files
TakayukiHoshi1984TakayukiHoshi1984
committed
dConnectManagerのAndroidX対応。
1 parent 3018be3 commit 7639ebb

119 files changed

Lines changed: 712 additions & 961 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,7 @@ repositories {
7272

7373
dependencies {
7474
implementation fileTree(include: '*.jar', dir: 'libs')
75-
implementation('com.android.support:appcompat-v7:28.0.0') {
76-
exclude module: 'animated-vector-drawable'
77-
exclude module: 'support-media-compat'
78-
}
79-
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
75+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
8076
implementation project(':dconnect-demo-lib')
8177
implementation project(':libstreaming')
8278
implementation('com.serenegiant:common:2.12.5') {

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/BluetoothManageActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import android.content.ActivityNotFoundException;
1111
import android.content.Intent;
1212
import android.os.Bundle;
13-
import android.support.v4.app.FragmentActivity;
13+
14+
import androidx.fragment.app.FragmentActivity;
1415

1516
import org.deviceconnect.android.message.MessageUtils;
1617
import org.deviceconnect.android.profile.ConnectionProfile;

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/CanvasProfileActivity.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.app.AlertDialog;
1212
import android.app.Dialog;
1313
import android.app.DialogFragment;
14-
import android.app.ProgressDialog;
1514
import android.content.BroadcastReceiver;
1615
import android.content.Context;
1716
import android.content.DialogInterface;
@@ -23,7 +22,6 @@
2322
import android.graphics.drawable.BitmapDrawable;
2423
import android.os.AsyncTask;
2524
import android.os.Bundle;
26-
import android.support.v4.content.LocalBroadcastManager;
2725
import android.view.LayoutInflater;
2826
import android.view.View;
2927
import android.view.View.OnClickListener;
@@ -33,6 +31,8 @@
3331
import android.widget.ImageView.ScaleType;
3432
import android.widget.TextView;
3533

34+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
35+
3636
import org.deviceconnect.android.deviceplugin.host.R;
3737
import org.deviceconnect.android.deviceplugin.host.canvas.CanvasDrawImageObject;
3838
import org.deviceconnect.android.deviceplugin.host.canvas.CanvasDrawUtils;
@@ -136,14 +136,11 @@ protected void onCreate(final Bundle savedInstanceState) {
136136
requestWindowFeature(Window.FEATURE_NO_TITLE);
137137
setContentView(R.layout.activity_canvas_profile);
138138

139-
mCanvasView = (ImageView) findViewById(R.id.canvasProfileView);
139+
mCanvasView = findViewById(R.id.canvasProfileView);
140140

141-
Button btn = (Button) findViewById(R.id.buttonClose);
142-
btn.setOnClickListener(new OnClickListener() {
143-
@Override
144-
public void onClick(final View v) {
145-
finish();
146-
}
141+
Button btn = findViewById(R.id.buttonClose);
142+
btn.setOnClickListener((v) -> {
143+
finish();
147144
});
148145

149146
Intent intent = null;
@@ -471,13 +468,10 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) {
471468
builder.setMessage(getArguments().getString(KEY_MESSAGE));
472469
if (getArguments().getString(KEY_POSITIVE) != null) {
473470
builder.setPositiveButton(getArguments().getString(KEY_POSITIVE),
474-
new DialogInterface.OnClickListener() {
475-
@Override
476-
public void onClick(final DialogInterface dialog, final int which) {
477-
Activity activity = getActivity();
478-
if (activity != null) {
479-
activity.finish();
480-
}
471+
(dialog, which) -> {
472+
Activity activity = getActivity();
473+
if (activity != null) {
474+
activity.finish();
481475
}
482476
});
483477
}

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/GeolocationAlertDialogActivity.java‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import android.content.DialogInterface;
1313
import android.content.Intent;
1414
import android.os.Bundle;
15-
import android.support.v4.app.FragmentActivity;
1615
import android.view.Window;
1716

17+
import androidx.fragment.app.FragmentActivity;
18+
1819
import org.deviceconnect.android.deviceplugin.host.R;
19-
import org.deviceconnect.android.message.DConnectMessageService;
2020
import org.deviceconnect.android.message.MessageUtils;
2121

2222
/**
@@ -50,34 +50,30 @@ protected void onCreate(Bundle savedInstanceState) {
5050

5151
// GPS設定画面起動用ボタンとイベント定義
5252
.setPositiveButton(R.string.gps_settings_title,
53-
new DialogInterface.OnClickListener() {
54-
public void onClick(DialogInterface dialog, int id) {
55-
Intent callGPSSettingIntent = new Intent(
56-
android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
57-
try {
58-
startActivity(callGPSSettingIntent);
59-
} catch (ActivityNotFoundException e) {
60-
if (mResponse != null) {
61-
MessageUtils.setIllegalDeviceStateError(mResponse,
62-
"GPS setting is not enabled.");
63-
getBaseContext().sendBroadcast(mResponse);
64-
}
53+
(dialog, id) -> {
54+
Intent callGPSSettingIntent = new Intent(
55+
android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS);
56+
try {
57+
startActivity(callGPSSettingIntent);
58+
} catch (ActivityNotFoundException e) {
59+
if (mResponse != null) {
60+
MessageUtils.setIllegalDeviceStateError(mResponse,
61+
"GPS setting is not enabled.");
62+
getBaseContext().sendBroadcast(mResponse);
6563
}
66-
mActivity.finish();
6764
}
65+
mActivity.finish();
6866
});
6967
// キャンセルボタン処理
7068
alertDialogBuilder.setNegativeButton(R.string.host_setting_gps_dialog_cancel,
71-
new DialogInterface.OnClickListener() {
72-
public void onClick(DialogInterface dialog, int id) {
73-
if (mResponse != null) {
74-
MessageUtils.setIllegalDeviceStateError(mResponse,
75-
"GPS setting is not enabled.");
76-
getBaseContext().sendBroadcast(mResponse);
77-
}
78-
dialog.cancel();
79-
mActivity.finish();
69+
(dialog, id) -> {
70+
if (mResponse != null) {
71+
MessageUtils.setIllegalDeviceStateError(mResponse,
72+
"GPS setting is not enabled.");
73+
getBaseContext().sendBroadcast(mResponse);
8074
}
75+
dialog.cancel();
76+
mActivity.finish();
8177
});
8278
AlertDialog alert = alertDialogBuilder.create();
8379
// 設定画面移動問い合わせダイアログ表示

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/KeyEventProfileActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import android.content.Intent;
2424
import android.content.IntentFilter;
2525
import android.os.Bundle;
26-
import android.support.v4.content.LocalBroadcastManager;
2726
import android.view.KeyEvent;
2827
import android.view.MotionEvent;
2928
import android.view.View;
@@ -32,6 +31,8 @@
3231
import android.widget.RadioGroup;
3332
import android.widget.RadioGroup.OnCheckedChangeListener;
3433

34+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
35+
3536
import static org.deviceconnect.android.deviceplugin.host.HostDeviceApplication.STATE_DOWN;
3637
import static org.deviceconnect.android.deviceplugin.host.HostDeviceApplication.STATE_UP;
3738

@@ -168,7 +169,7 @@ public boolean onTouch(final View v, final MotionEvent event) {
168169

169170
@Override
170171
public void onCheckedChanged(final RadioGroup group, final int checkedId) {
171-
RadioButton radioButton = (RadioButton) findViewById(checkedId);
172+
RadioButton radioButton = findViewById(checkedId);
172173

173174
// Change key mode.
174175
int i = radioButton.getId();

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/TouchProfileActivity.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
import android.content.Intent;
2424
import android.content.IntentFilter;
2525
import android.os.Bundle;
26-
import android.support.v4.content.LocalBroadcastManager;
2726
import android.view.GestureDetector;
2827
import android.view.GestureDetector.SimpleOnGestureListener;
2928
import android.view.MotionEvent;
3029
import android.view.View;
3130
import android.widget.Button;
3231

32+
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
33+
3334
import static org.deviceconnect.android.deviceplugin.host.profile.HostTouchProfile.ATTRIBUTE_ON_TOUCH_CHANGE;
3435

3536
/**
@@ -74,12 +75,9 @@ protected void onCreate(final Bundle savedInstanceState) {
7475
// Create GestureDetector instance.
7576
mGestureDetector = new GestureDetector(this, mSimpleOnGestureListener);
7677
// onclicklistener register.
77-
Button button = (Button) findViewById(R.id.button_touch_close);
78-
button.setOnClickListener(new View.OnClickListener() {
79-
@Override
80-
public void onClick(final View v) {
81-
finish();
82-
}
78+
Button button = findViewById(R.id.button_touch_close);
79+
button.setOnClickListener((v) -> {
80+
finish();
8381
});
8482
}
8583

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/Camera2Helper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import android.hardware.camera2.CameraManager;
1515
import android.hardware.camera2.params.StreamConfigurationMap;
1616
import android.media.ImageReader;
17-
import android.support.annotation.NonNull;
17+
import androidx.annotation.NonNull;
1818
import android.util.Size;
1919
import android.view.Surface;
2020
import android.view.WindowManager;

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/CameraWrapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import android.os.Handler;
2525
import android.os.HandlerThread;
2626
import android.os.Looper;
27-
import android.support.annotation.NonNull;
28-
import android.support.annotation.Nullable;
27+
import androidx.annotation.NonNull;
28+
import androidx.annotation.Nullable;
2929
import android.util.Log;
3030
import android.util.Size;
3131
import android.view.Surface;

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/file/FileDataManager.java‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.os.Build;
66
import android.os.Handler;
77
import android.os.Looper;
8-
import android.support.annotation.NonNull;
8+
import androidx.annotation.NonNull;
99

1010
import org.deviceconnect.android.activity.PermissionUtility;
1111
import org.deviceconnect.android.provider.FileManager;
@@ -343,25 +343,22 @@ public void startTimer() {
343343
@Override
344344
public void onSuccess() {
345345
mLastModifiedDate = System.currentTimeMillis();
346-
mFuture = mExecutor.scheduleAtFixedRate(new Runnable() {
347-
@Override
348-
public void run() {
349-
getUpdatedFiles(new CheckUpdatedFilesCallback() {
350-
@Override
351-
public void onSuccess(@NonNull List<File> files) {
352-
if (files.size() > 0) {
353-
if (mModifiedListener != null) {
354-
mModifiedListener.onWatchFile(files);
355-
}
346+
mFuture = mExecutor.scheduleAtFixedRate(() -> {
347+
getUpdatedFiles(new CheckUpdatedFilesCallback() {
348+
@Override
349+
public void onSuccess(@NonNull List<File> files) {
350+
if (files.size() > 0) {
351+
if (mModifiedListener != null) {
352+
mModifiedListener.onWatchFile(files);
356353
}
357354
}
355+
}
358356

359-
@Override
360-
public void onFail() {
357+
@Override
358+
public void onFail() {
361359

362-
}
363-
});
364-
}
360+
}
361+
});
365362
}, PERIOD, PERIOD, TimeUnit.SECONDS);
366363
}
367364

‎dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/mediaplayer/HostMediaPlayerManager.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,20 +252,14 @@ public void putMediaId(final Intent response, final String mediaId) {
252252
mMyCurrentFileMIMEType = mMineType;
253253
mMediaStatus = MEDIA_PLAYER_SET;
254254
mMediaPlayer.setDataSource(filePath);
255-
mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
256-
@Override
257-
public void onCompletion(final MediaPlayer arg0) {
258-
mMediaStatus = MEDIA_PLAYER_COMPLETE;
259-
sendOnStatusChangeEvent("complete");
260-
}
255+
mMediaPlayer.setOnCompletionListener((mp) -> {
256+
mMediaStatus = MEDIA_PLAYER_COMPLETE;
257+
sendOnStatusChangeEvent("complete");
261258
});
262259
mMediaPlayer.prepareAsync();
263260
mMyCurrentMediaPosition = 0;
264-
mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
265-
@Override
266-
public void onPrepared(final MediaPlayer mp) {
267-
mMyCurrentMediaDuration = mMediaPlayer.getDuration() / UNIT_SEC;
268-
}
261+
mMediaPlayer.setOnPreparedListener((mp) -> {
262+
mMyCurrentMediaDuration = mMediaPlayer.getDuration() / UNIT_SEC;
269263
});
270264

271265
if (response != null) {

0 commit comments

Comments
 (0)