1.优化厕所状态界面布局，添加联系电话，公司。

2.隐藏键盘的优化
3.单点清洗功能的优化

app/build.gradle

@@ -16,7 +16,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0.6"
+        versionName "1.0.7"
         manifestPlaceholders = [
                 //个推应用参数，请填写您申请的 GETUI_APP_ID，GETUI_APP_KEY，GETUI_APP_SECRET 值
                 GETUI_APP_ID    : "n4vsaIAi0eAbAkfBfqsUL7",

app/src/main/java/com/sunzee/model/domain/Name.java

@@ -56,7 +56,7 @@ public interface Name {
     /**
      * 厕所个数
      */
-    String TOILETSNUMBER= "toiletsnumber";
+    String TOILETSNUMBER = "toiletsnumber";
 
 
     /**
@@ -67,14 +67,23 @@ public interface Name {
     /**
      * 需要监听的人体传感器
      */
-    String ISSELECTPEOPLECHECKBOX ="isselectpeoplecheckbox";
+    String ISSELECTPEOPLECHECKBOX = "isselectpeoplecheckbox";
+
     //厕所次数
     String CLEANCOUNT = "cleancount";
+
     //上次清洗的厕所
     String LASTTIME = "lasttime";
+
     //下次清洗的厕所
     String NEXTTIME = "nexttime";
 
     //单点清洗
     String SINGLEPOINTCLEANING = "singlepointcleaning";
+
+    //公司名称
+    String COMPANY = "company";
+
+    //联系人
+    String WAYCONTACTS = "waycontacts";
 }

app/src/main/java/com/sunzee/ui/activity/HomeActivity.java

@@ -23,6 +23,7 @@ import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -83,6 +84,7 @@ public class HomeActivity extends MvpActivity<HomePresenter> implements HomeView
     private PreventSpeedClickUtil mPreventSpeedClickUtil;
     private TextView mTvVersion1;
     public static boolean isStartingUp = false;
+    private FrameLayout flHomeContent;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -109,6 +111,7 @@ public class HomeActivity extends MvpActivity<HomePresenter> implements HomeView
         mFragmentManager = getSupportFragmentManager();
         mTvConnectionSystem = findViewById(R.id.connection_system);
         mTvSystemId = findViewById(R.id.tv_system_id);
+        flHomeContent = findViewById(R.id.fl_home_content);
         String managerId = (String) SharedPreferencesUtils.getParam(Name.SYSTEM_ID, "");
         if (managerId != null && !TextUtils.isEmpty(managerId)) {
             cheeckConnectState(false);
@@ -156,10 +159,16 @@ public class HomeActivity extends MvpActivity<HomePresenter> implements HomeView
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 Log.d(TAG, "onClick: ");
+                hidekeyboard(v);
+                return false;
+            }
+        });
+        flHomeContent.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                Log.d(TAG, "onClick: ");
                 //隐藏键盘
-                @SuppressLint("WrongConstant") InputMethodManager imm = (InputMethodManager)
-                        mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+                hidekeyboard(v);
                 return false;
             }
         });
@@ -177,6 +186,13 @@ public class HomeActivity extends MvpActivity<HomePresenter> implements HomeView
         });
     }
 
