<增加设置界面，显示版本信息等>

app/src/main/java/com/wdkl/callingbed2/adapter/VersionInfoAdapter.java

@@ -0,0 +1,60 @@
+package com.wdkl.callingbed2.adapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.entity.VersionEntity;
+
+import java.util.List;
+
+public class VersionInfoAdapter extends RecyclerView.Adapter<VersionInfoAdapter.ViewHolder> {
+    public List<VersionEntity> list;
+
+    public VersionInfoAdapter(List<VersionEntity> list) {
+        this.list = list;
+    }
+
+    public void upDateList(List<VersionEntity> list){
+        this.list = list;
+        notifyDataSetChanged();
+    }
+
+    //创建新View，被LayoutManager所调用
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+        View view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_version, viewGroup, false);
+        ViewHolder viewHolder = new ViewHolder(view);
+        return viewHolder;
+    }
+
+    //将数据与界面进行绑定的操作
+    @Override
+    public void onBindViewHolder(ViewHolder viewHolder, int position) {
+        if(null!=list){
+            viewHolder.tvTitle.setText(list.get(position).getTitle());
+            viewHolder.tvInfo.setText(list.get(position).getValue());
+        }
+    }
+
+    //获取数据的数量
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+
+    //自定义的ViewHolder，持有每个Item的的所有界面元素
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        public TextView tvTitle;
+        public TextView tvInfo;
+
+        public ViewHolder(View view) {
+            super(view);
+            tvTitle = view.findViewById(R.id.tv_version_title);
+            tvInfo = view.findViewById(R.id.tv_version_info);
+        }
+    }
+}

app/src/main/java/com/wdkl/callingbed2/entity/VersionEntity.java

@@ -0,0 +1,30 @@
+package com.wdkl.callingbed2.entity;
+
+public class VersionEntity {
+    private String title;
+    private String value;
+
+    public VersionEntity() {
+    }
+
+    public VersionEntity(String title, String value) {
+        this.title = title;
+        this.value = value;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

app/src/main/java/com/wdkl/callingbed2/ui/CallingBedActivity.java

@@ -34,6 +34,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
@@ -43,10 +44,12 @@ import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Transformation;
 import com.vvsip.ansip.IVvsipServiceListener;
 import com.vvsip.ansip.VvsipCall;
+import com.wdkl.callingbed2.BuildConfig;
 import com.wdkl.callingbed2.MyApplication;
 import com.wdkl.callingbed2.R;
 import com.wdkl.callingbed2.adapter.CostAdapter;
 import com.wdkl.callingbed2.adapter.DoctorAdapter;
+import com.wdkl.callingbed2.adapter.VersionInfoAdapter;
 import com.wdkl.callingbed2.base.BaseActivity;
 import com.wdkl.callingbed2.common.Constants;
 import com.wdkl.callingbed2.entity.BroadCastEntity;
@@ -60,6 +63,7 @@ import com.wdkl.callingbed2.entity.MessageEvent;
 import com.wdkl.callingbed2.entity.NoticeDataEntity;
 import com.wdkl.callingbed2.entity.NoticeEntity;
 import com.wdkl.callingbed2.entity.UdpEntity;
+import com.wdkl.callingbed2.entity.VersionEntity;
 import com.wdkl.callingbed2.receive.AlarmReceiver;
 import com.wdkl.callingbed2.receive.NetworkConnectChangedReceiver;
 import com.wdkl.callingbed2.util.BitmapUtils;
@@ -147,6 +151,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     //通知界面的数据实体
     private NoticeDataEntity noticeDataEntity;
     private List<NoticeDataEntity.NoticeArray> noticeArrayList;
+    //设置界面版本信息
+    private List<VersionEntity> versionEntityList;
+    private VersionInfoAdapter versionAdapter;
     //通话的状态
     private String CALL_STATUS = Constants.STANDBY;
     //串口工具类
@@ -232,6 +239,8 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     View vCall;
     @Bind(R.id.activity_calling_bed_layout_nurse)
     View vNurse;
+    @Bind(R.id.activity_calling_bed_layout_settings)
+    View vSettings;
     @Bind(R.id.activity_calling_bed_layout_welcome)
     View vWelcome;
     @Bind(R.id.activity_calling_bed_layout_main_big_left)
@@ -370,6 +379,20 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     @Bind(R.id.view_call_nurse_layout_tv_call_end)
     TextView tvCallNurseEnd;
 
+    //系统设置页面
+    @Bind(R.id.ll_view_settings_layout)
+    LinearLayout llSettings;
+    @Bind(R.id.sb_brightness)
+    SeekBar sbBrightness;
+    @Bind(R.id.tv_brightness_value)
+    TextView tvBrightness;
+    @Bind(R.id.sb_volume)
+    SeekBar sbVolume;
+    @Bind(R.id.tv_volume_value)
+    TextView tvVolume;
+    @Bind(R.id.rv_settings_version)
+    RecyclerView rvSettings;
+
     private ImageView ivWelcome;
     private MyTextView tvMessage;
     // 语音播报
@@ -554,7 +577,7 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //初始化view
-        allViews = new ArrayList<>(Arrays.asList(vMain, vDoctor, vCost, vSupport, vCall, vNurse));
+        allViews = new ArrayList<>(Arrays.asList(vMain, vDoctor, vCost, vSupport, vCall, vNurse, vSettings));
         initReceive();
         setListeners();
 
@@ -578,6 +601,54 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         tvSupportEnd.setOnClickListener(this);
         tvCallCareEnd.setOnClickListener(this);
         tvCallNurseEnd.setOnClickListener(this);
+
+        llSettings.setOnClickListener(this);
+
+        sbBrightness.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                tvBrightness.setText(progress + "%");
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+                //重置回到主界面倒计时
+                timeOfBackMainPage = 0;
+                timeOut = callTimeOutBack;
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                int progress = seekBar.getProgress();
+                if (progress >= 0 && progress <= 100) {
+                    Constants.SCREENLIGHT = Integer.toString(progress);
+                    setSYSBrightness(CallingBedActivity.this, progress);
+                }
+            }
+        });
+
+        sbVolume.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                tvVolume.setText(progress + "%");
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+                //重置回到主界面倒计时
+                timeOfBackMainPage = 0;
+                timeOut = callTimeOutBack;
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                int progress = seekBar.getProgress();
+                if (progress >= 0 && progress <= 100) {
+                    Constants.SYSVOICE = Integer.toString(progress);
+                    setSYSVoice(CallingBedActivity.this, progress);
+                }
+            }
+        });
     }
 
     @Override
