更新toast框架

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -5,6 +5,7 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
+import com.hjq.toast.Toaster
 import com.wdkl.lcd_board.helper.AnrFcExceptionUtil
 import com.wdkl.lcd_board.helper.NetHelper
 
@@ -42,7 +43,6 @@ class Application : BaseApplication() {
         JRouter.openDebug()
         JRouter.openLog()
         JRouter.prepare().create("/welcome/launch").seek()
-        JRouter.prepare().create("/extra/launch").seek()
         JRouter.prepare().create("/lcd_board/launch").seek()
     }
 
@@ -72,6 +72,8 @@ class Application : BaseApplication() {
                 .openLogger()
                 .addNetInterceptor(RestfulExceptionInterceptor())
 
+        Toaster.init(this)
+
         //init
         NetHelper.getInstance().init()
 

common/build.gradle

@@ -201,6 +201,8 @@ dependencies {
     compile files('libs/chinese2py.jar')
     //compile files('libs/toolkit.jar')
 
+    compile files('libs/Toaster-12.2.aar')
+
     /**
      * 二维码扫描
      */

common/src/main/code/com/wdkl/ncs/android/lib/utils/ExtendMethods.kt

@@ -31,6 +31,7 @@ import com.enation.javashop.net.engine.plugin.rxbus.RxBus
 import com.enation.javashop.utils.base.tool.CommonTool
 import com.enation.javashop.utils.base.tool.ScreenTool
 import com.enation.javashop.utils.logger.LoggerFactory
+import com.hjq.toast.Toaster
 import io.reactivex.disposables.Disposable
 import okhttp3.ResponseBody
 import org.json.JSONArray
@@ -84,7 +85,14 @@ fun showMessage(message: String) {
     if (message == ""){
         return
     }
-    val messageCallback = {
+
+    try {
+        Toaster.showShort(message)
+    } catch (ex: Exception) {
+        //
+    }
+
+    /*val messageCallback = {
         Toast.makeText(BaseApplication.appContext, message, Toast.LENGTH_SHORT).show()
     }
     try {
@@ -92,7 +100,7 @@ fun showMessage(message: String) {
     } catch (runtime: RuntimeException) {
         Looper.prepare()
         messageCallback.invoke()
-    }
+    }*/
 }
 
 /**

lcd_board/src/main/java/com/wdkl/lcd_board/activity/MainActivity.kt

@@ -399,9 +399,9 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
         view_title_layout_tv_no.text = "ID: " + deviceInfo.id
         initialized = true
 
-        /*if (Constant.PART_ID != null) {
+        if (Constant.PART_ID != null) {
             presenter.loadPartSettings(Constant.PART_ID)
-        }*/
+        }
 
         //正式版本开机启动自动检查升级
         if (!BuildConfig.DEBUG) {
@@ -424,7 +424,6 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
 
         if (BuildConfig.VERSION_CODE < appInfo.versionNo) {
             if (!updating) {
-                //showMessage("即将升级...")
                 Constant.APP_PATH = appInfo.appPath
                 updating = true
                 AppTool.Time.delay(200) {
@@ -433,8 +432,6 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
             } else {
                 showMessage("正在升级中...")
             }
-        } else {
-            showMessage("当前已是最新版本")
         }
     }
 
@@ -575,9 +572,9 @@ class MainActivity :BaseActivity<MainActivityPresenter, ActivityMainLayoutBindin
                         if (tcpModel.getAction() == TcpAction.DeviceAction.APP_UPDATE) {
                             checkAppVersion()
                         } else if (tcpModel.action == TcpAction.DeviceAction.SYSTEM_SETTING) {
-                            /*if (Constant.PART_ID != null) {
+                            if (Constant.PART_ID != null) {
                                 presenter.loadPartSettings(Constant.PART_ID)
-                            }*/
+                            }
                         } else if (tcpModel.action == TcpAction.DeviceAction.RESTART) {
                             AppUpdateHelper.restartApp(activity)
                         } else if (tcpModel.action == TcpAction.DeviceAction.SERVER_CHANGE) {