+    private void hidekeyboard(View v) {
+        //隐藏键盘
+        @SuppressLint("WrongConstant") InputMethodManager imm = (InputMethodManager)
+                mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
     @Override
     public void onClick(View v) {
@@ -472,7 +488,7 @@ public class HomeActivity extends MvpActivity<HomePresenter> implements HomeView
                         isStartingUp = true;
                         stopTimerSet();
                         startTimerSet("M3");
-                        HomepageFragment.lastTimeClean = 1;
+                        HomepageFragment.lastTimeClean = -1;
                         //todo 清空数据
                         synchronized (MyService.sCleaningLocationList) {//多线程操作需要加上同步锁
                             MyService.sHoleInformationList.clear();

app/src/main/java/com/sunzee/ui/activity/HomePageAActivity.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.hboxs.serialport.frame.ResponseFrame;
 import com.hboxs.serialport.message.Message;
 import com.hboxs.serialport.util.AsciiUtils;
+import com.orhanobut.hawk.Hawk;
 import com.sunzee.R;
 import com.sunzee.base.MvpActivity;
 import com.sunzee.model.Global;
@@ -24,6 +25,7 @@ import com.sunzee.model.Heartbeat;
 import com.sunzee.model.HoleInformation;
 import com.sunzee.model.domain.CleaningBean;
 import com.sunzee.model.domain.HeartbeatBean;
+import com.sunzee.model.domain.Name;
 import com.sunzee.model.domain.ParameterBean;
 import com.sunzee.mvp.homeactivity.HomePageAPresenter;
 import com.sunzee.mvp.homeactivity.HomePageAView;
@@ -78,6 +80,8 @@ public class HomePageAActivity extends MvpActivity<HomePageAPresenter> implement
     private CleaningBean yesterdayBean;
     private TextView tvYesterday;
     private List<String> useLastToiletsStatus;//上一次厕所的使用状态
+    private TextView tvCompany;
+    private TextView tvContacts;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -125,6 +129,8 @@ public class HomePageAActivity extends MvpActivity<HomePageAPresenter> implement
         tvAmmonia = findViewById(R.id.tv_ammonia);
         tvHumidity = findViewById(R.id.tv_humidity);
         tvTemperature = findViewById(R.id.tv_temperature);
+        tvCompany = findViewById(R.id.tv_company);
+        tvContacts = findViewById(R.id.tv_contacts);
         //设备编号只显示6位
         mTvEquipmentNo = findViewById(R.id.tv_equipment_no1);
         if (Heartbeat.deviceId != null && Heartbeat.deviceId.length() > 7) {
@@ -144,6 +150,8 @@ public class HomePageAActivity extends MvpActivity<HomePageAPresenter> implement
         threadPoolHomepageA.stopAll();
         threadPoolHomepageA.startAll();
         mvpPresenter.createBox(MyService.TOTAL_SUM);
+        tvCompany.setText("公司："+Hawk.get(Name.COMPANY,""));
+        tvContacts.setText("联系人："+Hawk.get(Name.WAYCONTACTS,""));
     }
 
 

app/src/main/java/com/sunzee/ui/fragment/HomepageFragment.java

@@ -50,7 +50,7 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
     private PreventSpeedClickUtil mPreventSpeedClickUtil;
     private ThreadPoolHomepage mThreadPoolHomepage = new ThreadPoolHomepage();
     private int cleaningLocation = 1;
-    public static int lastTimeClean = -1;//记录上次清洗的是不是三号厕所
+    public static int lastTimeClean = -1;//记录上次清洗
 
     @Nullable
     @Override
@@ -202,7 +202,8 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
                         if (!mPreventSpeedClickUtil.isFastClick500()) {
                             return;
                         }
-                        String nextTime = Hawk.get(Name.LASTTIME, "123");
+                        String nextTime = Hawk.get(Name.LASTTIME, "123");//如果上次是123号厕所，下次要清洗456，那么就需要复位。
+
                         Log.d(TAG, "cleaningLocation onClickListener: "+cleaningLocation);
                         Log.d(TAG, "nextTime onClickListener: "+nextTime);
                         Log.d(TAG, "lastTimeClean onClickListener: "+lastTimeClean);
@@ -213,14 +214,18 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
                                 ToastUtil.showToast("清洗完该号厕所需要再一次开机复位才能清洗其他厕所。");
                             }*/
                            //如果不等于这些，说明是45号厕所，那么就需要复位才能清洗。
-                            if (lastTimeClean!=-1) {
-                                if (lastTimeClean!=Integer.valueOf(nextTimeSplit[i])){
+                            if (lastTimeClean==-1) {//如果是-1，说明是第一次，说明是开机的时候。我们就直接过。
+                                isNextTime = true;
+                            }else  if (lastTimeClean!=-1) {//如果不是-1，说明123，或者456.
+                                isNextTime = getLastNextCleanTitole(cleaningLocation);
+                               /*                             //如果是上一次清洗的是123，下次要清洗的是456，那么我们不需要复位，并且如果
+                                if (lastTimeClean==Integer.valueOf(nextTimeSplit[i]) ){//如果存在，那么说明不是456
+                                    Log.d(TAG, "111onClickListener: "+Integer.valueOf(nextTimeSplit[i]));
                                     isNextTime=true;
-                                    break;
-                                }
+                                }*/
                             }
                         }
-                        if (!isNextTime) {
+                        if (isNextTime) {
                             //判断是否过期，或者是否次数以到。
                             showLoading();
                             Log.d(TAG, "onClickListener: " + cleaningLocation);
@@ -241,8 +246,32 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
             }
         });
         mStartCleaningDialog.setBtnText(R.string.start_cleaning, R.string.start_cleaning_content, R.string.confirm, R.string.cancel);
-        mStartCleaningDialog.show();
+            mStartCleaningDialog.show();
+    }
 
+    private boolean getLastNextCleanTitole(Integer first) {
+        String lastTime = Hawk.get(Name.LASTTIME, "123");
+        String nextTime = Hawk.get(Name.NEXTTIME, "456");
+        String[] lastTimeSplit = lastTime.split("");
+        String[] nextTimeSplit = nextTime.split("");
+        boolean isLastTime = false;
+        boolean isNextTime = false;
+        for (int i = 1; i < lastTimeSplit.length; i++) {
+            if (lastTimeClean==Integer.valueOf(lastTimeSplit[i])){
+                isLastTime=true;
+                break;
+            }
+        }
+        for (int i = 1; i < nextTimeSplit.length; i++) {
+            if (first==Integer.valueOf(nextTimeSplit[i])){
+                isNextTime=true;
+                break;
+            }
+        }
+        if (isLastTime && isNextTime) {
+            return false;
+        }
+        return true;
     }
 
 
@@ -272,7 +301,7 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
                 MyService.sCleaningLocationList.clear();
                 MyService.sCleaningLocationList.addFirst(integer);
                 MyService.sCleaningLocationList.addLast(needCleaning);
-                ToastUtil.showToast("已添加入清洗队列，等待本次清洗完成后开始清洗");
+                ToastUtil.showToast("还有等待清洗的厕所，已添加入清洗队列，等待本次清洗完成后开始清洗");
             }else{
                 MyService.sCleaningLocationList.addLast(needCleaning);
                 if (!MyService.isCleanOK) {
@@ -280,12 +309,21 @@ public class HomepageFragment extends MvpFragment<HomePagePresenter> implements
 
                     ToastUtil.showToast("准备开始清洗，如果有人在里面使用，会等待人出来以后进行清洗。");
                 }else{
-                    ToastUtil.showToast("已添加入清洗队列，等待本次清洗完成后开始清洗");
+                    ToastUtil.showToast("清洗中，已添加入清洗队列，等待本次清洗完成后开始清洗");
                 }
             }
 
         }
     }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mStartCleaningDialog != null) {
+            mStartCleaningDialog.dismiss();
+            mStartCleaningDialog= null;
+        }
+    }
 }
 
 