@@ -713,6 +784,47 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
             }
         });
 
+        versionEntityList = new ArrayList<>();
+        versionAdapter = new VersionInfoAdapter(versionEntityList);
+        rvSettings.setAdapter(versionAdapter);
+        rvSettings.setLayoutManager(new FullyLinearLayoutManager(this));
+        rvSettings.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                //重置回到主界面倒计时
+                timeOfBackMainPage = 0;
+                timeOut = callTimeOutBack;
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        //float DownX
+                        downX = event.getX();
+                        //float DownY
+                        downY = event.getY();
+                        moveX = 0;
+                        moveY = 0;
+                        //long currentMS     获取系统时间
+                        currentMS = System.currentTimeMillis();
+                        break;
+                    case MotionEvent.ACTION_MOVE:
+                        moveX += Math.abs(event.getX() - downX);//X轴距离
+                        moveY += Math.abs(event.getY() - downY);//y轴距离
+                        downX = event.getX();
+                        downY = event.getY();
+                        break;
+                    case MotionEvent.ACTION_UP:
+                        long moveTime = System.currentTimeMillis() - currentMS;//移动时间
+                        //判断点击还是滑动
+                        if (moveTime < 100 || (moveX < 30 && moveY < 30)) {
+                            llSettings.performClick();
+                            return true; //不再执行后面的事件
+                        }
+                        break;
+                }
+                return false;
+            }
+        });
+
+
         noticeArrayList = new ArrayList<>();
 
         getMainData(0);
@@ -1923,6 +2035,23 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         }*/
     }
 
