diff --git a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
index 4c734b9..1bdd94d 100644
--- a/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
+++ b/app/src/main/java/com/casic/br/fragment/DevicePageFragment.kt
@@ -13,8 +13,6 @@
 import com.casic.br.utils.DeserializeModel
 import com.casic.br.view.AddDeviceActivity
 import com.casic.br.view.AllDeviceActivity
-import com.casic.br.view.device.CoSensorActivity
-import com.casic.br.view.LoginActivity
 import com.casic.br.view.device.*
 import com.pengxh.kt.lite.base.KotlinBaseFragment
 import com.pengxh.kt.lite.extensions.navigatePageTo
@@ -116,83 +114,71 @@
                 addedDeviceAdapter.setOnItemClickListener(object :
                     AddedDeviceAdapter.OnItemClickListener {
                     override fun onAddDeviceClick() {
-                        if (DeserializeModel.isLogin()) {
-                            requireContext().navigatePageTo<AddDeviceActivity>()
-                        } else {
-                            requireContext().navigatePageTo<LoginActivity>()
-                        }
+                        requireContext().navigatePageTo<AddDeviceActivity>()
                     }
 
                     override fun onItemClick(position: Int) {
                         // 需要根据设备类型显示不同的页面
-                        if (DeserializeModel.isLogin()) {
-                            val deviceModel = dataBeans[position]
-                            val selectedCategory = deviceModel.selectCategory()
-                            Log.d(kTag, "设备类型: $selectedCategory")
-                            when {
-                                selectedCategory == "rs" -> {
-                                    //热水器
-                                    requireContext().navigatePageTo<WaterHeaterActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "yyj" -> {
-                                    //油烟机
-                                    requireContext().navigatePageTo<RangeHoodActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "bgl" -> {
-                                    //壁挂炉
-                                    requireContext().navigatePageTo<FireplaceActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "rq" -> {
-                                    //燃气灶
-                                    requireContext().navigatePageTo<CookerActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "pc" -> {
-                                    //排插
-                                    requireContext().navigatePageTo<PowerStripActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "cz" -> {
-                                    //插座
-                                    requireContext().navigatePageTo<SingleStripActivity>(deviceModel.devId)
-                                }
-                                selectedCategory == "wg2" -> {
-                                    //网关
-                                    requireContext().navigatePageTo<SmartGatewayActivity>(
-                                        deviceModel.devId
-                                    )
-                                }
-                                //TODO 人体传感器设备类型待确认
-                                selectedCategory == "0204" -> {
-                                    //人体传感器
-                                    requireContext().navigatePageTo<MotionSensorActivity>()
-                                }
-                                selectedCategory == "wsdcg" -> {
-                                    //温湿度传感器
-                                    requireContext().navigatePageTo<TAndHSensorActivity>()
-                                }
-                                selectedCategory == "ywbj" -> {
-                                    //火灾报警器
-                                    requireContext().navigatePageTo<FireSensorActivity>()
-                                }
-                                selectedCategory == "rqbj" -> {
-                                    //燃气报警器
-                                    requireContext().navigatePageTo<GasSensorActivity>()
-                                }
-                                selectedCategory == "cobj" -> {
-                                    //一氧化碳报警器
-                                    requireContext().navigatePageTo<CoSensorActivity>()
-                                }
+                        val deviceModel = dataBeans[position]
+                        val selectedCategory = deviceModel.selectCategory()
+                        Log.d(kTag, "设备类型: $selectedCategory")
+                        when (selectedCategory) {
+                            "rs" -> {
+                                //热水器
+                                requireContext().navigatePageTo<WaterHeaterActivity>(deviceModel.devId)
                             }
-                        } else {
-                            requireContext().navigatePageTo<LoginActivity>()
+                            "yyj" -> {
+                                //油烟机
+                                requireContext().navigatePageTo<RangeHoodActivity>(deviceModel.devId)
+                            }
+                            "bgl" -> {
+                                //壁挂炉
+                                requireContext().navigatePageTo<FireplaceActivity>(deviceModel.devId)
+                            }
+                            "rq" -> {
+                                //燃气灶
+                                requireContext().navigatePageTo<CookerActivity>(deviceModel.devId)
+                            }
+                            "pc" -> {
+                                //排插
+                                requireContext().navigatePageTo<PowerStripActivity>(deviceModel.devId)
+                            }
+                            "cz" -> {
+                                //插座
+                                requireContext().navigatePageTo<SingleStripActivity>(deviceModel.devId)
+                            }
+                            "wg2" -> {
+                                //网关
+                                requireContext().navigatePageTo<SmartGatewayActivity>(
+                                    deviceModel.devId
+                                )
+                            }
+                            //TODO 人体传感器设备类型待确认
+                            "0204" -> {
+                                //人体传感器
+                                requireContext().navigatePageTo<MotionSensorActivity>()
+                            }
+                            "wsdcg" -> {
+                                //温湿度传感器
+                                requireContext().navigatePageTo<TAndHSensorActivity>()
+                            }
+                            "ywbj" -> {
+                                //火灾报警器
+                                requireContext().navigatePageTo<FireSensorActivity>()
+                            }
+                            "rqbj" -> {
+                                //燃气报警器
+                                requireContext().navigatePageTo<GasSensorActivity>()
+                            }
+                            "cobj" -> {
+                                //一氧化碳报警器
+                                requireContext().navigatePageTo<CoSensorActivity>()
+                            }
                         }
                     }
 
                     override fun onButtonClick(position: Int) {
-                        if (DeserializeModel.isLogin()) {
-                            moreOperate(position)
-                        } else {
-                            requireContext().navigatePageTo<LoginActivity>()
-                        }
+                        moreOperate(position)
                     }
                 })
             }