app/src/main/java/com/sunzee/ui/fragment/OtherFragment.java

@@ -46,6 +46,8 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.CharArrayWriter;
+
 /**
  * 其他页界面 fragment
  * 1.4G和wifi的切换的功能
@@ -82,6 +84,9 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
     private EditText etRestorationcontract;
     private EditText etRestorationwayContacts;
     private Button btRrestorationcontractUpdate;
+    private Button btnContractUpdate;
+    private EditText etWayContacts;
+    private EditText etContract;
 
     @Nullable
     @Override
@@ -117,6 +122,7 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
         btnSquattingContentUdate.setOnClickListener(this);
         btnCheckUpdate.setOnClickListener(this);
         btRrestorationcontractUpdate.setOnClickListener(this);
+        btnContractUpdate.setOnClickListener(this);
     }
 
     private void initView(View inflate) {
@@ -129,56 +135,61 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
         btnSquattingContentUdate = inflate.findViewById(R.id.btn_squatting_content_udate);
         etPlcContent = inflate.findViewById(R.id.et_plc_content);
         etSquattingContent = inflate.findViewById(R.id.et_squatting_content);
-        etPlcContent.setText(Hawk.get(Name.SERIALNUMBER, "4"));
-        etSquattingContent.setText(Hawk.get(Name.TOILETSNUMBER,2)+"");
-        llCheckBox = inflate.findViewById(R.id.ll_toiletcheckBox);
-        btnPCheckUpdate = inflate.findViewById(R.id.btn_pcheckupdate);
-        llPeopleCheckBox = inflate.findViewById(R.id.ll_peoplecheckBox);
-        appCompatCheckBoxes = new AppCompatCheckBox[MyService.TOTAL_SUM];
-        appCompatPeopleCheckBoxes = new AppCompatCheckBox[MyService.TOTAL_SUM];
         etCleanCountContent = inflate.findViewById(R.id.et_cleancount_content);
-        etCleanCountContent.setText(Hawk.get(Name.CLEANCOUNT,10)+"");
         btnCleanCount = inflate.findViewById(R.id.btn_cleancount);
         etRestorationcontract = inflate.findViewById(R.id.et_restorationway_contacts);
         etRestorationwayContacts = inflate.findViewById(R.id.et_restorationcontract);
         btRrestorationcontractUpdate = inflate.findViewById(R.id.btn_restorationcontract_update);
-        etRestorationcontract.setText(Hawk.get(Name.NEXTTIME,"456"));
-        etRestorationwayContacts.setText(Hawk.get(Name.LASTTIME,"123"));
+        llCheckBox = inflate.findViewById(R.id.ll_toiletcheckBox);
+        btnPCheckUpdate = inflate.findViewById(R.id.btn_pcheckupdate);
+        llPeopleCheckBox = inflate.findViewById(R.id.ll_peoplecheckBox);
+        btnContractUpdate = inflate.findViewById(R.id.btn_contract_update);
+        etWayContacts = inflate.findViewById(R.id.et_way_contacts);
+        etContract = inflate.findViewById(R.id.et_contract);
 
+
+        appCompatCheckBoxes = new AppCompatCheckBox[MyService.TOTAL_SUM];
+        appCompatPeopleCheckBoxes = new AppCompatCheckBox[MyService.TOTAL_SUM];
+        etPlcContent.setText(Hawk.get(Name.SERIALNUMBER, "4"));
+        etSquattingContent.setText(Hawk.get(Name.TOILETSNUMBER, 2) + "");
+        etCleanCountContent.setText(Hawk.get(Name.CLEANCOUNT, 10) + "");
+        etRestorationcontract.setText(Hawk.get(Name.NEXTTIME, "456"));
+        etRestorationwayContacts.setText(Hawk.get(Name.LASTTIME, "123"));
         //如果没有监听，那么我们默认赋值为true
-        isSelectCheckBox = Hawk.get(Name.ISSELECTCHECKBOX,null);
-        isSelectPeopleCheckbox = Hawk.get(Name.ISSELECTPEOPLECHECKBOX,null);
-        if (isSelectPeopleCheckbox==null) {//如果之前没有存储，那么我们重新创建，并初始化值。
+        isSelectCheckBox = Hawk.get(Name.ISSELECTCHECKBOX, null);
+        isSelectPeopleCheckbox = Hawk.get(Name.ISSELECTPEOPLECHECKBOX, null);
+        etContract.setText(Hawk.get(Name.COMPANY,""));
+        etWayContacts.setText(Hawk.get(Name.WAYCONTACTS,""));
+        if (isSelectPeopleCheckbox == null) {//如果之前没有存储，那么我们重新创建，并初始化值。
             isSelectPeopleCheckbox = initTotileCheckBox();
-        }else{
-            if (isSelectPeopleCheckbox.length!= MyService.TOTAL_SUM) {
-                isSelectPeopleCheckbox =  initTotileCheckBox();
+        } else {
+            if (isSelectPeopleCheckbox.length != MyService.TOTAL_SUM) {
+                isSelectPeopleCheckbox = initTotileCheckBox();
             }
         }
         for (int i = 0; i < MyService.TOTAL_SUM; i++) {
             //生成一个厕所状态checkbox按钮
-            AppCompatCheckBox aCheckBox = getAppCompatCheckBox(i,isSelectPeopleCheckbox[i]);
+            AppCompatCheckBox aCheckBox = getAppCompatCheckBox(i, isSelectPeopleCheckbox[i]);
             //生成一个人体感应的checkbox按钮
 
-            appCompatPeopleCheckBoxes[i]=aCheckBox;
+            appCompatPeopleCheckBoxes[i] = aCheckBox;
             llPeopleCheckBox.addView(aCheckBox);
         }
 
 
-
-        if (isSelectCheckBox==null) {//如果之前没有存储，那么我们重新创建，并初始化值。
+        if (isSelectCheckBox == null) {//如果之前没有存储，那么我们重新创建，并初始化值。
             isSelectCheckBox = initTotileCheckBox();
-        }else{
-            if (isSelectCheckBox.length!= MyService.TOTAL_SUM) {
+        } else {
+            if (isSelectCheckBox.length != MyService.TOTAL_SUM) {
                 isSelectCheckBox = initTotileCheckBox();
             }
         }
         for (int i = 0; i < MyService.TOTAL_SUM; i++) {
             //生成一个厕所状态checkbox按钮
-            AppCompatCheckBox aCheckBox = getAppCompatCheckBox(i,isSelectCheckBox[i]);
+            AppCompatCheckBox aCheckBox = getAppCompatCheckBox(i, isSelectCheckBox[i]);
             //生成一个人体感应的checkbox按钮
 
-            appCompatCheckBoxes[i]=aCheckBox;
+            appCompatCheckBoxes[i] = aCheckBox;
             llCheckBox.addView(aCheckBox);
         }
 
@@ -186,9 +197,9 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
 
     }
 
-    private AppCompatCheckBox getAppCompatCheckBox(int i,boolean isSelectCheckBox) {
-        AppCompatCheckBox aCheckBox =new AppCompatCheckBox(getContext());
-        aCheckBox.setText(i+1+"号");
+    private AppCompatCheckBox getAppCompatCheckBox(int i, boolean isSelectCheckBox) {
+        AppCompatCheckBox aCheckBox = new AppCompatCheckBox(getContext());
+        aCheckBox.setText(i + 1 + "号");
         aCheckBox.setChecked(isSelectCheckBox);
         aCheckBox.setTextColor(UiUtil.getColorRes(R.color.logo_blue));
         aCheckBox.setTextSize(UiUtil.getDimensionRes(R.dimen.sp_8));//不能直接写R.dimen.sp_7，否则直接获取60000多，而不是7sp
@@ -423,7 +434,7 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
                     ToastUtil.showToast("请输入串口号");
                     break;
                 }
-                Hawk.put(Name.SERIALNUMBER,plcContent);
+                Hawk.put(Name.SERIALNUMBER, plcContent);
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success));
                 break;
             case R.id.btn_squatting_content_udate:
@@ -433,29 +444,29 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
                     break;
                 }
                 MyService.TOTAL_SUM = Integer.valueOf(squattingContent);
-                Hawk.put(Name.TOILETSNUMBER,Integer.valueOf(squattingContent));
-                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success)+"，重启触摸屏后生效");
+                Hawk.put(Name.TOILETSNUMBER, Integer.valueOf(squattingContent));
+                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success) + "，重启触摸屏后生效");
                 break;
             case R.id.btn_tcheckupdate:
                 for (int i = 0; i < appCompatCheckBoxes.length; i++) {
                     //我们需要将状态存储起来，进来的时候需要读取，清洗的时候需要读取。
-                    isSelectCheckBox[i]= appCompatCheckBoxes[i].isChecked();
+                    isSelectCheckBox[i] = appCompatCheckBoxes[i].isChecked();
                 }
-                Hawk.put(Name.ISSELECTCHECKBOX,isSelectCheckBox);
-                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success)+"，重启触摸屏后生效");
+                Hawk.put(Name.ISSELECTCHECKBOX, isSelectCheckBox);
+                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success) + "，重启触摸屏后生效");
                 break;
             case R.id.btn_pcheckupdate:
                 for (int i = 0; i < appCompatPeopleCheckBoxes.length; i++) {
                     //我们需要将状态存储起来，进来的时候需要读取，清洗的时候需要读取。
-                 isSelectPeopleCheckbox[i] = appCompatPeopleCheckBoxes[i].isChecked();
+                    isSelectPeopleCheckbox[i] = appCompatPeopleCheckBoxes[i].isChecked();
                 }
-                Hawk.put(Name.ISSELECTPEOPLECHECKBOX,isSelectPeopleCheckbox);
-                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success)+"，重启触摸屏后生效");
+                Hawk.put(Name.ISSELECTPEOPLECHECKBOX, isSelectPeopleCheckbox);
+                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success) + "，重启触摸屏后生效");
                 break;
             case R.id.btn_cleancount:
                 String trim = etCleanCountContent.getText().toString().trim();
                 if (trim != null && !("".equals(trim))) {
-                    Hawk.put(Name.CLEANCOUNT,Integer.valueOf(trim));
+                    Hawk.put(Name.CLEANCOUNT, Integer.valueOf(trim));
                 }
                 ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success));
                 break;
@@ -464,34 +475,21 @@ public class OtherFragment extends MvpFragment<OtherPresenter> implements OtherV
                 String lastTime = etRestorationwayContacts.getText().toString().trim();//右边
                 //456
                 String nextTime = etRestorationcontract.getText().toString().trim();//左边
-                if ("".equals(lastTime) &&"".equals(nextTime)) {
+                if ("".equals(lastTime) && "".equals(nextTime)) {
                     ToastUtil.showToast("修改失败");
                     return;
                 }
-                Hawk.put(Name.LASTTIME,lastTime);
-                Hawk.put(Name.NEXTTIME,nextTime);
-                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success)+"，重启触摸屏后生效");
-                /*String[] lastTimeSplit = lastTime.split("");
-                String[] nextTimeSplit = nextTime.split("");
-                Log.d(TAG, "SplitonClick1: "+lastTimeSplit.length);
-                Log.d(TAG, "SplitonClick1:"+nextTimeSplit.length);
-                boolean isLastTime = false;
-                boolean isNextTime = false;
-                for (int i = 1; i < lastTimeSplit.length; i++) {
-                    Log.d(TAG, "lastTimeSplitonClick: "+lastTimeSplit[i]);
-                    if (10==Integer.valueOf(lastTimeSplit[i])){
-                        isLastTime=true;
-                        break;
-                    }
-                }
-                for (int i = 1; i < nextTimeSplit.length; i++) {
-                    Log.d(TAG, "nextTimeSplitonClick: "+nextTimeSplit[i]);
-
-                    if (21==Integer.valueOf(nextTimeSplit[i])){
-                        isNextTime=true;
-                        break;
-                    }
-                }*/
+                Hawk.put(Name.LASTTIME, lastTime);
+                Hawk.put(Name.NEXTTIME, nextTime);
+                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success) + "，重启触摸屏后生效");
+                break;
+            case R.id.btn_contract_update:
+                String contract = etContract.getText().toString().trim();
+                String wayContacts = etWayContacts.getText().toString().trim();
+                Hawk.put(Name.COMPANY, contract);
+                Hawk.put(Name.WAYCONTACTS, wayContacts);
+                Log.d(TAG, "btn_contract_updateonClick: " + contract + ":" + wayContacts);
+                ToastUtil.showToast(UiUtil.getStringRes(R.string.update_success));
                 break;
         }
     }

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

