diff --git a/app/libs/wenote.jar b/app/libs/wenote.jar index 7af90ae..746e5b2 100644 Binary files a/app/libs/wenote.jar and b/app/libs/wenote.jar differ diff --git a/app/src/main/java/com/yzx/webebook/activity/BookActivity.java b/app/src/main/java/com/yzx/webebook/activity/BookActivity.java index a4bd4dc..6a8e967 100644 --- a/app/src/main/java/com/yzx/webebook/activity/BookActivity.java +++ b/app/src/main/java/com/yzx/webebook/activity/BookActivity.java @@ -380,6 +380,7 @@ public class BookActivity extends Activity { public void onClick(View v) { if (mView.getPenType() == WeNoteView.TYPE_DRAW_ERASER) { mView.setPenType(WeNoteView.TYPE_DRAW_CURVE); + mView.updateEnableStatus(); mPenBtn.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.ic_book_pen_select, 0, 0); mRubberBtn.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.ic_book_rubber, 0, 0); } @@ -392,6 +393,7 @@ public class BookActivity extends Activity { public void onClick(View v) { if (mView.getPenType() != WeNoteView.TYPE_DRAW_ERASER) { mView.setPenType(WeNoteView.TYPE_DRAW_ERASER); + mView.updateEnableStatus(); mPenBtn.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.ic_book_pen, 0, 0); mRubberBtn.setCompoundDrawablesWithIntrinsicBounds(0, R.mipmap.ic_book_rubber_select, 0, 0); } @@ -415,6 +417,7 @@ public class BookActivity extends Activity { //橡皮擦 mView.setEraserWidth(20); mEraserWidthBtn.setText("橡皮宽20"); + mView.updateEnableStatus(); } private void initTabBar() { diff --git a/app/src/main/java/com/yzx/webebook/activity/HomeActivity.kt b/app/src/main/java/com/yzx/webebook/activity/HomeActivity.kt index 47b2a7d..a91989e 100644 --- a/app/src/main/java/com/yzx/webebook/activity/HomeActivity.kt +++ b/app/src/main/java/com/yzx/webebook/activity/HomeActivity.kt @@ -6,6 +6,8 @@ import android.app.AlertDialog import android.app.Dialog import android.content.Context import android.content.DialogInterface +import android.content.IntentFilter +import android.net.ConnectivityManager import android.util.Log import android.view.View import android.widget.TextView @@ -39,7 +41,7 @@ import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast import java.util.* -class HomeActivity : BaseActivity>() { +class HomeActivity : BaseActivity>(), NetworkUtils.OnNetworkStatusChangedListener { private val mAdapter: HomeAdapter by lazy { val list = mutableListOf() @@ -58,10 +60,18 @@ class HomeActivity : BaseActivity>() { count = 0 } + private var netDialog:AlertDialog ?= null + override val inflateId: Int get() = R.layout.activity_home + + override fun initView() { + + NetworkUtils.registerNetworkStatusChangedListener(this) + + val layoutManager = GridLayoutManager(this, 3) homeGridView.layoutManager = layoutManager homeGridView.adapter = mAdapter @@ -128,6 +138,8 @@ class HomeActivity : BaseActivity>() { }).theme { activity -> ScreenUtils.setFullScreen(activity) } .request() + + } private val PERMISSIONS_REQUEST_STORAGE = 1 @@ -171,17 +183,19 @@ class HomeActivity : BaseActivity>() { } private fun checkNetwork() { - val builder = AlertDialog.Builder(this) - builder.setTitle("温馨提示") - builder.setMessage("你还没有链接网络,请先连接网络!") - builder.setPositiveButton("去设置") { _, _ -> - NetworkUtils.openWirelessSettings() + if(netDialog==null){ + val builder = AlertDialog.Builder(this) + builder.setTitle("温馨提示") + builder.setMessage("你还没有连接网络,请先连接网络!") + builder.setPositiveButton("去设置") { _, _ -> + NetworkUtils.openWirelessSettings() + } + builder.setCancelable(false) + netDialog = builder.create() + netDialog?.setCanceledOnTouchOutside(false) + netDialog?.getButton(DialogInterface.BUTTON_NEGATIVE)?.visibility = View.GONE } - builder.setCancelable(false) - val dialog = builder.create() - dialog.setCanceledOnTouchOutside(false) - dialog.getButton(DialogInterface.BUTTON_NEGATIVE)?.visibility = View.GONE - dialog.show() + netDialog?.show() } private fun checkVersion(userCheck: Boolean = false): Unit { @@ -229,6 +243,7 @@ class HomeActivity : BaseActivity>() { } + private fun updateApp(version: Version) { AllenVersionChecker .getInstance() @@ -281,4 +296,12 @@ class HomeActivity : BaseActivity>() { }) .executeMission(this) } + + override fun onConnected(networkType: NetworkUtils.NetworkType?) { + netDialog?.dismiss() + } + + override fun onDisconnected() { + checkNetwork() + } } \ No newline at end of file