修改门口机门灯默认关闭，医护界面优化

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -490,8 +490,8 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
         Constant.inNursing = false
         SettingConfig.setInNursing(activity, false)
-        //门灯
-        HardWareFactroy.getHardTools().setDoorLight(2)
+        //关闭门灯
+        HardWareFactroy.getHardTools().setDoorLight(4)
         if (Constant.DEVICE_ID != -1 && nursingInteId != -1) {
             OtherUtil.sendNursingEnd(Constant.DEVICE_ID, nursingInteId)
             nursingInteId = -1
@@ -1265,7 +1265,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
     private fun handleNursingButton(currentTime: Long) {
         if (currentTime - clickTime > 2000) {
-             YhUtil.sendReinforceResponsed(Constant.DEVICE_ID,0) // Uncomment if needed
+             YhUtil.sendExitLanding(Constant.DEVICE_ID,0) // Uncomment if needed
             clickTime = currentTime
         } else {
             showMessage(R.string.wait_moment)

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/SetHintActivity.kt

@@ -170,7 +170,7 @@ class SetHintActivity : BaseActivity<SetHintActivityPresenter, CallingdoorNurseM
                     msg_ll.visibility = View.GONE
                     timer1?.cancel()
                     //退出护理 直接回到首页。
-                    YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
+                    YhUtil.sendExitLanding(Constant.DEVICE_ID, id.toInt())
                     (activity as CallingdoorActivity).backToMain()
                 }
             }.start()

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/NurseFragment.kt

@@ -58,7 +58,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
     override fun bindEvent() {
            //退出医护
         nurse_main_bt.setOnClickListener {
-            YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
+            YhUtil.sendExitLanding(Constant.DEVICE_ID, id.toInt())
             (activity as CallingdoorActivity).backToMain()
         }
         //定位
@@ -104,7 +104,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
                             nurse_top_3_tx.text=getString(R.string.nursing_title)
                             nurse_main_3_tx.setTextColor(resources.getColor(R.color.white))
                             (activity as CallingdoorActivity).setHuli(0)
-                            YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
+                            YhUtil.sendExitLanding(Constant.DEVICE_ID, id.toInt())
                         }else{
                             nurse_main_3_ll.setBackgroundResource(R.drawable.shape_bed_bg)
                             nurse_main_3_img.setImageResource(R.mipmap.hu)
@@ -126,7 +126,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
                             nurse_top_3_tx.text=getString(R.string.nursing_title)
                             nurse_main_3_tx.setTextColor(resources.getColor(R.color.white))
                             (activity as CallingdoorActivity).setHuli(time)
-                            YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
+                            YhUtil.sendExitLanding(Constant.DEVICE_ID, id.toInt())
                         }else{
                             nurse_main_3_ll.setBackgroundResource(R.drawable.shape_bed_bg)
                             nurse_main_3_img.setImageResource(R.mipmap.hu)
@@ -236,7 +236,7 @@ class NurseFragment : BaseFragment<NurseFragmentPresenter, CallingdoorNurseMainB
             Constant.EVENT_EXIT_YH ->{
                 ExitHuliDialogHelper.showDialog(activity,object : ExitHuliDialogHelper.ClickListener {
                     override fun onClick() {
-                        YhUtil.sendReinforceResponsed(Constant.DEVICE_ID, id.toInt())
+                        YhUtil.sendExitLanding(Constant.DEVICE_ID, id.toInt())
                         (activity as CallingdoorActivity).backToMain()
                     }
                 })

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/YhFragment.kt

@@ -66,7 +66,6 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
     }
     //点击事件
     override fun bindEvent() {
-       //医护
         //医护
         nurse_bt.setOnClickListener {
             val passwprd: String = nurse_login_nuber.getText().toString()
@@ -76,9 +75,9 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
                 } else {
                     showMessage("no PART id")
                 }
-
-
             }
+
+            Utils.hideInputKeyboard(activity.window.decorView.windowToken)
         }
 
         nurse_bt_1.setOnClickListener {
@@ -95,6 +94,10 @@ class  YhFragment : BaseFragment<YhFragmentPresenter, CallingdoorNurseBinding>()
         ll_yh_login_view.setOnClickListener {
             Utils.hideInputKeyboard(activity.window.decorView.windowToken)
         }
+
+        ll_enter_yh_2.setOnClickListener {
+            Utils.hideInputKeyboard(activity.window.decorView.windowToken)
+        }
     }
     /**执行其他销毁操作*/
     override fun destory() {

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/DoorLightHelper.java

@@ -13,16 +13,19 @@ public class DoorLightHelper {
         //有人入住时点亮门灯，无人入住关闭门灯
         Constant.inNursing = SettingConfig.getInNursing(BaseApplication.appContext);
         if (Constant.inNursing) {
-            //SerialPortHelper.setDoorLight(1, Constant.nursingColor); //绿色
+            //门灯绿色
             HardWareFactroy.getHardTools().setDoorLight(1);
         } else {
-            if (Constant.bedCustomIn) {
-                //SerialPortHelper.setDoorLight(1, "111"); //白色
+            //门灯关闭
+            HardWareFactroy.getHardTools().setDoorLight(4);
+
+            /*if (Constant.bedCustomIn) {
+                //白色门灯
                 HardWareFactroy.getHardTools().setDoorLight(2);
             } else {
+                //门灯关闭
                 HardWareFactroy.getHardTools().setDoorLight(4);
-                //SerialPortHelper.setDoorLight(0, "000"); //关闭
-            }
+            }*/
         }
     }
 }

callingdoor/src/main/res/layout-land/callingdoor_nurse.xml

@@ -1,240 +1,236 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:background="#EAF2F9">
-
-          <LinearLayout
-                 android:layout_width="match_parent"
-                 android:layout_height="@dimen/d80"
-                 android:gravity="center_vertical"
-                 android:background="@drawable/shape_bed_bg"
-                 android:layout_marginTop="@dimen/d20"
-                 android:layout_marginLeft="@dimen/d24"
-                 android:layout_marginRight="@dimen/d24"
-                 >
-                 <ImageView
-                     android:layout_width="40dp"
-                     android:layout_height="40dp"
-                     android:src="@mipmap/yanz"
-                     android:layout_marginLeft="25dp"
-                     />
-                 <TextView
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:text="@string/str_select_type_for_nurse"
-                     android:layout_marginLeft="@dimen/d20"
-                     android:textSize="@dimen/font_size_18"
-                     android:textColor="@color/black"
-                     android:textStyle="bold"
-                     />
-
-             </LinearLayout>
+        android:background="#EAF2F9"
+        android:orientation="vertical">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/d410"
-        android:orientation="horizontal"
-        android:gravity="center_vertical"
-        android:layout_marginTop="@dimen/d20"
-        android:layout_marginLeft="@dimen/d24"
-        android:layout_marginRight="@dimen/d24"
-        android:layout_marginBottom="@dimen/d20"
-        >
         <LinearLayout
-            android:id="@+id/rv_nurse_main_ll"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/d28"
-            android:visibility="gone"
+            android:layout_height="@dimen/d80"
+            android:layout_marginLeft="@dimen/d24"
+            android:layout_marginTop="@dimen/d20"
+            android:layout_marginRight="@dimen/d24"
             android:background="@drawable/shape_bed_bg"
-            android:orientation="vertical">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_nurse_main_view"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/d250"
-                android:layout_marginLeft="@dimen/d6"
-                android:layout_marginRight="@dimen/d6"
-                android:layout_marginTop="@dimen/d15"
-                android:layout_marginBottom="@dimen/d15"
-                />
-
-            <TextView
-                android:id="@+id/nurse_bt_1"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/d50"
-                android:layout_marginLeft="@dimen/d40"
-                android:layout_marginRight="@dimen/d50"
-                android:layout_marginTop="@dimen/d20"
-                android:background="@drawable/selector_nuserlogin_btn"
-                android:gravity="center"
-                android:clickable="true"
-                android:text="@string/str_enter_medical_care"
-                android:textColor="@color/white"
-                android:textSize="@dimen/font_size_15" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/ll_yh_login_view"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_marginRight="@dimen/d10"
-            android:layout_weight="1"
-            android:background="@drawable/shape_bed_bg"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
+            android:gravity="center_vertical">
 
             <ImageView
-                android:layout_width="@dimen/d75"
-                android:layout_height="@dimen/d75"
-                android:layout_marginTop="@dimen/d22"
-                android:src="@mipmap/yan" />
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="25dp"
+                android:src="@mipmap/yanz" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/d22"
-                android:text="@string/input_password"
+                android:layout_marginLeft="@dimen/d20"
+                android:text="@string/str_select_type_for_nurse"
                 android:textColor="@color/black"
-                android:textSize="@dimen/font_size_15"
+                android:textSize="@dimen/font_size_18"
                 android:textStyle="bold" />
 
-<!--            <TextView-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginTop="@dimen/d8"-->
-<!--                android:text="密码由数字组成"-->
-<!--                android:textColor="@color/black"-->
-<!--                android:textSize="@dimen/font_size_10" />-->
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/d410"
+            android:layout_marginLeft="@dimen/d24"
+            android:layout_marginTop="@dimen/d20"
+            android:layout_marginRight="@dimen/d24"
+            android:layout_marginBottom="@dimen/d20"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <LinearLayout
+                android:id="@+id/rv_nurse_main_ll"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/d50"
-                android:layout_marginTop="@dimen/d16"
-                android:gravity="center_vertical"
-                android:visibility="gone"
-                android:orientation="horizontal">
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/d28"
+                android:background="@drawable/shape_bed_bg"
+                android:orientation="vertical"
+                android:visibility="gone">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_nurse_main_view"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d250"
+                    android:layout_marginLeft="@dimen/d6"
+                    android:layout_marginTop="@dimen/d15"
+                    android:layout_marginRight="@dimen/d6"
+                    android:layout_marginBottom="@dimen/d15" />
+
+                <TextView
+                    android:id="@+id/nurse_bt_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d50"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginRight="@dimen/d50"
+                    android:background="@drawable/selector_nuserlogin_btn"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:text="@string/str_enter_medical_care"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_15" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_yh_login_view"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginRight="@dimen/d10"
+                android:layout_weight="1"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="@dimen/d75"
+                    android:layout_height="@dimen/d75"
+                    android:layout_marginTop="@dimen/d22"
+                    android:src="@mipmap/yan" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d40"
-                    android:text="@string/str_card_no"
+                    android:layout_marginTop="@dimen/d22"
+                    android:text="@string/input_password"
                     android:textColor="@color/black"
                     android:textSize="@dimen/font_size_15"
                     android:textStyle="bold" />
 
-                <EditText
-                    android:id="@+id/nurse_login_password"
+                <!--            <TextView-->
+                <!--                android:layout_width="wrap_content"-->
+                <!--                android:layout_height="wrap_content"-->
+                <!--                android:layout_marginTop="@dimen/d8"-->
+                <!--                android:text="密码由数字组成"-->
+                <!--                android:textColor="@color/black"-->
+                <!--                android:textSize="@dimen/font_size_10" />-->
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/d8"
-                    android:layout_marginRight="@dimen/d60"
-                    android:background="@drawable/selector_nuser_ed_d"
-                    android:hint="请输入工号"
-                    android:paddingLeft="@dimen/d26"
-                    android:textSize="@dimen/font_size_18"
-                    android:textStyle="bold"
-
-                    />
+                    android:layout_height="@dimen/d50"
+                    android:layout_marginTop="@dimen/d16"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d40"
+                        android:text="@string/str_card_no"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_15"
+                        android:textStyle="bold" />
+
+                    <EditText
+                        android:id="@+id/nurse_login_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:layout_marginRight="@dimen/d60"
+                        android:background="@drawable/selector_nuser_ed_d"
+                        android:hint="请输入工号"
+                        android:paddingLeft="@dimen/d26"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold"
+
+                        />
+
+
+                </LinearLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d50"
+                    android:layout_marginTop="@dimen/d28"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/d40"
+                        android:text="@string/str_password"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/font_size_15"
+                        android:textStyle="bold"
+
+                        />
+
+                    <EditText
+                        android:id="@+id/nurse_login_nuber"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginLeft="@dimen/d8"
+                        android:layout_marginRight="@dimen/d60"
+                        android:background="@drawable/selector_nuser_ed_d"
+                        android:hint="@string/input_password"
+                        android:paddingLeft="@dimen/d26"
+                        android:textSize="@dimen/font_size_18"
+                        android:textStyle="bold" />
+
+
+                </LinearLayout>
 
 
+                <TextView
+                    android:id="@+id/nurse_bt"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/d50"
+                    android:layout_marginLeft="@dimen/d40"
+                    android:layout_marginTop="@dimen/d20"
+                    android:layout_marginRight="@dimen/d50"
+                    android:background="@drawable/selector_nuserlogin_btn"
+                    android:clickable="true"
+                    android:gravity="center"
+                    android:text="@string/str_enter_medical_care"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/font_size_15" />
 
             </LinearLayout>
 
-
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/d50"
-                android:layout_marginTop="@dimen/d28"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+                android:id="@+id/ll_enter_yh_2"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/d10"
+                android:layout_weight="1"
+                android:background="@drawable/shape_bed_bg"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/d40"
-                    android:text="@string/str_password"
+                    android:layout_marginLeft="@dimen/d20"
+                    android:layout_marginTop="@dimen/d47"
+                    android:text="@string/str_swipe_nfc_card"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/font_size_15"
-                    android:textStyle="bold"
-
-                    />
-                <EditText
-                    android:id="@+id/nurse_login_nuber"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginLeft="@dimen/d8"
-                    android:layout_marginRight="@dimen/d60"
-                    android:background="@drawable/selector_nuser_ed_d"
-                    android:hint="@string/input_password"
-                    android:paddingLeft="@dimen/d26"
                     android:textSize="@dimen/font_size_18"
                     android:textStyle="bold" />
 
-
-
+                <!--            <TextView-->
+                <!--                android:layout_width="wrap_content"-->
+                <!--                android:layout_height="wrap_content"-->
+                <!--                android:text="使用有效NFC刷卡成功后直接进入医护"-->
+                <!--                android:textSize="@dimen/font_size_10"-->
+                <!--                android:textColor="@color/black"-->
+                <!--                android:layout_marginTop="@dimen/d13"-->
+                <!--                />-->
+                <ImageView
+                    android:layout_width="@dimen/d244"
+                    android:layout_height="@dimen/d280"
+                    android:layout_marginTop="@dimen/d20"
+                    android:src="@mipmap/nfc" />
             </LinearLayout>
 
-
-
-            <TextView
-                android:id="@+id/nurse_bt"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/d50"
-                android:layout_marginLeft="@dimen/d40"
-                android:layout_marginRight="@dimen/d50"
-                android:layout_marginTop="@dimen/d20"
-                android:background="@drawable/selector_nuserlogin_btn"
-                android:gravity="center"
-                android:clickable="true"
-                android:text="@string/str_enter_medical_care"
-                android:textColor="@color/white"
-                android:textSize="@dimen/font_size_15" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:layout_weight="1"
-            android:layout_marginLeft="@dimen/d10"
-            android:background="@drawable/shape_bed_bg"
-            >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/str_swipe_nfc_card"
-                android:layout_marginLeft="@dimen/d20"
-                android:textSize="@dimen/font_size_18"
-                android:textColor="@color/black"
-                android:textStyle="bold"
-                android:layout_marginTop="@dimen/d47"
-                />
-
-<!--            <TextView-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:text="使用有效NFC刷卡成功后直接进入医护"-->
-<!--                android:textSize="@dimen/font_size_10"-->
-<!--                android:textColor="@color/black"-->
-<!--                android:layout_marginTop="@dimen/d13"-->
-<!--                />-->
-            <ImageView
-                android:layout_width="@dimen/d244"
-                android:layout_height="@dimen/d280"
-                android:src="@mipmap/nfc"
-                android:layout_marginTop="@dimen/d20"
-                />
         </LinearLayout>
 
-    </LinearLayout>
-
 
     </LinearLayout>
 

callingdoor/src/main/res/layout/callingdoor_nurse.xml

@@ -186,6 +186,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_enter_yh_2"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_marginTop="@dimen/d10"

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/YhUtil.java

@@ -16,7 +16,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.AUTH);
         tcpModel.setAction(TcpAction.AuthAction.LOGIN);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(new NfcTcpModeData(passno));
         return tcpModel;
     }