@@ -14,8 +14,9 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@+id/ll_wcstate"
-            android:layout_marginTop="@dimen/sp_8"
+            android:layout_alignLeft="@id/ll_wcstate"
+            android:layout_above="@id/ll_wcstate"
+            android:layout_marginBottom="@dimen/dp_2"
             android:text="> 厕所示意图"
             android:textColor="#bfc0c1"
             android:textSize="@dimen/sp_6" />
@@ -24,14 +25,40 @@
             android:id="@+id/tv_equipment_no1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignRight="@id/ll_useCount"
-            android:layout_alignBottom="@id/ll_useCount"
-            android:layout_alignParentBottom="true"
             android:layout_marginTop="@dimen/dp_2"
             android:padding="@dimen/dp_2"
+            android:layout_below="@id/ll_useCount"
             android:text="设备编号："
-            android:textColor="#bfc0c1"
-            android:textSize="@dimen/sp_6" />
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_6"
+            android:layout_toLeftOf="@id/tv_company"/>
+        <TextView
+            android:id="@+id/tv_company"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_2"
+            android:padding="@dimen/dp_2"
+            android:layout_below="@id/ll_useCount"
+            android:text="公司："
+            android:layout_marginLeft="@dimen/dp_12"
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_6"
+            android:layout_toLeftOf="@id/tv_contacts"/>
+        <TextView
+            android:id="@+id/tv_contacts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_2"
+            android:padding="@dimen/dp_2"
+            android:layout_below="@id/ll_useCount"
+            android:layout_marginLeft="@dimen/dp_12"
+            android:text="联系人："
+            android:textStyle="bold"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_6"
+            android:layout_alignRight="@id/ll_useCount"/>
 
         <LinearLayout
             android:id="@+id/ll_wcstate"
@@ -340,9 +367,9 @@
             android:id="@+id/ll_useCount"
             android:layout_width="@dimen/dp_351"
             android:layout_height="@dimen/dp_98"
-            android:layout_alignParentBottom="true"
+            android:layout_below="@id/ll_wccount"
             android:layout_marginLeft="@dimen/dp_31"
-            android:layout_marginBottom="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_12"
             android:layout_toRightOf="@id/ll_wcstate"
             android:background="@drawable/icon3"
             android:gravity="center"