Skip to content

Commit bf259b8

Browse files
TakayukiHoshi1984TakayukiHoshi1984
authored
Merge pull request #479 from TakayukiHoshi1984/modify_androidx
SupportLibraryをAndroidXLibraryに変更
2 parents e143d27 + aa5580f commit bf259b8

443 files changed

Lines changed: 4336 additions & 5672 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/dConnectDeviceAndroidWear/app/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ repositories {
88

99
dependencies {
1010
implementation fileTree(include: '*.jar', dir: 'libs')
11-
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.0'
12-
implementation 'com.android.support:multidex:1.0.3'
13-
implementation 'com.google.android.gms:play-services-wearable:15.0.1'
11+
implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.1'
12+
implementation 'androidx.multidex:multidex:2.0.1'
13+
implementation 'com.google.android.gms:play-services-wearable:17.0.0'
1414

1515
wearApp project(':wear-app')
1616
}

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<application
1515
android:allowBackup="false"
1616
android:icon="@drawable/dconnect_icon"
17-
android:name="android.support.multidex.MultiDexApplication"
17+
android:name="androidx.multidex.MultiDexApplication"
1818
android:label="@string/app_name"
1919
android:theme="@style/AppTheme"
2020
android:networkSecurityConfig="@xml/network_security_config">

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/java/org/deviceconnect/android/deviceplugin/wear/WearDeviceProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class WearDeviceProvider<T extends Service> extends DConnectMessageServic
2020
@SuppressWarnings("unchecked")
2121
@Override
2222
protected Class<Service> getServiceClass() {
23-
Class<? extends Service> clazz = (Class<? extends Service>) WearDeviceService.class;
23+
Class<? extends Service> clazz = WearDeviceService.class;
2424
return (Class<Service>) clazz;
2525
}
2626
}

‎dConnectDevicePlugin/dConnectDeviceAndroidWear/app/src/main/java/org/deviceconnect/android/deviceplugin/wear/WearManager.java‎

Lines changed: 106 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Context;
44
import android.net.Uri;
5-
import android.support.annotation.NonNull;
5+
import androidx.annotation.NonNull;
66