+    public void clickSettings() {
+        vMain_big.setVisibility(View.GONE);//显示增长页面20191017
+        timeOfBackMainPage = 0;
+        timeOut = callTimeOutBack;
+        goneLlRightView(true);
+        if (!isVisible(vSettings)) {
+            showThisView(vSettings);
+            if (StringUtils.isInt(Constants.SCREENLIGHT)) {
+                sbBrightness.setProgress(StringUtils.parseInt(Constants.SCREENLIGHT));
+            }
+            if (StringUtils.isInt(Constants.SYSVOICE)) {
+                sbVolume.setProgress(StringUtils.parseInt(Constants.SYSVOICE));
+            }
+            updateVersionInfo();
+        }
+    }
+
     //请求增援页面
     public void clickVSupport() {
         vMain_big.setVisibility(View.GONE);//显示增长页面20191017
@@ -2160,6 +2289,9 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
     }
 
     private void showHideRightView() {
+        //重置回到主界面倒计时
+        timeOfBackMainPage = 0;
+        timeOut = callTimeOutBack;
         if (isVisible(llRight)) {
             goneLlRightView(true);
         } else {
@@ -2167,6 +2299,31 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
         }
     }
 
+    private void updateVersionInfo() {
+        VersionEntity entity1 = new VersionEntity();
+        entity1.setTitle("本机IP地址");
+        entity1.setValue(NetUtil.getLocalIpAddress());
+        versionEntityList.add(entity1);
+        VersionEntity entity2 = new VersionEntity();
+        entity2.setTitle("本机MAC地址");
+        entity2.setValue(NetUtil.getMacAddress());
+        versionEntityList.add(entity2);
+        VersionEntity entity3 = new VersionEntity();
+        entity3.setTitle("APP版本");
+        entity3.setValue(BuildConfig.VERSION_NAME);
+        versionEntityList.add(entity3);
+        VersionEntity entity4 = new VersionEntity();
+        entity4.setTitle("MCU版本");
+        entity4.setValue(Constants.MCU_VERSION_NUMBER);
+        versionEntityList.add(entity4);
+        VersionEntity entity5 = new VersionEntity();
+        entity5.setTitle("Android系统");
+        entity5.setValue(Build.VERSION.RELEASE);
+        versionEntityList.add(entity5);
+
+        versionAdapter.upDateList(versionEntityList);
+    }
+
         @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -2186,10 +2343,12 @@ public class CallingBedActivity extends BaseActivity implements ISerialPortBedOn
                 clickVSupport();
                 break;
             case R.id.right_ll_settings_item:
+                clickSettings();
                 break;
             case R.id.activity_calling_bed_layout_ll_right:
             case R.id.rl_view_doctor_layout:
             case R.id.rl_view_cost_layout:
+            case R.id.ll_view_settings_layout:
                 showHideRightView();
                 break;
             case R.id.view_support_layout_tv_call_end:

app/src/main/java/com/wdkl/callingbed2/ui/InitActivity.java

@@ -428,17 +428,14 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
     @Override
     public void serialPortBedOnclickString(String str) {
         try {
-            String newStr = CutSerialPortUtil.delHeadAndEnd(str, "$", "#");
-            String content[] = newStr.split(",");
+            String newStr = str.substring(str.indexOf("$") + 1, str.indexOf("#"));
             LogUtil.d("serialPortBedOnclickString", "newStr==" + newStr);
-            switch (content[0]) {
-                case "V":
-                    Constants.MCU_VERSION_NUMBER = content[1].substring(0, 17);
-                    LogUtil.d("serialPortBedOnclick", "Constants.MCU_VERSION_NUMBER==" + Constants.MCU_VERSION_NUMBER);
-                    break;
+            if (newStr.startsWith("V")) {
+                Constants.MCU_VERSION_NUMBER = newStr.substring(str.indexOf(",") + 1, str.indexOf("F"));
+                LogUtil.d("serialPortBedOnclick", "Constants.MCU_VERSION_NUMBER==" + Constants.MCU_VERSION_NUMBER);
             }
         } catch (Exception e) {
-            LogUtil.d("serialPortBedOnclickString", "Exception==");
+            e.printStackTrace();
         }
     }
 

app/src/main/java/com/wdkl/callingbed2/util/NetUtil.java

@@ -111,12 +111,12 @@ public class NetUtil {
                     InetAddress inetAddress = enumIpAddr.nextElement();
                     if (!inetAddress.isLoopbackAddress()) {
                         System.out.println(inetAddress.getHostAddress());
-                        return inetAddress.getHostAddress().toString();
+                        return inetAddress.getHostAddress();
                     }
                 }
             }
         } catch (SocketException ex) {
-
+            ex.printStackTrace();
         }
         return null;
     }

