save

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() {

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<BasePresenter<*>>() {
+class HomeActivity : BaseActivity<BasePresenter<*>>(), NetworkUtils.OnNetworkStatusChangedListener {
 
     private val mAdapter: HomeAdapter by lazy {
         val list = mutableListOf<HomeItem>()
@@ -58,10 +60,18 @@ class HomeActivity : BaseActivity<BasePresenter<*>>() {
         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<BasePresenter<*>>() {
 
             }).theme { activity -> ScreenUtils.setFullScreen(activity) }
             .request()
+
+
     }
 
     private val PERMISSIONS_REQUEST_STORAGE = 1
@@ -171,17 +183,19 @@ class HomeActivity : BaseActivity<BasePresenter<*>>() {
     }
 
     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<BasePresenter<*>>() {
 
     }
 
+
     private fun updateApp(version: Version) {
         AllenVersionChecker
             .getInstance()
@@ -281,4 +296,12 @@ class HomeActivity : BaseActivity<BasePresenter<*>>() {
             })
             .executeMission(this)
     }
+
+    override fun onConnected(networkType: NetworkUtils.NetworkType?) {
+        netDialog?.dismiss()
+    }
+
+    override fun onDisconnected() {
+        checkNetwork()
+    }
 }