77
import com.google.android.gms.tasks.OnFailureListener;
88
import com.google.android.gms.tasks.OnSuccessListener;
@@ -58,12 +58,12 @@ public class WearManager {
5858
* メッセージイベントリスナー一覧.
5959
*/
6060
private final Map<String, OnMessageEventListener> mOnMessageEventListeners
61-
= new HashMap<String, OnMessageEventListener>();
61+
= new HashMap<>();
6262

6363
/**
6464
* ノード検知リスナー一覧.
6565
*/
66-
private final List<NodeEventListener> mNodeEventListeners = new ArrayList<NodeEventListener>();
66+
private final List<NodeEventListener> mNodeEventListeners = new ArrayList<>();
6767

6868
/**
6969
* ノード情報のキャッシュ.
@@ -95,20 +95,17 @@ public WearManager(final Context context) {
9595
public void init() {
9696
setCapabilityListener();
9797
setMessageListener();
98-
getNodes(new OnNodeResultListener() {
99-
@Override
100-
public void onResult(final List<Node> results) {
101-
if (results == null) {
102-
return;
103-
}
104-
synchronized (mNodeCache) {
105-
for (Node node : results) {
106-
if (!mNodeCache.containsKey(node.getId())) {
107-
mNodeCache.put(node.getId(), node);
108-
mLogger.info("getNodes: name = " + node.getDisplayName()
109-
+ ", id = " + node.getId());
110-
notifyOnNodeConnected(node);
111-
}
98+
getNodes((results) -> {
99+
if (results == null) {
100+
return;
101+
}
102+
synchronized (mNodeCache) {
103+
for (Node node : results) {
104+
if (!mNodeCache.containsKey(node.getId())) {
105+
mNodeCache.put(node.getId(), node);
106+
mLogger.info("getNodes: name = " + node.getDisplayName()
107+
+ ", id = " + node.getId());
108+
notifyOnNodeConnected(node);
112109
}
113110
}
114111
}
@@ -119,35 +116,30 @@ public void onResult(final List<Node> results) {
119116
* 接続しているAndroidWearにIDを送る.
120117
*/
121118
public void sendWearData() {
122-
new Thread(new Runnable() {
123-
public void run() {
124-
getNodes(new OnNodeResultListener() {
125-
@Override
126-
public void onResult(final List<Node> results) {
127-
if (results == null) {
128-
return;
129-
}
130-
synchronized (mNodeCache) {
131-
for (Node node : results) {
132-
if (!mNodeCache.containsKey(node.getId())) {
133-
mNodeCache.put(node.getId(), node);
134-
mLogger.info("getNode: name = " + node.getDisplayName()
135-
+ ", id = " + node.getId());
136-
notifyOnNodeConnected(node);
137-
138-
}
139-
}
119+
new Thread(() -> {
120+
getNodes((results) -> {
121+
if (results == null) {
122+
return;
123+
}
124+
synchronized (mNodeCache) {
125+
for (Node node : results) {
126+
if (!mNodeCache.containsKey(node.getId())) {
127+
mNodeCache.put(node.getId(), node);
128+
mLogger.info("getNode: name = " + node.getDisplayName()
129+
+ ", id = " + node.getId());
130+
notifyOnNodeConnected(node);
131+
140132
}
141133
}
142-
});
143-
for (String key : mNodeCache.keySet()) {
144-
Node node = mNodeCache.get(key);
145-
sendMessageToWear(node.getId(), WearConst.DEVICE_TO_WEAR_SET_ID, node.getId(), null);
146-
mLogger.info("sendMessage: name = " + node.getDisplayName()
147-
+ ", id = " + node.getId());
148134
}
135+
});
136+
for (String key : mNodeCache.keySet()) {
137+
Node node = mNodeCache.get(key);
138+
sendMessageToWear(node.getId(), WearConst.DEVICE_TO_WEAR_SET_ID, node.getId(), null);
139+
mLogger.info("sendMessage: name = " + node.getDisplayName()
140+
+ ", id = " + node.getId());
149141
}
150-
}).start();
142+
}).start();
151143
}
152144
/**
153145
* 後始末処理を行う.
@@ -182,21 +174,18 @@ public void addNodeListener(final NodeEventListener listener) {
182174
* Wearとの接続状況を検知するリスナー.
183175
*/
184176
private void setCapabilityListener() {
185-
Wearable.getCapabilityClient(mContext).addListener(new CapabilityClient.OnCapabilityChangedListener() {
186-
@Override
187-
public void onCapabilityChanged(@NonNull CapabilityInfo capabilityInfo) {
188-
for (Node node : capabilityInfo.getNodes()) {
189-
if (node.isNearby()) {
190-
mLogger.info("isNearby=true: name = " + node.getDisplayName()
191-
+ ", id = " + node.getId());
192-
mNodeCache.put(node.getId(), node);
193-
notifyOnNodeConnected(node);
194-
} else {
195-
mLogger.info("onPeerDisconnected: name = " + node.getDisplayName()
196-
+ ", id = " + node.getId());
197-
mNodeCache.remove(node.getId());
198-
notifyOnNodeDisconnected(node);
199-
}
177+
Wearable.getCapabilityClient(mContext).addListener((capabilityInfo) -> {
178+
for (Node node : capabilityInfo.getNodes()) {
179+
if (node.isNearby()) {
180+
mLogger.info("isNearby=true: name = " + node.getDisplayName()
181+
+ ", id = " + node.getId());
182+
mNodeCache.put(node.getId(), node);
183+
notifyOnNodeConnected(node);
184+
} else {
185+
mLogger.info("onPeerDisconnected: name = " + node.getDisplayName()
186+
+ ", id = " + node.getId());
187+
mNodeCache.remove(node.getId());
188+
notifyOnNodeDisconnected(node);
200189
}
201190
}
202191
}, Uri.parse("wear://"), CapabilityClient.FILTER_REACHABLE);
@@ -222,16 +211,13 @@ private void notifyOnNodeDisconnected(final Node node) {
222211
* Android Wearのリスナーを設定する.
223212
*/
224213
private void setMessageListener() {
225-
Wearable.getMessageClient(mContext).addListener(new MessageClient.OnMessageReceivedListener() {
226-
@Override
227-
public void onMessageReceived(@NonNull MessageEvent messageEvent) {
228-
final String data = new String(messageEvent.getData());
229-
final String path = messageEvent.getPath();
230-
final String nodeId = messageEvent.getSourceNodeId();
231-
OnMessageEventListener listener = mOnMessageEventListeners.get(path);
232-
if (listener != null) {
233-
listener.onEvent(nodeId, data);
234-
}
214+
Wearable.getMessageClient(mContext).addListener((messageEvent) -> {
215+
final String data = new String(messageEvent.getData());
216+
final String path = messageEvent.getPath();
217+
final String nodeId = messageEvent.getSourceNodeId();
218+
OnMessageEventListener listener = mOnMessageEventListeners.get(path);
219+
if (listener != null) {
220+
listener.onEvent(nodeId, data);
235221
}
236222
});
237223
}
@@ -242,20 +228,18 @@ public void onMessageReceived(@NonNull MessageEvent messageEvent) {
242228
* @param listener Wear node取得を通知するリスナー
243229
*/
244230
public void getNodes(final OnNodeResultListener listener) {
245-
sendMessageToWear(new Runnable() {
246-
public void run() {
247-
Task<List<Node>> nodeListTask = Wearable.getNodeClient(mContext).getConnectedNodes();
248-
List<Node> nodes = null;
249-
try {
250-
nodes = Tasks.await(nodeListTask);
251-
} catch (ExecutionException exception) {
252-
mLogger.warning("Task failed: " + exception);
253-
} catch (InterruptedException exception) {
254-
mLogger.warning("Interrupt occurred: " + exception);
255-
}
256-
if (listener != null) {
257-
listener.onResult(nodes);
258-
}
231+
sendMessageToWear(() -> {
232+
Task<List<Node>> nodeListTask = Wearable.getNodeClient(mContext).getConnectedNodes();
233+
List<Node> nodes = null;
234+
try {
235+
nodes = Tasks.await(nodeListTask);
236+
} catch (ExecutionException exception) {
237+
mLogger.warning("Task failed: " + exception);
238+
} catch (InterruptedException exception) {
239+
mLogger.warning("Interrupt occurred: " + exception);
240+
}
241+
if (listener != null) {
242+
listener.onResult(nodes);
259243
}
260244
});
261245
}
@@ -270,31 +254,22 @@ public void run() {
270254
*/
271255
public void sendMessageToWear(final String dest, final String action, final String message,
272256
final OnMessageResultListener listener) {
273-
getNodes(new OnNodeResultListener() {
274-
@Override
275-
public void onResult(List<Node> results) {
276-
for (Node node : results) {
277-
if (node.getId().contains(dest)) {
278-
Task<Integer> sendMessageTask =
279-
Wearable.getMessageClient(mContext).sendMessage(node.getId(), action, message.getBytes());
280-
sendMessageTask.addOnSuccessListener(new OnSuccessListener<Integer>() {
281-
@Override
282-
public void onSuccess(Integer integer) {
283-
if (listener != null) {
284-
listener.onResult();
285-
}
286-
}
287-
});
288-
289-
sendMessageTask.addOnFailureListener(new OnFailureListener() {
290-
@Override
291-
public void onFailure(@NonNull Exception e) {
292-
if (listener != null) {
293-
listener.onError();
294-
}
295-
}
296-
});
297-
}
257+
getNodes((results) -> {
258+
for (Node node : results) {
259+
if (node.getId().contains(dest)) {
260+
Task<Integer> sendMessageTask =
261+
Wearable.getMessageClient(mContext).sendMessage(node.getId(), action, message.getBytes());
262+
sendMessageTask.addOnSuccessListener((integer) -> {
263+
if (listener != null) {
264+
listener.onResult();
265+
}
266+
});
267+
268+
sendMessageTask.addOnFailureListener((e) -> {
269+
if (listener != null) {
270+
listener.onError();
271+
}
272+
});
298273
}
299274
}
300275
});
@@ -339,34 +314,25 @@ public void sendImageData(final String nodeId, final String requestId,
339314
final byte[] data, final int x, final int y,
340315
final int mode, final OnDataItemResultListener listener) {
341316
// リクエストIDとともに画像送信
342-
sendMessageToWear(new Runnable() {
343-
@Override
344-
public void run() {
345-
final PutDataRequest request = createPutDataRequest(nodeId, requestId, data, x, y, mode);
346-
if (request == null) {
317+
sendMessageToWear(() -> {
318+
final PutDataRequest request = createPutDataRequest(nodeId, requestId, data, x, y, mode);
319+
if (request == null) {
320+
if (listener != null) {
321+
listener.onError();
322+
}
323+
} else {
324+
request.setUrgent();
325+
Task<DataItem> dataItemTask = Wearable.getDataClient(mContext).putDataItem(request);
326+
dataItemTask.addOnSuccessListener((dataItem) -> {
327+
if (listener != null) {
328+
listener.onResult(dataItem);
329+
}
330+
});
331+
dataItemTask.addOnFailureListener((e) -> {
347332
if (listener != null) {
348333
listener.onError();
349334
}
350-
} else {
351-
request.setUrgent();
352-
Task<DataItem> dataItemTask = Wearable.getDataClient(mContext).putDataItem(request);
353-
dataItemTask.addOnSuccessListener(new OnSuccessListener<DataItem>() {
354-
@Override
355-
public void onSuccess(DataItem dataItem) {
356-
if (listener != null) {
357-
listener.onResult(dataItem);
358-
}
359-
}
360-
});
361-
dataItemTask.addOnFailureListener(new OnFailureListener() {
362-
@Override
363-
public void onFailure(@NonNull Exception e) {
364-
if (listener != null) {
365-
listener.onError();
366-
}
367-
}
368-
});
369-
}
335+
});
370336
}
371337
});
372338
}
@@ -381,20 +347,17 @@ private void sendMessageToWear(final Runnable run) {
381347
}
382348

383349
public void getLocalNodeId(final String serviceId, final OnLocalNodeListener listener) {
384-
getNodes(new OnNodeResultListener() {
385-
@Override
386-
public void onResult(List<Node> results) {
387-
for (Node node : results) {
388-
if (node.getId().equals(serviceId)) {
389-
if (listener != null) {
390-
listener.onResult(node);
391-
}
392-
return;
350+
getNodes((results) -> {
351+
for (Node node : results) {
352+
if (node.getId().equals(serviceId)) {
353+
if (listener != null) {
354+
listener.onResult(node);
393355
}
356+
return;
394357
}
395-
if (listener != null) {
396-
listener.onError();
397-
}
358+
}
359+
if (listener != null) {
360+
listener.onError();
398361
}
399362
});
400363
}

0 commit comments

Comments
 (0)