app/src/main/res/drawable/seek_bar_bg.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="2dp" />
+            <solid android:color="#3CA2E0" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <corners android:radius="2dp" />
+                <solid android:color="#3CA2E0" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="2dp" />
+                <solid android:color="#3CA2E0" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>

app/src/main/res/drawable/seek_bar_thumb.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!-- solid表示远的填充色 -->
+    <solid android:color="#3CA2E0" />
+    <!-- stroke则代表远的边框线 -->
+    <stroke
+        android:width="1dp"
+        android:color="#3CA2E0" />
+    <!-- size控制高宽 -->
+    <size
+        android:width="25dp"
+        android:height="25dp" />
+</shape>

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

@@ -62,6 +62,11 @@
             android:visibility="gone" />
 
         <include
+            android:id="@+id/activity_calling_bed_layout_settings"
+            layout="@layout/view_settings_layout"
+            android:visibility="gone" />
+
+        <include
             android:id="@+id/activity_calling_bed_layout_main_big_left"
             layout="@layout/view_main_layout_big_left"
             android:visibility="gone" />

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:orientation="horizontal">
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_version_title"
+            android:layout_width="220dp"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="--"
+            android:textColor="@color/white"
+            android:textSize="28sp"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:background="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_version_info"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:gravity="center"
+            android:text="--"
+            android:textColor="@color/white"
+            android:textSize="28sp"/>
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="-2dp"
+            android:background="@color/white" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/white" />
+</LinearLayout>

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

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#3CA2E0"
+    android:orientation="vertical"
+    android:padding="30dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="系统亮度调节:"
+        android:textColor="@color/white"
+        android:textSize="32sp"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.1"
+            android:scaleType="centerInside"
+            android:src="@mipmap/ic_brightness" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:background="#3CA2E0" />
+
+        <SeekBar
+            android:id="@+id/sb_brightness"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_weight="1.8"
+            android:max="100"
+            android:maxHeight="2dp"
+            android:minHeight="2dp"
+            android:progress="0"
+            android:progressDrawable="@drawable/seek_bar_bg"
+            android:scrollbarStyle="insideInset"
+            android:thumb="@drawable/seek_bar_thumb" />
+
+        <TextView
+            android:id="@+id/tv_brightness_value"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#3CA2E0"
+            android:textSize="28sp" />
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="系统音量调节:"
+        android:textColor="@color/white"
+        android:textSize="32sp"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="100dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/white"
+        android:gravity="center_vertical"
+        android:paddingLeft="20dp"
+        android:paddingRight="20dp">
+
+        <ImageView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.1"
+            android:scaleType="centerInside"
+            android:src="@mipmap/ic_volume" />
+
+        <View
+            android:layout_width="1dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="20dp"
+            android:background="#3CA2E0" />
+
+        <SeekBar
+            android:id="@+id/sb_volume"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_weight="1.8"
+            android:max="100"
+            android:maxHeight="2dp"
+            android:minHeight="2dp"
+            android:progress="0"
+            android:progressDrawable="@drawable/seek_bar_bg"
+            android:scrollbarStyle="insideInset"
+            android:thumb="@drawable/seek_bar_thumb" />
+
+        <TextView
+            android:id="@+id/tv_volume_value"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.15"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#3CA2E0"
+            android:textSize="28sp" />
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="语言设置"
+        android:textColor="@color/white"
+        android:textSize="32sp"
+        android:textStyle="bold"
+        android:visibility="gone" />
+
+    <RadioGroup
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal"
+        android:visibility="gone">
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="中文"
+            android:textColor="@color/white"
+            android:textSize="32sp" />
+
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:text="English"
+            android:textColor="@color/white"
+            android:textSize="32sp" />
+    </RadioGroup>
+
+    <LinearLayout
+        android:id="@+id/ll_view_settings_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:text="IP地址及版本号:"
+            android:textColor="@color/white"
+            android:textSize="32sp"
+            android:textStyle="bold" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/white"
+            android:layout_marginTop="10dp" />
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/rv_settings_version"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </LinearLayout>
+</LinearLayout>