主界面启动类型优化

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/CallingHostActivationActivity.kt

@@ -512,33 +512,35 @@ class CallingHostActivationActivity : BaseActivity<DevicePresenter, CallinghostA
         }
         handler.removeCallbacksAndMessages(null)
 
-        //保存本机设备信息到数据库
-        DaoManager.getInstance().asyncSession.runInTx {
-            Log.d(TAG, "save device info to db")
-            DaoManager.getInstance().daoSession.deviceInfoBeanDao.deleteAll()
-            val deviceInfo = DeviceInfoBean()
-            deviceInfo.hospitalId = data.hospitalId
-            deviceInfo.hospitalName = data.hospitalName
-            deviceInfo.id = data.id
-            deviceInfo.partId = data.partId
-            deviceInfo.partName = data.partName
-            deviceInfo.partDisplay = data.partDisplay
-            deviceInfo.deviceType = data.deviceType
-            deviceInfo.name = data.name
-            deviceInfo.sipId = data.sipId
-            deviceInfo.sipPassword = data.sipPassword
-            DaoManager.getInstance().daoSession.deviceInfoBeanDao.insert(deviceInfo)
+        if (SettingConfig.getOfflineMode(activity)) {
+            //保存本机设备信息到数据库
+            DaoManager.getInstance().asyncSession.runInTx {
+                Log.d(TAG, "save device info to db")
+                DaoManager.getInstance().daoSession.deviceInfoBeanDao.deleteAll()
+                val deviceInfo = DeviceInfoBean()
+                deviceInfo.hospitalId = data.hospitalId
+                deviceInfo.hospitalName = data.hospitalName
+                deviceInfo.id = data.id
+                deviceInfo.partId = data.partId
+                deviceInfo.partName = data.partName
+                deviceInfo.partDisplay = data.partDisplay
+                deviceInfo.deviceType = data.deviceType
+                deviceInfo.name = data.name
+                deviceInfo.sipId = data.sipId
+                deviceInfo.sipPassword = data.sipPassword
+                DaoManager.getInstance().daoSession.deviceInfoBeanDao.insert(deviceInfo)
+            }
         }
-        if (BuildConfig.device_type.equals("1")) {
-            val intent = Intent()
-            intent.setClass(activity, NurseHomeActivity::class.java)
-            activity.startActivity(intent)
 
-        }else if (BuildConfig.device_type.equals("4")){//宿舍
+        if (BuildConfig.device_type.equals("4")){//宿舍
             val intent = Intent()
 //            intent.setClass(activity, CallingbedDormitoryActivity::class.java)
 //            activity.startActivity(intent)
 
+        } else {
+            val intent = Intent()
+            intent.setClass(activity, NurseHomeActivity::class.java)
+            activity.startActivity(intent)
         }
         SPUtils.put(this, Constant.APP_ACTIVATION, "已激活")
         finish()

android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/util/NetHelper.java

@@ -12,6 +12,7 @@ import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.lib.utils.EthernetUtils;
@@ -94,6 +95,7 @@ public class NetHelper {
         String command = "ping -c " + pingCount + " " + host;
         boolean isSuccess = false;
         try {
+            Log.d("ping", "start " + command);
             process = Runtime.getRuntime().exec(command);
             if (process == null) {
                 append(stringBuffer, "ping fail:process is null.");