From 202a1ead62e5b9fa6de3c0fee16f54f92616a718 Mon Sep 17 00:00:00 2001 From: matt Date: Tue, 2 Oct 2018 16:16:11 +0900 Subject: [PATCH 1/7] change language to english --- .../modiplay/example/LoadingActivity.java | 6 +++--- .../modiplay/example/PageAFragment.java | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/luxrobo/modiplay/example/LoadingActivity.java b/app/src/main/java/com/luxrobo/modiplay/example/LoadingActivity.java index 301119d..1b3e883 100644 --- a/app/src/main/java/com/luxrobo/modiplay/example/LoadingActivity.java +++ b/app/src/main/java/com/luxrobo/modiplay/example/LoadingActivity.java @@ -85,8 +85,8 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in } else { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("Notice"); - builder.setMessage("설정 > 애플리케이션 관리자 > 권한에서 서비스 액세스를 허용해주세요."); - builder.setPositiveButton("예", + builder.setMessage("Please allow access to the service in [Settings> Application manager> Permission]."); + builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { Intent i = new Intent(); @@ -100,7 +100,7 @@ public void onClick(DialogInterface dialog, int which) { finish(); } }); - builder.setNegativeButton("아니오", + builder.setNegativeButton("No", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { initialize(); diff --git a/app/src/main/java/com/luxrobo/modiplay/example/PageAFragment.java b/app/src/main/java/com/luxrobo/modiplay/example/PageAFragment.java index 309af3e..87dd2ec 100644 --- a/app/src/main/java/com/luxrobo/modiplay/example/PageAFragment.java +++ b/app/src/main/java/com/luxrobo/modiplay/example/PageAFragment.java @@ -57,10 +57,10 @@ public void onItemClick(AdapterView adapterView, View view, int position, lon final DeviceItem selectedItem = (DeviceItem) adapterView.getItemAtPosition(position); - openAlertPopup(selectedItem.getDeviceName().toUpperCase() + "와\n연결 하시겠습니까?", new AlertListener() { + openAlertPopup("Would you like to connect with " + selectedItem.getDeviceName().toUpperCase() + "?", new AlertListener() { @Override public void onOkClick() { - selectedItemTextView.setText("연결중"); + selectedItemTextView.setText("Connecting"); mConnectedDevice = selectedItem; mModiManager.connect(selectedItem.getDeviceAddress()); } @@ -100,7 +100,7 @@ public void startScanning() { @Override public void run() { mDeviceList.clear(); - selectedItemTextView.setText("검색중"); + selectedItemTextView.setText("Searching..."); } }); } @@ -124,7 +124,7 @@ public void onDisconnected() { new Handler(Looper.getMainLooper()).post(new Runnable() { @Override public void run() { - selectedItemTextView.setText("disconnected"); + selectedItemTextView.setText("Disconnected"); scanButton.setVisibility(View.VISIBLE); disconnectButton.setVisibility(View.GONE); @@ -149,7 +149,7 @@ public void onFoundDevice(DeviceItem device) { } public void bluetoothOff() { - openConfirmPopup("블루투스 연결을 확인해 주세요.", new ConfirmListener() { + openConfirmPopup("Please check Bluetooth", new ConfirmListener() { @Override public void onOkClick() { @@ -166,15 +166,15 @@ public void disconnectedByModuleOff() { public void openAlertPopup(final String message, final AlertListener lister) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - builder.setTitle("알림"); + builder.setTitle("Notice"); builder.setMessage(message); - builder.setPositiveButton("예", + builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { lister.onOkClick(); } }); - builder.setNegativeButton("아니오", + builder.setNegativeButton("No", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { lister.onCancelClick(); @@ -185,9 +185,9 @@ public void onClick(DialogInterface dialog, int which) { public void openConfirmPopup(final String message, final ConfirmListener lister) { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); - builder.setTitle("알림"); + builder.setTitle("Notice"); builder.setMessage(message); - builder.setPositiveButton("확인", + builder.setPositiveButton("Confirm", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { lister.onOkClick(); From 4feb6ea22c5e8812fa473807e34122100c8fdc3c Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 4 Oct 2018 15:29:48 +0900 Subject: [PATCH 2/7] write javadoc (ModiManager.java) --- .idea/misc.xml | 2 +- .../api/callback/ConnectionCallback.java | 6 +- .../modiplay/api/client/BluetoothClient.java | 6 +- .../modiplay/api/client/LogClient.java | 6 +- .../modiplay/api/client/ModiClient.java | 8 +- .../api/client/NotifyStateClient.java | 6 +- .../api/client/ServiceStateClient.java | 6 +- .../modiplay/api/core/ModiConstants.java | 6 +- .../modiplay/api/core/ModiGattAttributes.java | 6 +- .../modiplay/api/core/ModiManager.java | 727 ++++++++---------- .../modiplay/api/core/ModiService.java | 91 +-- .../modiplay/api/data/DeviceInformation.java | 2 - .../modiplay/api/enums/Characteristics.java | 3 - .../api/listener/ManagerStateListener.java | 2 - .../api/parser/ManufacturerDataParser.java | 2 - .../modiplay/api/queue/RequestQueue.java | 20 - .../modiplay/api/utils/ModiDateUtil.java | 1 - .../modiplay/api/utils/ModiFileHandler.java | 45 -- .../luxrobo/modiplay/api/utils/ModiLog.java | 23 - .../modiplay/example/MainActivity.java | 26 +- 20 files changed, 361 insertions(+), 633 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 346034a..1795f36 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -2,7 +2,7 @@