diff --git a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java index 32097d2..4cbf37c 100644 --- a/app/src/main/java/com/ydd/sportfaceid/MainActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/MainActivity.java @@ -135,10 +135,6 @@ public class MainActivity extends SDBaseActivity { case QR_EVENT_ACTION_LOADING: qrCodePbCover.setVisibility(View.VISIBLE); qrCodePbCover.show(); - Thread.sleep(60000); - qrCodePbCover.setVisibility(View.GONE); - qrCodePbCover.hide(); - tvTip.setText("欢迎扫码进场!"); break; case QR_EVENT_ACTION_OPEN_DOOR: case QR_EVENT_ACTION_FAILED: diff --git a/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java b/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java index f9be788..332adfd 100644 --- a/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java +++ b/app/src/main/java/com/ydd/sportfaceid/service/MessageService.java @@ -64,10 +64,10 @@ public class MessageService { Log.d(TAG, "LINK" + message.getMessage()); EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LINK, message.getMessage())); break; - case LOAD: - Log.d(TAG, "LOADING" + message.getMessage()); - EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LOADING, message.getMessage())); - break; +// case LOAD: +// Log.d(TAG, "LOADING" + message.getMessage()); +// EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LOADING, message.getMessage())); +// break; case OPEN_DOOR: Log.d(TAG, "OPEN_DOOR" + message.getMessage()); EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_OPEN_DOOR, message.getMessage())); diff --git a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java index b24c936..91392f6 100644 --- a/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java +++ b/app/src/main/java/com/ydd/sportfaceid/setting/SDSettingActivity.java @@ -15,6 +15,7 @@ import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.ydd.sportfaceid.R; import com.ydd.sportfaceid.config.SDAppConfig; +import com.ydd.sportfaceid.event.QRCodeEvent; import com.ydd.sportfaceid.main.SDBaseActivity; import butterknife.BindView; @@ -22,6 +23,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import com.ydd.sportfaceid.utils.JsonMapper; import okhttp3.*; +import org.greenrobot.eventbus.EventBus; import java.io.IOException; import java.util.List; @@ -124,7 +126,8 @@ public class SDSettingActivity extends SDBaseActivity { SDAppConfig.getInstance().configSet(spinnerValue, deviceType); // TODO 告诉客户端,进行修改数据,下线原本的数据(暂时不需要) showToast("设置成功!"); - onGoToMainAction(); + EventBus.getDefault().post(new QRCodeEvent(QRCodeEvent.QR_EVENT_ACTION_LOADING, "设置变更,请等待设备初始化。。。")); + onGoToMainAction(); } catch (Exception e) { Log.e(TAG, "setConfigError: ", e); showToast("设置失败!请稍后尝试!");