@@ -27,7 +26,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.AUTH);
         tcpModel.setAction(TcpAction.AuthAction.LOGOUT);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(id);
         return tcpModel;
     }
@@ -38,7 +36,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.POSITION);
         tcpModel.setAction(TcpAction.PositionAction.POSITION_START);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(new NfcTcpModeData(passno));
         return tcpModel;
     }
@@ -49,7 +46,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.POSITION);
         tcpModel.setAction(TcpAction.PositionAction.POSITION_END);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(new NfcTcpModeData(passno));
         return tcpModel;
     }
@@ -60,7 +56,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.ROOMCHECK);
         tcpModel.setAction(TcpAction.RoomCheckAction.START);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(new NfcTcpModeData(passno));
         return tcpModel;
     }
@@ -71,7 +66,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.ROOMCHECK);
         tcpModel.setAction(TcpAction.RoomCheckAction.END);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         tcpModel.setData(new NfcTcpModeData(passno));
         return tcpModel;
     }
@@ -82,7 +76,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.SCREEN_TIP);
         tcpModel.setAction(TcpAction.ScreenTipAction.START);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         Map map = new HashMap();
         map.put("tips", tips);
         map.put("seconds", seconds);
@@ -96,7 +89,6 @@ public class YhUtil {
         tcpModel.setType(TcpType.SCREEN_TIP);
         tcpModel.setAction(TcpAction.ScreenTipAction.QUIT);
         tcpModel.setFromId(fromId);
-        tcpModel.setTid("t"+String.valueOf(System.currentTimeMillis()));
         Map map = new HashMap();
         map.put("tips", tips);
         map.put("seconds", seconds);
@@ -110,7 +102,7 @@ public class YhUtil {
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
     }
 
-    public static void sendReinforceResponsed(Integer fromId, int id) {
+    public static void sendExitLanding(Integer fromId, int id) {
         TcpModel tcpModel = ExitLanding(fromId,  id);
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
     }