diff --git a/app/build.gradle b/app/build.gradle index 1268afc..b82c148 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 30200 - versionName "3.2.0" + versionCode 30201 + versionName "3.2.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/yzx/escreen/MainActivity.kt b/app/src/main/java/com/yzx/escreen/MainActivity.kt index 1c0b4cc..31fca38 100644 --- a/app/src/main/java/com/yzx/escreen/MainActivity.kt +++ b/app/src/main/java/com/yzx/escreen/MainActivity.kt @@ -8,6 +8,7 @@ import android.os.Handler import android.os.Looper import android.util.Log import android.view.KeyEvent +import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView @@ -43,6 +44,8 @@ import com.yzx.escreen.presenter.MainView import com.yzx.escreen.utils.hideNavigationBar import com.yzx.escreen.widget.* import kotlinx.android.synthetic.main.activity_main.* +import kotlinx.android.synthetic.main.dialog_leave.view.sureBtn +import kotlinx.android.synthetic.main.dialog_sure.view.closeBtn import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -250,26 +253,46 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus dialogLayout.removeView(it) dialogList.remove(it) } - dialog.onSureClick= {view, item -> + dialog.onSureClick = { view, item -> - val sureDialog = QMUIDialog.MessageDialogBuilder(this) - sureDialog.setMessage("是否确认已放行?") - sureDialog.setTitle("温馨提示") - sureDialog.addAction("取消"){ _dialog, index -> - _dialog?.dismiss() - } - sureDialog.addAction("确认"){ _dialog, index -> - _dialog?.dismiss() + val sureDialog = Dialog(this,R.style.TransparentDialog) + val tempView = LayoutInflater.from(this).inflate(R.layout.dialog_sure, null, false) + sureDialog.setContentView(tempView) + tempView.sureBtn.setOnClickListener { + sureDialog.dismiss() dialogLayout.removeView(view) dialogList.remove(view) EventBus.getDefault().post(SureOutSchool(item)) } + tempView.closeBtn.setOnClickListener { + sureDialog.dismiss() + } + sureDialog.hideNavigationBar() sureDialog.show() + +// val sureDialog = QMUIDialog.MessageDialogBuilder(this) +// sureDialog.setMessage("是否确认已放行?") +// sureDialog.setTitle("温馨提示") +// sureDialog.addAction("取消"){ _dialog, index -> +// _dialog?.dismiss() +// } +// sureDialog.addAction("确认"){ _dialog, index -> +// _dialog?.dismiss() +// dialogLayout.removeView(view) +// dialogList.remove(view) +// EventBus.getDefault().post(SureOutSchool(item)) +// } +// sureDialog.show() + showSureDialog() } dialogLayout.addView(dialog) dialogList.add(dialog) } + fun showSureDialog() { + + } + //接收异动消息 @Subscribe(threadMode = ThreadMode.MAIN) fun onMessageEvent(detail: StuChange) { @@ -394,7 +417,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus override fun onClose(code: Int, reason: String?, remote: Boolean) { LogUtils.d("initWs-WebSocketClient-onClose", code, reason, remote) - mWsHandler.postDelayed(mWsRunnable,60*1000) + mWsHandler.postDelayed(mWsRunnable, 60 * 1000) } override fun onMessage(message: String?) { @@ -406,7 +429,7 @@ class MainActivity : BaseActivity(), NetworkUtils.OnNetworkStatus override fun onError(ex: Exception?) { LogUtils.d("initWs-WebSocketClient-onError", ex) - mWsHandler.postDelayed(mWsRunnable,60*1000) + mWsHandler.postDelayed(mWsRunnable, 60 * 1000) } } diff --git a/app/src/main/res/layout/dialog_sure.xml b/app/src/main/res/layout/dialog_sure.xml new file mode 100644 index 0000000..f56b803 --- /dev/null +++ b/app/src/main/res/layout/dialog_sure.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ce3d306..6088b45 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -227,4 +227,10 @@ @dimen/d_28 bold + +