|
@@ -83,20 +83,20 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
setContentView((int) R.layout.activity_scan);
|
|
|
setActionBar((int) R.string.BLE_select_unconfigured_printer_title, true);
|
|
|
findViewById(R.id.progress_bar).setVisibility(8);
|
|
|
- this.mContext = this;
|
|
|
+ mContext = this;
|
|
|
callBackFuncs();
|
|
|
getWindow().addFlags(128);
|
|
|
- this.mProbePrinter = ProbePrinter.create().setContext(this.mContext);
|
|
|
- this.mBleWork = BleWork.getInstace();
|
|
|
- this.mBleWork.resetSequence();
|
|
|
+ mProbePrinter = ProbePrinter.create().setContext(mContext);
|
|
|
+ mBleWork = BleWork.getInstace();
|
|
|
+ mBleWork.resetSequence();
|
|
|
}
|
|
|
|
|
|
protected void onResume() {
|
|
|
ArrayList parcelableArrayListExtra;
|
|
|
super.onResume();
|
|
|
- this.mProbePrinter.bindEpsonService();
|
|
|
+ mProbePrinter.bindEpsonService();
|
|
|
EpLog.m77i("mSequence = " + BleWork.getInstace().mSequence);
|
|
|
- if (this.mDeviceAdapter == null && BleWork.getInstace().mSequence == BleWork.jobSequence.UNINITIALIZED && (parcelableArrayListExtra = getIntent().getParcelableArrayListExtra(ScannedDevice.TYPE)) != null && parcelableArrayListExtra.size() > 0) {
|
|
|
+ if (mDeviceAdapter == null && BleWork.getInstace().mSequence == BleWork.jobSequence.UNINITIALIZED && (parcelableArrayListExtra = getIntent().getParcelableArrayListExtra(ScannedDevice.TYPE)) != null && parcelableArrayListExtra.size() > 0) {
|
|
|
init(parcelableArrayListExtra);
|
|
|
}
|
|
|
}
|
|
@@ -120,11 +120,11 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
|
|
|
protected void onDestroy() {
|
|
|
super.onDestroy();
|
|
|
- this.mProbePrinter.unbindEpsonService();
|
|
|
+ mProbePrinter.unbindEpsonService();
|
|
|
}
|
|
|
|
|
|
private void callBackFuncs() {
|
|
|
- this.mCompletion = new CallbackWork() {
|
|
|
+ mCompletion = new CallbackWork() {
|
|
|
public void call(Object obj) {
|
|
|
if (!(obj instanceof Boolean)) {
|
|
|
EpLog.m71e(" type mismatch !");
|
|
@@ -139,27 +139,27 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
EpLog.m77i("count = " + BleWorkActivity.this.count);
|
|
|
}
|
|
|
BleWorkActivity.this.stopCallbacks();
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null && BleWorkActivity.this.mAlertDialog.isShowing()) {
|
|
|
+ if (BleWorkActivity.mAlertDialog != null && BleWorkActivity.mAlertDialog.isShowing()) {
|
|
|
BleWorkActivity.this.runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
EpLog.m77i("dismiss ");
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- BleWorkActivity.this.mBleWork.resetSequence();
|
|
|
+ BleWorkActivity.mBleWork.resetSequence();
|
|
|
BleWorkActivity.this.settingResultDailog(bool.booleanValue());
|
|
|
}
|
|
|
};
|
|
|
- this.mNext = new CallbackWork() {
|
|
|
+ mNext = new CallbackWork() {
|
|
|
public void call(Object obj) {
|
|
|
BleWorkActivity.this.stopWifiSearch();
|
|
|
- Handler unused = BleWorkActivity.this.mWifiSearchHandler = new Handler();
|
|
|
+ Handler unused = BleWorkActivity.mWifiSearchHandler = new Handler();
|
|
|
BleWorkActivity.this.runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
EpLog.m77i("setSSID");
|
|
|
- BleWorkActivity.this.mBleWork.setSSID(new BLEUtility.BleWorkCallback() {
|
|
|
+ BleWorkActivity.mBleWork.setSSID(new BLEUtility.BleWorkCallback() {
|
|
|
public void call(Object obj) {
|
|
|
Runnable unused = BleWorkActivity.this.runnableWifiSearch = new Runnable() {
|
|
|
int postCount = 0;
|
|
@@ -168,53 +168,53 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
int i = this.postCount;
|
|
|
if (i >= 2) {
|
|
|
EpLog.m77i("postCount >= 2 ");
|
|
|
- BleWorkActivity.this.mProbePrinter.interruptSearch();
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ BleWorkActivity.mProbePrinter.interruptSearch();
|
|
|
+ if (BleWorkActivity.mAlertDialog != null) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
}
|
|
|
- if (BleWorkActivity.this.mCompletion != null) {
|
|
|
- BleWorkActivity.this.mCompletion.call(false);
|
|
|
+ if (BleWorkActivity.mCompletion != null) {
|
|
|
+ BleWorkActivity.mCompletion.call(false);
|
|
|
return;
|
|
|
}
|
|
|
return;
|
|
|
}
|
|
|
if (i == 1) {
|
|
|
- BleWorkActivity.this.mProbePrinter.setMacAddress(BleWorkActivity.this.mBleWork.getDeviceMacAddress());
|
|
|
- BleWorkActivity.this.mProbePrinter.setBleCallback(BleWorkActivity.this.mCompletion);
|
|
|
+ BleWorkActivity.mProbePrinter.setMacAddress(BleWorkActivity.mBleWork.getDeviceMacAddress());
|
|
|
+ BleWorkActivity.mProbePrinter.setBleCallback(BleWorkActivity.mCompletion);
|
|
|
try {
|
|
|
- BleWorkActivity.this.mProbePrinter.search();
|
|
|
+ BleWorkActivity.mProbePrinter.search();
|
|
|
} catch (IllegalStateException e) {
|
|
|
EpLog.m71e(e.getMessage());
|
|
|
- BleWorkActivity.this.mProbePrinter.interruptSearch();
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ BleWorkActivity.mProbePrinter.interruptSearch();
|
|
|
+ if (BleWorkActivity.mAlertDialog != null) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
}
|
|
|
- if (BleWorkActivity.this.mCompletion != null) {
|
|
|
- BleWorkActivity.this.mCompletion.call(false);
|
|
|
+ if (BleWorkActivity.mCompletion != null) {
|
|
|
+ BleWorkActivity.mCompletion.call(false);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
this.postCount++;
|
|
|
- if (BleWorkActivity.this.mCompletion != null) {
|
|
|
+ if (BleWorkActivity.mCompletion != null) {
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
sb.append("postDelayed postCount = ");
|
|
|
sb.append(this.postCount);
|
|
|
sb.append(" delay ");
|
|
|
sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
|
|
|
EpLog.m77i(sb.toString());
|
|
|
- BleWorkActivity.this.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
|
|
|
+ BleWorkActivity.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
- BleWorkActivity.this.mWifiSearchHandler.post(BleWorkActivity.this.runnableWifiSearch);
|
|
|
+ BleWorkActivity.mWifiSearchHandler.post(BleWorkActivity.this.runnableWifiSearch);
|
|
|
}
|
|
|
}, new BLEUtility.BleWorkCallback() {
|
|
|
public void call(Object obj) {
|
|
|
EpLog.m71e("BleWorkCallback");
|
|
|
- if (BleWorkActivity.this.mCompletion != null) {
|
|
|
- BleWorkActivity.this.mCompletion.call(false);
|
|
|
+ if (BleWorkActivity.mCompletion != null) {
|
|
|
+ BleWorkActivity.mCompletion.call(false);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -222,16 +222,16 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
});
|
|
|
}
|
|
|
};
|
|
|
- this.mSequenceCallbackSuccess = new BLEUtility.BleWorkCallback() {
|
|
|
+ mSequenceCallbackSuccess = new BLEUtility.BleWorkCallback() {
|
|
|
public void call(Object obj) {
|
|
|
BleWork.jobSequence jobsequence = (BleWork.jobSequence) obj;
|
|
|
EpLog.m77i("mSequenceCallbackSuccess " + jobsequence);
|
|
|
if (jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || jobsequence == BleWork.jobSequence.MIB_GET_MACADDRESS || jobsequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD) {
|
|
|
BleWorkActivity.this.stopConnectTimeOut();
|
|
|
}
|
|
|
- if (!(jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || !BleWorkActivity.this.mBleWork.getSSIDPassword().isEmpty() || BleWorkActivity.this.mAlertDialog == null || ((jobsequence == BleWork.jobSequence.CHECK_SSID && BleWorkActivity.this.mBleWork.getSecurityType() == 1) || BleWorkActivity.this.mBleWork.getSecurityType() == 255))) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ if (!(jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || !BleWorkActivity.mBleWork.getSSIDPassword().isEmpty() || BleWorkActivity.mAlertDialog == null || ((jobsequence == BleWork.jobSequence.CHECK_SSID && BleWorkActivity.mBleWork.getSecurityType() == 1) || BleWorkActivity.mBleWork.getSecurityType() == 255))) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
EpLog.m77i("mAlertDialog dismiss " + jobsequence);
|
|
|
}
|
|
|
if (jobsequence == BleWork.jobSequence.CHECK_SSID) {
|
|
@@ -241,7 +241,7 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
- this.mSequenceCallbackFailed = new BLEUtility.BleWorkCallback() {
|
|
|
+ mSequenceCallbackFailed = new BLEUtility.BleWorkCallback() {
|
|
|
public void call(Object obj) {
|
|
|
BleWorkActivity.this.failedDialog((BleWork.jobSequence) obj);
|
|
|
}
|
|
@@ -265,10 +265,10 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
}
|
|
|
|
|
|
private void stopWifiSearch() {
|
|
|
- Handler handler = this.mWifiSearchHandler;
|
|
|
+ Handler handler = mWifiSearchHandler;
|
|
|
if (handler != null) {
|
|
|
handler.removeCallbacks(this.runnableWifiSearch);
|
|
|
- this.mWifiSearchHandler = null;
|
|
|
+ mWifiSearchHandler = null;
|
|
|
this.runnableWifiSearch = null;
|
|
|
}
|
|
|
}
|
|
@@ -276,7 +276,7 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
private void settingResultDailog(final boolean z) {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
- AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this.mContext).setCancelable(false);
|
|
|
+ AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.mContext).setCancelable(false);
|
|
|
if (z) {
|
|
|
cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_title));
|
|
|
cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_msg));
|
|
@@ -289,7 +289,7 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
} else {
|
|
|
setUpPath = Analytics.SetUpPath.Home;
|
|
|
}
|
|
|
- Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), setUpPath, Analytics.SetUpResult.Success);
|
|
|
+ Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), setUpPath, Analytics.SetUpResult.Success);
|
|
|
Intent intent = new Intent(BleWorkActivity.this, ActivityECConfiguration.class);
|
|
|
intent.putExtra(ActivityECConfiguration.INTENT_EC_BLE_CONTENT, true);
|
|
|
BleWorkActivity.this.startActivityForResult(intent, BleWorkActivity.REQUEST_CODE_EPSON_CONNECT_REGISTRATION);
|
|
@@ -301,18 +301,18 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.BLE_fail_setup_printer_other_method_button), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
BleWorkActivity.this.startActivity(PrinterNotFoundDialogCreator.getStartIntent(BleWorkActivity.this.getApplicationContext()));
|
|
|
- Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
|
|
|
+ Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
|
|
|
BleWorkActivity.this.finish();
|
|
|
}
|
|
|
}).setNeutralButton(BleWorkActivity.this.getString(R.string.str_btn_close), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
- Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
|
|
|
+ Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
|
|
|
BleWorkActivity.this.finish();
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- BleWorkActivity.this.mAlertDialog = cancelable.create();
|
|
|
- BleWorkActivity.this.mAlertDialog.show();
|
|
|
+ BleWorkActivity.mAlertDialog = cancelable.create();
|
|
|
+ BleWorkActivity.mAlertDialog.show();
|
|
|
}
|
|
|
});
|
|
|
}
|
|
@@ -324,25 +324,25 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
}
|
|
|
|
|
|
private void waitingCommunicationDaialog() {
|
|
|
- if (this.mAlertDialog != null) {
|
|
|
+ if (mAlertDialog != null) {
|
|
|
EpLog.m77i("dismiss ");
|
|
|
- this.mAlertDialog.dismiss();
|
|
|
- this.mAlertDialog = null;
|
|
|
+ mAlertDialog.dismiss();
|
|
|
+ mAlertDialog = null;
|
|
|
}
|
|
|
this.isStopSetUpProgress = false;
|
|
|
- this.mAlertDialog = new AlertDialog.Builder(this.mContext).setCancelable(false).create();
|
|
|
- View inflate = LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
|
|
|
- this.mAlertDialog.setView(inflate);
|
|
|
- this.mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
|
|
|
- this.mProgressPercent.setVisibility(0);
|
|
|
- this.mPercentView = (TextView) inflate.findViewById(R.id.percent);
|
|
|
- this.mPercentView.setVisibility(0);
|
|
|
+ mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
|
|
|
+ View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
|
|
|
+ mAlertDialog.setView(inflate);
|
|
|
+ mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
|
|
|
+ mProgressPercent.setVisibility(0);
|
|
|
+ mPercentView = (TextView) inflate.findViewById(R.id.percent);
|
|
|
+ mPercentView.setVisibility(0);
|
|
|
inflate.findViewById(R.id.space_upper).setVisibility(0);
|
|
|
- this.mProgressPercent.setProgress(0);
|
|
|
- this.mProgressPercent.setMax(100);
|
|
|
- this.mPercentView.setText("0%");
|
|
|
- this.mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
|
|
|
- this.mAlertDialog.show();
|
|
|
+ mProgressPercent.setProgress(0);
|
|
|
+ mProgressPercent.setMax(100);
|
|
|
+ mPercentView.setText("0%");
|
|
|
+ mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
|
|
|
+ mAlertDialog.show();
|
|
|
this.count = 0;
|
|
|
stopSetUpProgress();
|
|
|
this.setUpProgressHandler = new Handler();
|
|
@@ -353,19 +353,19 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
EpLog.m77i("☆☆runnableSetUpProgress retuen ");
|
|
|
return;
|
|
|
}
|
|
|
- EpLog.m77i("mSequence " + BleWorkActivity.this.mBleWork.mSequence);
|
|
|
+ EpLog.m77i("mSequence " + BleWorkActivity.mBleWork.mSequence);
|
|
|
BleWorkActivity bleWorkActivity = BleWorkActivity.this;
|
|
|
bleWorkActivity.count = bleWorkActivity.count + 1;
|
|
|
int i2 = BleWorkActivity.this.count;
|
|
|
int i3 = BleWorkActivity.TOTAL_PROGRESS_SEC;
|
|
|
if (i2 > BleWorkActivity.TOTAL_PROGRESS_SEC) {
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ if (BleWorkActivity.mAlertDialog != null) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
}
|
|
|
EpLog.m71e("TIME OUT");
|
|
|
- BleWorkActivity.this.mCompletion.call(false);
|
|
|
- CallbackWork unused = BleWorkActivity.this.mCompletion = null;
|
|
|
+ BleWorkActivity.mCompletion.call(false);
|
|
|
+ CallbackWork unused = BleWorkActivity.mCompletion = null;
|
|
|
return;
|
|
|
}
|
|
|
if (BleWorkActivity.this.count <= 90) {
|
|
@@ -387,24 +387,24 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
}
|
|
|
|
|
|
private void updateProgress(int i) {
|
|
|
- this.mProgressPercent.setProgress(i);
|
|
|
- TextView textView = this.mPercentView;
|
|
|
+ mProgressPercent.setProgress(i);
|
|
|
+ TextView textView = mPercentView;
|
|
|
textView.setText(i + " %");
|
|
|
- this.mProgressPercent.invalidate();
|
|
|
- this.mPercentView.invalidate();
|
|
|
+ mProgressPercent.invalidate();
|
|
|
+ mPercentView.invalidate();
|
|
|
}
|
|
|
|
|
|
private void init(ArrayList<ScannedDevice> arrayList) {
|
|
|
ListView listView = (ListView) findViewById(R.id.list);
|
|
|
Collections.sort(arrayList, new ScannedDeviceComparator());
|
|
|
- this.mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
|
|
|
- listView.setAdapter(this.mDeviceAdapter);
|
|
|
+ mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
|
|
|
+ listView.setAdapter(mDeviceAdapter);
|
|
|
if (arrayList.size() == 1) {
|
|
|
- selectDevice((ScannedDevice) this.mDeviceAdapter.getItem(0));
|
|
|
+ selectDevice((ScannedDevice) mDeviceAdapter.getItem(0));
|
|
|
}
|
|
|
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
|
public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
|
|
|
- ScannedDevice scannedDevice = (ScannedDevice) BleWorkActivity.this.mDeviceAdapter.getItem(i);
|
|
|
+ ScannedDevice scannedDevice = (ScannedDevice) BleWorkActivity.mDeviceAdapter.getItem(i);
|
|
|
if (scannedDevice != null) {
|
|
|
BleWorkActivity.this.selectDevice(scannedDevice);
|
|
|
}
|
|
@@ -427,43 +427,43 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
private void selectDevice(@NonNull ScannedDevice scannedDevice) {
|
|
|
String displayName = scannedDevice.getDisplayName();
|
|
|
BleScanWork.getInstace().stopScan();
|
|
|
- this.mBleWork.resetSequence();
|
|
|
- this.mBleWork.setSequenceCallback(this.mSequenceCallbackSuccess, this.mSequenceCallbackFailed);
|
|
|
+ mBleWork.resetSequence();
|
|
|
+ mBleWork.setSequenceCallback(mSequenceCallbackSuccess, mSequenceCallbackFailed);
|
|
|
EpLog.m69d(" getInfoForConnectDialog");
|
|
|
getInfoForConnectDialog(displayName);
|
|
|
- this.mBleWork.init(this, scannedDevice);
|
|
|
+ mBleWork.init(this, scannedDevice);
|
|
|
}
|
|
|
|
|
|
private void getInfoForConnectDialog(String str) {
|
|
|
- this.mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
|
|
|
- this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
|
|
|
+ mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
|
|
|
+ mAlertDialog.setView(LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
|
|
|
String property = System.getProperty("line.separator");
|
|
|
- AlertDialog alertDialog = this.mAlertDialog;
|
|
|
+ AlertDialog alertDialog = mAlertDialog;
|
|
|
alertDialog.setMessage(str + property + property + getString(R.string.BLE_inquiry_access_point_information_msg));
|
|
|
if (this.isAlive && !isFinishing()) {
|
|
|
- this.mAlertDialog.show();
|
|
|
+ mAlertDialog.show();
|
|
|
}
|
|
|
setConnectTimeOut();
|
|
|
}
|
|
|
|
|
|
private void setConnectTimeOut() {
|
|
|
- this.mTimeoutHandler = new Handler();
|
|
|
- this.mTimeoutHandler.postDelayed(new Runnable() {
|
|
|
+ mTimeoutHandler = new Handler();
|
|
|
+ mTimeoutHandler.postDelayed(new Runnable() {
|
|
|
public void run() {
|
|
|
- EpLog.m71e(" timeout ------------" + BleWorkActivity.this.mBleWork.mSequence);
|
|
|
- if (BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
|
|
|
- BleWorkActivity.this.mBleWork.failedProcessing();
|
|
|
+ EpLog.m71e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
|
|
|
+ if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
|
|
|
+ BleWorkActivity.mBleWork.failedProcessing();
|
|
|
}
|
|
|
- BleWorkActivity.this.mBleWork.setRetryFinish();
|
|
|
+ BleWorkActivity.mBleWork.setRetryFinish();
|
|
|
}
|
|
|
}, DateUtils.MILLIS_PER_MINUTE);
|
|
|
}
|
|
|
|
|
|
private void stopConnectTimeOut() {
|
|
|
- Handler handler = this.mTimeoutHandler;
|
|
|
+ Handler handler = mTimeoutHandler;
|
|
|
if (handler != null) {
|
|
|
handler.removeCallbacksAndMessages((Object) null);
|
|
|
- this.mTimeoutHandler = null;
|
|
|
+ mTimeoutHandler = null;
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -473,8 +473,8 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
BleWorkActivity.this.stopCallbacks();
|
|
|
BleWork.jobSequence jobsequence = jobsequence;
|
|
|
EpLog.m77i("sequence = " + jobsequence);
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
+ if (BleWorkActivity.mAlertDialog != null) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
}
|
|
|
BleWorkActivity bleWorkActivity = BleWorkActivity.this;
|
|
|
bleWorkActivity.mAlertDialog = null;
|
|
@@ -482,13 +482,13 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_setup_general_error_msg));
|
|
|
cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
- Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Error);
|
|
|
+ Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Error);
|
|
|
BleWorkActivity.this.finish();
|
|
|
}
|
|
|
});
|
|
|
if (BleWorkActivity.this.isAlive && !BleWorkActivity.this.isFinishing()) {
|
|
|
- BleWorkActivity.this.mAlertDialog = cancelable.create();
|
|
|
- BleWorkActivity.this.mAlertDialog.show();
|
|
|
+ BleWorkActivity.mAlertDialog = cancelable.create();
|
|
|
+ BleWorkActivity.mAlertDialog.show();
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -551,10 +551,10 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
private void showSSIDList() {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
|
|
|
- BleWorkActivity.this.mBleWork.disconnect(false);
|
|
|
- EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
|
|
|
- List<String> ssidLis = BleWorkActivity.this.mBleWork.getSsidLis();
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
|
|
|
+ BleWorkActivity.mBleWork.disconnect(false);
|
|
|
+ EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
|
|
|
+ List<String> ssidLis = BleWorkActivity.mBleWork.getSsidLis();
|
|
|
ssidLis.remove(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
|
|
|
BleWorkActivity.this.sortSSIDlist(ssidLis);
|
|
|
ssidLis.add(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
|
|
@@ -577,24 +577,24 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
BleWorkActivity.this.setSSID();
|
|
|
return;
|
|
|
}
|
|
|
- EpLog.m77i("☆" + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
|
|
|
- BleWorkActivity.this.mBleWork.setSSID(str);
|
|
|
- if (BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.DISCONNECTED || BleWorkActivity.this.mBleWork.mStatus == 0) {
|
|
|
- EpLog.m77i("☆☆ " + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
|
|
|
- BleWorkActivity.this.mBleWork.connect();
|
|
|
+ EpLog.m77i("☆" + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
|
|
|
+ BleWorkActivity.mBleWork.setSSID(str);
|
|
|
+ if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.DISCONNECTED || BleWorkActivity.mBleWork.mStatus == 0) {
|
|
|
+ EpLog.m77i("☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
|
|
|
+ BleWorkActivity.mBleWork.connect();
|
|
|
EpLog.m69d(" getInfoForConnectDialog");
|
|
|
- BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.this.mBleWork.getDeviceName());
|
|
|
+ BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.mBleWork.getDeviceName());
|
|
|
return;
|
|
|
}
|
|
|
- EpLog.m77i("☆☆☆☆ " + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
|
|
|
- BleWorkActivity.this.mBleWork.setSSIDType();
|
|
|
+ EpLog.m77i("☆☆☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
|
|
|
+ BleWorkActivity.mBleWork.setSSIDType();
|
|
|
}
|
|
|
});
|
|
|
cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
EpLog.m76i();
|
|
|
- BleWorkActivity.this.mBleWork.disconnect(true);
|
|
|
+ BleWorkActivity.mBleWork.disconnect(true);
|
|
|
}
|
|
|
});
|
|
|
cancelable.show();
|
|
@@ -649,9 +649,9 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
EpLog.m77i(editText.getText().toString());
|
|
|
- BleWorkActivity.this.mBleWork.setSSID(editText.getText().toString());
|
|
|
- BleWorkActivity.this.mBleWork.setSecurityType(255);
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.SET_PASSWORD;
|
|
|
+ BleWorkActivity.mBleWork.setSSID(editText.getText().toString());
|
|
|
+ BleWorkActivity.mBleWork.setSecurityType(255);
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.SET_PASSWORD;
|
|
|
BleWorkActivity.this.setSSIDPassword();
|
|
|
}
|
|
|
});
|
|
@@ -659,19 +659,19 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
EpLog.m76i();
|
|
|
((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
|
|
|
- if (!BleWorkActivity.this.mBleWork.getSsidLis().isEmpty()) {
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
|
|
|
- BleWorkActivity.this.mBleWork.setSecurityType(0);
|
|
|
+ if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
|
|
|
+ BleWorkActivity.mBleWork.setSecurityType(0);
|
|
|
BleWorkActivity.this.showSSIDList();
|
|
|
return;
|
|
|
}
|
|
|
- BleWorkActivity.this.mBleWork.disconnect();
|
|
|
+ BleWorkActivity.mBleWork.disconnect();
|
|
|
}
|
|
|
});
|
|
|
if (!BleWorkActivity.this.isFinishing()) {
|
|
|
- BleWorkActivity.this.mDialog = cancelable.create();
|
|
|
- BleWorkActivity.this.mDialog.show();
|
|
|
- BleWorkActivity.this.mDialog.getButton(-1).setEnabled(false);
|
|
|
+ BleWorkActivity.mDialog = cancelable.create();
|
|
|
+ BleWorkActivity.mDialog.show();
|
|
|
+ BleWorkActivity.mDialog.getButton(-1).setEnabled(false);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -679,15 +679,15 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
|
|
|
private void setSSIDPassword() {
|
|
|
EpLog.m76i();
|
|
|
- if (!this.mBleWork.getSSIDPassword().isEmpty() || this.mBleWork.getSecurityType() == 1 || (this.mBleWork.getSecurityType() == 255 && this.mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
|
|
|
+ if (!mBleWork.getSSIDPassword().isEmpty() || mBleWork.getSecurityType() == 1 || (mBleWork.getSecurityType() == 255 && mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
EpLog.m77i("password mNext");
|
|
|
- BleWorkActivity.this.mNext.call("");
|
|
|
+ BleWorkActivity.mNext.call("");
|
|
|
if (BleWorkActivity.this.setUpProgressHandler == null && BleWorkActivity.this.runnableSetUpProgress == null) {
|
|
|
- if (BleWorkActivity.this.mAlertDialog != null) {
|
|
|
- BleWorkActivity.this.mAlertDialog.dismiss();
|
|
|
- BleWorkActivity.this.mAlertDialog = null;
|
|
|
+ if (BleWorkActivity.mAlertDialog != null) {
|
|
|
+ BleWorkActivity.mAlertDialog.dismiss();
|
|
|
+ BleWorkActivity.mAlertDialog = null;
|
|
|
}
|
|
|
EpLog.m69d("waitingCommunicationDaialog");
|
|
|
BleWorkActivity.this.waitingCommunicationDaialog();
|
|
@@ -698,7 +698,7 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
public void run() {
|
|
|
EpLog.m77i("inputs = ");
|
|
|
- final short securityType = BleWorkActivity.this.mBleWork.getSecurityType();
|
|
|
+ final short securityType = BleWorkActivity.mBleWork.getSecurityType();
|
|
|
if (securityType == 7 || securityType == 10) {
|
|
|
BleWorkActivity bleWorkActivity = BleWorkActivity.this;
|
|
|
bleWorkActivity.SSIDfailedDialog(bleWorkActivity.mBleWork.mSequence);
|
|
@@ -728,9 +728,9 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
EpLog.m77i(editText.getText().toString());
|
|
|
- BleWorkActivity.this.mBleWork.setSSIDPassword(editText.getText().toString());
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
|
|
|
- BleWorkActivity.this.mBleWork.connect();
|
|
|
+ BleWorkActivity.mBleWork.setSSIDPassword(editText.getText().toString());
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
|
|
|
+ BleWorkActivity.mBleWork.connect();
|
|
|
BleWorkActivity.this.setConnectTimeOut();
|
|
|
EpLog.m69d("waitingCommunicationDaialog");
|
|
|
BleWorkActivity.this.waitingCommunicationDaialog();
|
|
@@ -741,28 +741,28 @@ public class BleWorkActivity extends ActivityIACommon {
|
|
|
public void onClick(DialogInterface dialogInterface, int i) {
|
|
|
EpLog.m76i();
|
|
|
((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
|
|
|
- if (!BleWorkActivity.this.mBleWork.getSsidLis().isEmpty()) {
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
|
|
|
- BleWorkActivity.this.mBleWork.setSecurityType(0);
|
|
|
+ if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
|
|
|
+ BleWorkActivity.mBleWork.setSecurityType(0);
|
|
|
BleWorkActivity.this.showSSIDList();
|
|
|
return;
|
|
|
}
|
|
|
- BleWorkActivity.this.mBleWork.disconnect();
|
|
|
+ BleWorkActivity.mBleWork.disconnect();
|
|
|
}
|
|
|
});
|
|
|
if (!BleWorkActivity.this.isFinishing()) {
|
|
|
- BleWorkActivity.this.mDialog = cancelable.create();
|
|
|
- BleWorkActivity.this.mDialog.show();
|
|
|
- Button button = BleWorkActivity.this.mDialog.getButton(-1);
|
|
|
+ BleWorkActivity.mDialog = cancelable.create();
|
|
|
+ BleWorkActivity.mDialog.show();
|
|
|
+ Button button = BleWorkActivity.mDialog.getButton(-1);
|
|
|
if (securityType != 255) {
|
|
|
z = false;
|
|
|
}
|
|
|
button.setEnabled(z);
|
|
|
}
|
|
|
- EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
|
|
|
- BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
|
|
|
- BleWorkActivity.this.mBleWork.disconnect(false);
|
|
|
- EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
|
|
|
+ EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
|
|
|
+ BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
|
|
|
+ BleWorkActivity.mBleWork.disconnect(false);
|
|
|
+ EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
|
|
|
}
|
|
|
});
|
|
|
}
|