1.测试

app/src/main/java/com/sunzee/adapter/DebugParameterAdapter.java

@@ -24,11 +24,16 @@ public class DebugParameterAdapter extends RecyclerView.Adapter<DebugParameterAd
             R.string.debug_1, R.string.debug_2,
             R.string.debug_3, R.string.debug_4,
             R.string.debug_5, R.string.debug_6,
-            R.string.debug_7
+            R.string.debug_7, R.string.hole_lamp1,
+            R.string.hole_lamp2, R.string.hole_lamp3,
+            R.string.hole_lamp4, R.string.hole_lamp5,
+            R.string.hole_lamp6
     };
     private final String[] paraAddress = {
-            "M311", "M312", "M313", "M315",
-            "M316", "M317", "M318"};
+            "M1411", "M1412", "M313", "M315",
+            "M316", "M317", "M318", "M320",
+            "M321", "M322", "M323", "M324",
+            "M325"};
 
     public DebugParameterAdapter() {
 

app/src/main/java/com/sunzee/model/HoleInformation.java

@@ -0,0 +1,46 @@
+package com.sunzee.model;
+
+/**
+ * 蹲位的当前状态
+ */
+public class HoleInformation {
+    /**
+     * 0:表示处于上厕所状态。
+     * 1:表示没上厕所。
+     * 2.表示什么状态都没有。
+     */
+    private int state;
+    /**
+     * 改变状态的时间是什么时候
+     */
+    private long timeDuration;
+
+    public HoleInformation(int state, long timeDuration) {
+        this.state = state;
+        this.timeDuration = timeDuration;
+    }
+
+    public int getState() {
+        return state;
+    }
+
+    public void setState(int state) {
+        this.state = state;
+    }
+
+    public long getTimeDuration() {
+        return timeDuration;
+    }
+
+    public void setTimeDuration(long timeDuration) {
+        this.timeDuration = timeDuration;
+    }
+
+    @Override
+    public String toString() {
+        return "HoleInformation{" +
+                "state=" + state +
+                ", timeDuration=" + timeDuration +
+                '}';
+    }
+}

app/src/main/java/com/sunzee/model/StateToilet.java

@@ -0,0 +1,9 @@
+package com.sunzee.model;
+
+public enum StateToilet {
+    GOTOBATHROOM,//上厕所
+    OUTTOILET,//出厕所
+    NOGOTOBATHROOM,//没上厕所
+    STILLONTOILET,//还在上厕所
+    NOSTATE//无状态
+}

app/src/main/java/com/sunzee/model/ToiletState.java

@@ -0,0 +1,27 @@
+package com.sunzee.model;
+
+public class ToiletState {
+    private StateToilet mStateToilet;
+    private long dataTime;
+
+    public ToiletState(StateToilet stateToilet, long dataTime) {
+        mStateToilet = stateToilet;
+        this.dataTime = dataTime;
+    }
+
+    public StateToilet getStateToilet() {
+        return mStateToilet;
+    }
+
+    public void setStateToilet(StateToilet stateToilet) {
+        mStateToilet = stateToilet;
+    }
+
+    public long getDataTime() {
+        return dataTime;
+    }
+
+    public void setDataTime(long dataTime) {
+        this.dataTime = dataTime;
+    }
+}

app/src/main/java/com/sunzee/mvp/advertising/AdvertisingPresenter.java

@@ -44,6 +44,7 @@ import okhttp3.RequestBody;
  */
 public class AdvertisingPresenter extends BasePresenter<AdvertisingView> {
 
+
     private static final String TAG = "AdvertisingPresenter";
 
 

app/src/main/java/com/sunzee/mvp/debug/DebugView.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
  */
 public interface DebugView extends BaseView {
     /**
-     * M300读取成功
+     * M300读取成功 
      */
     void getDataSuccess();
 

app/src/main/java/com/sunzee/service/MyIntentService.java

@@ -208,7 +208,7 @@ public class MyIntentService extends GTIntentService {
             String[] Alltime = times.split("\\,");
             //如果之前的数据和现在的数据，数量相同，或者之前的数据小于现在的数据，，那么不清除直接替换。
             //不可能为0。
-            if (Global.alarmNumber > Alltime.length) {
+            if (Alltime.length<Global.alarmNumber) {
                 for (int i = 0; i < Global.alarmNumber; i++) {
                     AlarmManagerUtil.cancelAlarm(BaseApplication.getContext(), AlarmManagerUtil.ALARM_ACTION, i);
                 }

app/src/main/java/com/sunzee/service/MyService.java

@@ -21,11 +21,7 @@ import android.view.WindowManager;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.hboxs.serialport.SerialPortManager;
-import com.hboxs.serialport.SerialPortSendQueue;
-import com.hboxs.serialport.frame.ReadCommandFrame;
 import com.hboxs.serialport.frame.ResponseFrame;
-import com.hboxs.serialport.frame.WriteCommandFrame;
 import com.hboxs.serialport.message.Message;
 import com.hboxs.serialport.util.AsciiUtils;
 import com.hboxs.serialport.util.ByteUtils;
@@ -35,7 +31,10 @@ import com.sunzee.R;
 import com.sunzee.base.BaseApplication;
 import com.sunzee.db.WarringBeanDao;
 import com.sunzee.model.Heartbeat;
+import com.sunzee.model.HoleInformation;
 import com.sunzee.model.HttpResult;
+import com.sunzee.model.StateToilet;
+import com.sunzee.model.ToiletState;
 import com.sunzee.model.domain.AddAlarmRecordBean;
 import com.sunzee.model.domain.ErrorBean;
 import com.sunzee.model.domain.GetAdBean;
@@ -73,15 +72,17 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.internal.operators.single.SingleJust;
 import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.RequestBody;
@@ -92,6 +93,10 @@ public class MyService extends Service {
     private boolean isRead = true;
     private boolean isRegularCleaning = false;
     private ThreadPoolAdvanceParameter mPoolAdvanceParameter = new ThreadPoolAdvanceParameter();
+    private final static int TOTAL_SUM = 6;
+    private static List<HoleInformation> sHoleInformationList = new CopyOnWriteArrayList<>();//存储X20的信息
+    private static List<Integer> sToiletList = new CopyOnWriteArrayList<>();//存储是否上过厕所 0表示上过，1表示没有。2表示没有状态。
+    private static LinkedList<String> sCleaningLocationList = new LinkedList<>();//存储要清洗的位置。
 
     @Nullable
     @Override
@@ -104,6 +109,10 @@ public class MyService extends Service {
         super.onCreate();
         Log.d(TAG, "MyServiceonCreate: ");
         EventBus.getDefault().register(this);
+        for (int i = 0; i < TOTAL_SUM; i++) {
+            sHoleInformationList.add(i, new HoleInformation(2, 0));//初始化
+            sToiletList.add(i, 1);//初始化，一开始都是没上过厕所的。
+        }
     }
 
     @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
@@ -777,8 +786,6 @@ public class MyService extends Service {
      * 保存广告id
      */
     private void getAdRuleId(String id) {
-
-
         Map<String, String> params = new HashMap<>();
         params.put("clientId", Heartbeat.deviceId);
 
@@ -901,36 +908,6 @@ public class MyService extends Service {
     }
     //------------------------------------------------------------------------广告 end---------------------------------
 
-    //-----------------------------------------------------------------------报警 start---------------------------------
-    private Timer timerM600;
-    private TimerTask taskM600;
-
-    /**
-     * 开始读取报警
-     */
-    private void startRead() {
-        SerialPortSendQueue.clear();
-        timerM600 = new Timer();
-        taskM600 = new TimerTask() {
-            @Override
-            public void run() {
-                SerialPortSendQueue.sendCommand(new ReadCommandFrame("M600", 8), 600, "M600");
-            }
-        };
-        timerM600.schedule(taskM600, 0, 1000);
-    }
-
-    /**
-     * 停止读取报警
-     */
-    private void stopRead() {
-        if (timerM600 != null) {
-            taskM600.cancel();
-            timerM600.cancel();
-            timerM600 = null;
-        }
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void event(Message messageEvent) {
         switch (messageEvent.getType()) {
@@ -996,6 +973,41 @@ public class MyService extends Service {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
+                    } else if (name.equals("X20")) {
+                        String results = HexadecimalUtil.hexStringToByte(AsciiUtils.asciiByteArray2HexStr(responseFrame.getData()));
+                        String s1 = HexadecimalUtil.flipString(results, 8).substring(0, TOTAL_SUM);//6个厕所蹲位
+                        char[] chars = s1.toCharArray();
+                        for (int i = 0; i < sHoleInformationList.size(); i++) {
+                            HoleInformation holeInformation = sHoleInformationList.get(i);
+                            //只有不相同的时候才会进行写入。所以这个时候我们是需要更新时间而已，上厕所或不上厕所
+                            if (holeInformation.getState()!=chars[i]) {
+                                //再写入数据
+                                holeInformation.setState(chars[i]);
+                                holeInformation.setTimeDuration(System.currentTimeMillis());
+                                ///sToiletList.get(i)
+                            }else{
+                                //这里我就想要判断是否需要进行写入清洗厕所。
+                                if (chars[i]==0) {
+
+                                } else if (chars[i] ==1) {
+                                    //需要判断之前是否上过厕所
+                                    if (sToiletList.get(i) == 0) {
+                                        //说明上过，那么需要判断是否为1超过30秒，这个如何判断呢？
+                                        //存储的状态肯定是0的，因为刚刚切换过来。所以这个判断应该在没有切换的时候进行。也就是这个就是清洗
+
+                                    }else{
+                                        //说明没闪过
+                                    }
+                                }
+                            }
+
+                        }
+                        /*List<String> allState = Arrays.asList(s1);
+                        for (int i = 0; i < allState.size(); i++) {
+                            Integer state = Integer.valueOf(allState.get(i));
+
+                        }*/
+
                     } else {
                         //通过校验
                         Log.d(TAG, "event: " + name);
@@ -1264,7 +1276,6 @@ public class MyService extends Service {
     }
 
     public void updateAdvanced(ArrayList<ParameterBean> parameterBeans) {
-
         String url = "/api/app_equipment/index/updateParam/1/" + Heartbeat.deviceId + ".htm";
         Gson gson = new Gson();
         String json = gson.toJson(parameterBeans);

app/src/main/java/com/sunzee/thread/myservice/MyserviceTask.java

@@ -10,6 +10,8 @@ import com.hboxs.serialport.frame.SetCommandFrame;
 import com.hboxs.serialport.frame.WriteCommandFrame;
 import com.hboxs.serialport.util.HexUtils;
 
+import static com.sunzee.thread.myservice.MyserviceThreadType.runX20;
+
 /**
  * 长时间或者推送要执行的任务
  */
@@ -102,11 +104,21 @@ public class MyserviceTask implements Runnable {
             case MyserviceThreadType.runD120:
                 runWriteD120();
                 break;
+            case runX20:
+                runX20();
+
+                break;
 
 
         }
     }
 
+    private void runX20() {
+        if (getIsRun()) {
+            SerialPortSendQueue.sendCommand(new ReadCommandFrame("X20", 8), 20, "X20");
+        }
+    }
+
     private void runWrite() {
         if (getIsRun()) {
             SerialPortManager.getInstance().sendCommandFrame(new WriteCommandFrame(address, data), address);

app/src/main/java/com/sunzee/thread/myservice/MyserviceThreadType.java

@@ -9,4 +9,5 @@ public interface MyserviceThreadType {
     int runSet = 1;
     int runWrite = 2;
     int runD120 = 120;
+    int runX20 = 20;
 }

app/src/main/java/com/sunzee/thread/myservice/ThreadPoolMyservice.java

@@ -1,5 +1,6 @@
 package com.sunzee.thread.myservice;
 
+import com.sunzee.service.MyService;
 import com.sunzee.thread.homepage.HomepageTask;
 import com.sunzee.thread.homepage.HomepageThreadType;
 
@@ -17,11 +18,11 @@ public class ThreadPoolMyservice {
     private ScheduledFuture<?>
             mScheduledFutureM600, mScheduledFutureM8, mScheduledFutureM17,
             mScheduledFutureSet, mScheduledFutureRst, mScheduledFutureWrite,
-            mScheduledFutureD120;
+            mScheduledFutureD120, mScheduledFutureX20;
     private MyserviceTask
             mTaskRunM600, MTaskRunM8, MTaskRunM17,
             mTaskRunMRst, mTaskRunMSet, mTaskRunWrite,
-            mTaskRunD120;
+            mTaskRunD120, mTaskRunnX20;
 
     public ThreadPoolMyservice() {
         scheduled = new ScheduledThreadPoolExecutor(6);
@@ -32,6 +33,9 @@ public class ThreadPoolMyservice {
     public void startALLRead() {
         mTaskRunM600 = new MyserviceTask(MyserviceThreadType.runM600);
         mScheduledFutureM600 = scheduled.scheduleAtFixedRate(mTaskRunM600, 0, 1000, TimeUnit.MILLISECONDS);
+
+        mTaskRunnX20 = new MyserviceTask(MyserviceThreadType.runX20);
+        mScheduledFutureX20 = scheduled.scheduleAtFixedRate(mTaskRunnX20, 0, 1000, TimeUnit.MILLISECONDS);
     }
 
     public void startSetM8() {
@@ -58,6 +62,9 @@ public class ThreadPoolMyservice {
         stopRead(mTaskRunD120, mScheduledFutureD120);
     }
 
+    public void stopReadX20() {
+        stopRead(mTaskRunnX20, mScheduledFutureX20);
+    }
 
     public void startSet(String address) {
         mTaskRunMSet = new MyserviceTask(MyserviceThreadType.runSet, address);
@@ -112,6 +119,8 @@ public class ThreadPoolMyservice {
         stopSetM8();
         stopSetM17();
         stopWriteD120();
+        stopReadX20();
     }
 
+
 }

app/src/main/res/layout/fragment_debug.xml

@@ -8,7 +8,7 @@
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rv_degbuglist"
-        android:layout_width="@dimen/dp_70"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/dp_20" />
 

app/src/main/res/layout/item_debugparameter.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_60"
+    android:layout_width="@dimen/dp_70"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/dp_10"
     android:gravity="center">
@@ -15,5 +15,7 @@
         android:checked="false"
         android:gravity="center"
         android:textColor="@drawable/selector_manual_tv_color"
-        android:textSize="@dimen/sp_6" />
+        android:textSize="@dimen/sp_6"
+        
+        android:layout_marginRight="@dimen/dp_10"/>
 </LinearLayout>

app/src/main/res/values/strings.xml

@@ -74,25 +74,6 @@
     <string name="lutou">炉头温度</string>
     <string name="zhuansu">炉头转速</string>
 
-    <string name="fancy_1">玫瑰精灵</string>
-    <string name="fancy_2">童心未泯</string>
-    <string name="fancy_3">五彩缤纷</string>
-    <string name="fancy_4">天雪恋舞</string>
-    <string name="fancy_5">水中芙蓉</string>
-    <string name="fancy_6">烈焰红唇</string>
-    <string name="fancy_7">美梦成真</string>
-    <string name="fancy_8">一见钟情</string>
-    <string name="fancy_9">幽兰爱恋</string>
-    <string name="fancy_10">心之守护</string>
-    <string name="fancy_11">夏日爱恋</string>
-    <string name="fancy_12">冰美人</string>
-    <string name="fancy_13">国色天香</string>
-    <string name="fancy_14">赤子之心</string>
-    <string name="fancy_15">海洋之心</string>
-    <string name="fancy_16">水晶之恋</string>
-    <string name="fancy_17">彩色精灵</string>
-    <string name="fancy_18">小棉袄</string>
-
     <string name="pay_choose">选择支付方式</string>
     <string name="welcome">欢迎！</string>
 
@@ -179,14 +160,7 @@
     <string name="parameter_14">加湿器回差调节</string>
     <string name="parameter_15">炉头N秒后进入待机</string>
     <string name="parameter_16">炉头进入待机温度</string>
-    <string name="parameter_17">下糖粗细系数</string>
     <string name="parameter_18">循环风机启动温度</string>
-    <string name="parameter_19">白糖剩余百分比参数</string>
-    <string name="parameter_20">红糖剩余百分比参数</string>
-    <string name="parameter_21">黄糖剩余百分比参数</string>
-    <string name="parameter_22">蓝糖剩余百分比参数</string>
-    <string name="parameter_23">清水剩余百分比参数</string>
-    <string name="parameter_24">废水满百分比参数</string>
     <string name="parameter_25">关机炉头清洗次数</string>
     <string name="parameter_26">低温环境设定（炉头升柜温）</string>
     <string name="parameter_27">高温环境设定（外循环风机）</string>
@@ -198,18 +172,11 @@
     <string name="parameter_33">基准湿度</string>
     <string name="parameter_34">柜内允许做糖温度误差</string>
     <string name="parameter_35">柜内允许做糖湿度误差</string>
-
+    <string name="second">秒</string>
     <string name="chinese">中文</string>
     <string name="english">English</string>
     <string name="reset">确定修改</string>
 
-    <string name="pay_no">无需支付</string>
-    <string name="pay_online">线上支付</string>
-    <string name="pay_offline">硬币支付</string>
-    <string name="pay_offline_2">纸币支付</string>
-    <string name="pay_offline_3">混合支付</string>
-    <string name="pay_onoff">线上/线下支付</string>
-
     <string name="error_door_hand">手动门异常</string>
     <string name="error_door_auto">自动门异常</string>
     <string name="error_humidifier">加湿器异常</string>
@@ -306,13 +273,8 @@
     <string name="state">状态</string>
     <string name="undefined">未定义</string>
 
-    <string name="x_pay">投币/支付</string>
     <string name="x_check_lose_step">丢步检测</string>
     <string name="x_check_stove_turn">炉头转动检测</string>
-    <string name="x_water_lack">缺清水</string>
-    <string name="x_check_stick_lack">缺棍检测</string>
-    <string name="x_check_stick_out">出棍检测</string>
-    <string name="x_stick_right">插棍到位</string>
     <string name="x_x">X轴限位检测</string>
     <string name="x_y">Y轴限位检测</string>
     <string name="x_z">Z轴限位检测</string>
@@ -320,7 +282,6 @@
     <string name="x_signal">市电信号检测</string>
     <!--<string name="x_door_auto">自动门</string>-->
     <!--<string name="x_door_hand"> 手动门</string> -->
-    <string name="x_door_auto">关门检测</string>
     <string name="x_door_hand">手动门</string>
 
     <string name="y_pul_x">X轴PUL</string>
@@ -331,16 +292,7 @@
     <string name="y_dir_y">Y轴DIR</string>
     <string name="y_dir_z">Z轴DIR</string>
     <string name="y_dir_e">E轴DIR</string>
-    <!--<string name="y_auto_door">自动门（门1）"</string>-->
-    <!--<string name="y_hand_door">手动门（门2）</string>-->
-    <string name="y_auto_door"></string>
-    <string name="y_hand_door">取糖门</string>
-    <string name="y_blanking_white">下料1电机-白</string>
-    <string name="y_blanking_red">下料2电机-红</string>
-    <string name="y_blanking_yellow">下料3电机-黄</string>
-    <string name="y_blanking_blue">下料4电机-蓝</string>
     <string name="y_air_pump">气泵</string>
-    <string name="y_stick_em">搅棍电机</string>
     <string name="y_water_pump">水泵</string>
     <string name="y_heating_mg">电磁加热</string>
     <string name="y_fan_exhaust">排气风扇</string>
@@ -349,36 +301,12 @@
     <string name="y_humidifier">加湿器</string>
     <string name="y_fan_dissipate_heat">线圈散热风机</string>
 
-    <!--<string name="door_1">自动门开</string>-->
-    <string name="door_1">取糖门开</string>
     <string name="door_2"></string>
-    <!--<string name="door_2">手动门开</string>-->
-    <string name="blanking_white">下料-白</string>
-    <string name="blanking_red">下料-红</string>
-    <string name="blanking_yellow">下料-黄</string>
-    <string name="blanking_blue">下料-蓝</string>
     <string name="air_pump_start">气泵启动</string>
     <string name="clear">清洗</string>
-    <string name="stick_rod">出棍电杆</string>
-    <string name="stick_em">搅拌电机</string>
-    <!--<string name="stick_rod"></string>-->
-    <!--<string name="stick_em"></string>-->
-    <string name="humidification">柜内加湿</string>
-    <string name="heating">柜内加热</string>
-    <string name="heating_start">炉头加热并启动</string>
-    <string name="stove_higher">炉头转动高速</string>
-    <string name="stove_middle">炉头转动中速</string>
-    <string name="stove_lower">炉头转动低速</string>
     <string name="stove_fan">线圈散热风机</string>
     <string name="fan_exhaust">排气风机</string>
 
-    <string name="sugar_white">白糖</string>
-    <string name="sugar_red">红糖</string>
-    <string name="sugar_yellow">黄糖</string>
-    <string name="sugar_blue">蓝糖</string>
-    <string name="stick">棍</string>
-    <string name="water_clean">清水</string>
-    <string name="water_dirty">废水</string>
     <string name="add">添加</string>
     <string name="clean">清除</string>
     <string name="clean_already">已清除</string>
@@ -405,24 +333,6 @@
     <string name="error_thing">错误事件</string>
     <string name="remark">备注</string>
 
-    <string name="scan_now">立即扫码，完成支付</string>
-    <string name="please">请在限定时间内投币完毕，否则100秒后自动清零</string>
-    <string name="second">秒</string>
-    <string name="mei">枚</string>
-    <string name="coin_now">立即投币（请勿插入纸币）</string>
-    <string name="paper_now">插入纸币（请勿投入硬币）</string>
-    <string name="mix_now">立即投币/插入纸币</string>
-    <string name="paper_over_tip"> 当次投币金额已超过剩余金额，本机不提供找零，是否继续？</string>
-    <string name="cha">还差</string>
-    <string name="shengyu">剩余</string>
-    <string name="pay_success">支付成功</string>
-    <string name="guanbi">后关闭</string>
-    <string name="get_sugar1">请在机器正面的左边正中间拉门取走棉花糖</string>
-    <string name="get_sugar2">，否则机器人将自动回收并等候下一次制作哦！</string>
-    <string name="pay_again">再次购买</string>
-    <string name="fuhao">￥</string>
-    <string name="sure">确定选择该棉花糖吗？</string>
-
     <string name="img">图片</string>
     <string name="video">视频</string>
     <string name="type">类型</string>
@@ -488,13 +398,8 @@
     <string name="ioy25">蹲位6 工作灯</string>
 
 
-
     <string name="describe">描述</string>
-    <string name="make_failed">制作失败，请联系客服人员电话：</string>
-    <string name="make_success">制作完成</string>
-    <string name="making">制作中</string>
 
-    <string name="no_price_local">本地没有价格数据，请填入数据更新</string>
     <string name="update_price_success">调价成功</string>
     <string name="update_price_failed">调价失败</string>
     <string name="heart_success">心跳成功</string>
@@ -542,8 +447,6 @@
     <string name="no_data_time">本时间段暂无数据，请重新选择时间</string>
     <string name="no_select_time">选择的时间不能为空</string>
     <string name="select_right_time">请选择正确的时间</string>
-    <string name="insert_stick">请按照以上动图进行插棍，并且关好门，才可以制作棉花糖</string>
-    <string name="sugar_desc">花式多样，软软甜甜，入口即化，回味无穷</string>
 
     <string name="qdsy">确定使用</string>
     <string name="qxsy">取消使用</string>
@@ -558,11 +461,8 @@
     <string name="download_now">正在下载中...</string>
 
 
-    <string name="coin_warring">因限定时间内没有投完所有币，系统自动清零</string>
     <string name="coin_warring1">如有疑问，请联系客服人员电话</string>
     <string name="open_operate">请开机后再操作</string>
-    <string name="coin_enough">请确保有足够的硬币/代币，</string>
-    <string name="coin_enough1">本机器不设退币功能</string>
     <string name="coin_success">投币成功</string>
     <string name="choose_time">请输入时间</string>
 
@@ -575,23 +475,17 @@
     <string name="ringht_day_input">请输入正确的天数</string>
     <string name="ringht_hour_input">请输入正确的小时</string>
 
-    <string name="make_fialed">制作失败，款项原路退回</string>
     <string name="ljlj">立即连接</string>
     <string name="unsav_wifi">是否取消保存该WiFi的密码</string>
     <string name="unsav_wifi1">取消保存</string>
     <!--制作失败，请联系客服人员电话： -->
 
 
-    <string name="make_fielad1">制作失败</string>
-    <string name="stick_error">棍子没有插好，请打开门重新插棍</string>
     <string name="current_time1">当前时间:</string>
     <string name="equipment_no">设备编号:</string>
-    <string name="dont_coin1">请勿投币，本机仅限扫码支付</string>
 
     <string name="coin_pay">投币支付</string>
 
-    <string name="order_coin_sta">数据统计/投币订单统计</string>
-    <string name="order_no_pay">数据统计/无需支付订单统计</string>
     <string name="order_online_sta">数据统计/线上订单查询</string>
     <string name="order_underline_sta">数据统计/线下订单查询</string>
     <string name="synchroniz_fail">广告下载失败，请检查后台广告数据是否有误</string>
@@ -655,15 +549,6 @@
     <string name="reset_system">是否要重启系统？</string>
     <string name="show">显示花型</string>
     <string name="not_null">输入数据不能为空</string>
-    <string name="open_warring">报警处理后，请到后台点击开机（请先拔掉机械手的棍子）</string>
-    <string name="pay_xinyongka">信用卡支付</string>
-    <string name="slot_card_now">刷卡支付</string>
-    <string name="credit_card_payment">立即刷卡，完成支付</string>
-    <string name="credit_card_payment_statistics">信用卡支付统计</string>
-    <string name="order_credit_card">数据统计/信用卡支付统计</string>
-    <string name="total_statistics">线下总统计</string>
-    <string name="offline_statistics">数据统计/线下总统计</string>
-    <string name="xingyongkazhibi">信用卡/纸币支付</string>
     <string name="advance_parameter_1">X轴回零速度</string>
     <string name="advance_parameter_2">X轴爬行速度</string>
     <string name="advance_parameter_3">Y轴回零速度</string>
@@ -682,44 +567,20 @@
     <string name="advance_parameter_16">X轴零点补偿</string>
     <string name="advance_parameter_17">Y轴零点补偿</string>
     <string name="advance_parameter_18">Z轴零点补偿</string>
-    <string name="advance_parameter_19">取糖位置X设置</string>
-    <string name="advance_parameter_20">取糖位置Y设置</string>
-    <string name="advance_parameter_21">取糖位置Z设置</string>
-    <string name="advance_parameter_22">取棍位置X设置</string>
-    <string name="advance_parameter_23">取棍位置Y设置</string>
-    <string name="advance_parameter_24">取棍位置Z设置</string>
     <string name="advance_parameter_25">水箱加水</string>
     <string name="advance_parameter_26">币数的倍率</string>
     <string name="edit_no_null">输入框不能为空</string>
     <string name="pro_motioncode">线上/优惠码支付</string>
     <string name="role">权限管理</string>
-    <string name="burner_condition_yes">炉头温度达到！</string>
-    <string name="burner_condition_no">炉头升温中!</string>
-    <string name="dimension_condition_yes">柜内温度达到！</string>
-    <string name="dimension_condition_no">柜内温度上升中！</string>
-    <string name="humidity_condition_yes">柜内湿度达到！</string>
-    <string name="humidity_condition_no">加湿中！</string>
-    <string name="x_stick_motor">缺棍传感器</string>
-    <string name="x_stick_detection">插棍检测</string>
-    <string name="x_closed_in_place">手动门关到位</string>
     <string name="y_stick_motor">出棍电机</string>
     <string name="y_humidifier_water_pump">加湿器水泵</string>
-    <string name="not_open_door">不开门的情况下，请点击开门！</string>
     <string name="service_contact">服务联系人：</string>
     <string name="service_line">服务投诉热线：</string>
-    <string name="unfinished_stop">上次做糖未完成，还在清洗中，请稍等一下！</string>
     <string name="y_dir_x">X轴DIR</string>
     <string name="humidifier_water_leve_detection">加湿器水位检测</string>
     <string name="signal_strength">你好，当前机器信号弱，不支持买棉花糖！谢谢！</string>
-    <string name="change">找零硬币的余额</string>
-    <string name="iscontinue">找零%1$d，由于系统无%2$d币值，找零%3$d，是否超额继续！</string>
-    <string name="open_door_error">客户们开门失败</string>
     <string name="no_continuous_oepn_close_chance">请在%1$d秒后开关机！</string>
     <string name="mdbxinyongka">MDB信用卡</string>
-    <string name="mdb_credit_card_content1">1.在刷卡机上输入密码，然后在刷卡机上单击绿色的\" ENTER \"按钮以完成付款。</string>
-    <string name="mdb_credit_card_content2">2.付款完成后，您需要从读卡器中取出卡以完成此操作。</string>
-    <string name="mdb_credit_card_content3">3.如果要取消此操作，请在信用卡机上单击红色的\" CANCEL\"按钮。</string>
-    <string name="card_tips">插入信用卡，如果已经插入，则直接在屏幕上单击\"确定\"！</string>
     <string name="coin_pulse">币数脉冲除以x值</string>
     <string name="oldpas">原始密码不正确</string>
     <string name="all_clean">全部蹲位清洁</string>
@@ -731,5 +592,11 @@
     <string name="debug_6">清洗洁厕灵+水</string>
     <string name="debug_7">消毒消毒液+水</string>
     <string name="start_cleaning_content">是否开始清洗？</string>
+    <string name="hole_lamp1">蹲位1工作灯</string>
+    <string name="hole_lamp2">蹲位2工作灯</string>
+    <string name="hole_lamp3">蹲位3工作灯</string>
+    <string name="hole_lamp4">蹲位4工作灯</string>
+    <string name="hole_lamp5">蹲位5工作灯</string>
+    <string name="hole_lamp6">蹲位6工作灯</string>
 
 </resources>