<7寸床头分机修改包名com.wdkl.callingbed2>

app/build.gradle

@@ -21,7 +21,7 @@ android {
     compileSdkVersion 26
     buildToolsVersion "26.0.1"
     defaultConfig {
-        applicationId "com.wdkl.callingbed"
+        applicationId "com.wdkl.callingbed2"
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1

app/src/androidTest/java/com/wdkl/callingbed/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed;
+package com.wdkl.callingbed2;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:sharedUserId="android.uid.system"
-    package="com.wdkl.callingbed"
+    package="com.wdkl.callingbed2"
     >
     <!--android:sharedUserId="android.uid.system"-->
 
@@ -51,7 +51,7 @@
         android:required="true" />
 
     <application
-        android:name=".MyApplication"
+        android:name="com.wdkl.callingbed2.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
         android:label="@string/app_name"
@@ -60,14 +60,14 @@
         android:theme="@style/AppTheme"
         tools:replace="android:icon">
 
-        <activity android:name=".ui.CallingBedActivity"
+        <activity android:name="com.wdkl.callingbed2.ui.CallingBedActivity"
             android:screenOrientation="landscape"></activity>
 
-        <activity android:name="com.wdkl.callingbed.ui.APPUpdateActivity"
+        <activity android:name="com.wdkl.callingbed2.ui.APPUpdateActivity"
             android:screenOrientation="landscape"
             android:launchMode="singleTop"></activity>
 
-        <activity android:name=".ui.InitActivity"
+        <activity android:name="com.wdkl.callingbed2.ui.InitActivity"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -78,7 +78,7 @@
             </intent-filter>
         </activity>
 
-        <receiver android:name=".receive.AlarmReceiver">
+        <receiver android:name="com.wdkl.callingbed2.receive.AlarmReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.ACTION_CALL" />
                 <action android:name="android.intent.action.SMS" />
@@ -94,7 +94,7 @@
             android:name="com.vvsip.ansip.VvsipService"
             android:icon="@drawable/ic_launcher"></service>
         <service
-            android:name="com.wdkl.callingbed.service.APPService"> </service>
+            android:name="com.wdkl.callingbed2.service.APPService"> </service>
 
         <!-- 适配480 800 -->
         <meta-data android:name="design_width" android:value="480"/>

app/src/main/java/com/wdkl/callingbed/MainActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed;
+package com.wdkl.callingbed2;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;

app/src/main/java/com/wdkl/callingbed/MyApplication.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed;
+package com.wdkl.callingbed2;
 
 import android.app.Application;
 import android.content.ComponentName;
@@ -8,10 +8,10 @@ import android.content.ServiceConnection;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
 
-import com.wdkl.callingbed.service.APPService;
-import com.wdkl.callingbed.util.UdpHelper;
-import com.wdkl.callingbed.util.anrfcutil.AnrFcExceptionUtil;
-import com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector;
+import com.wdkl.callingbed2.service.APPService;
+import com.wdkl.callingbed2.util.UdpHelper;
+import com.wdkl.callingbed2.util.anrfcutil.AnrFcExceptionUtil;
+import com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector;
 import com.zhy.http.okhttp.OkHttpUtils;
 
 import java.util.concurrent.TimeUnit;

app/src/main/java/com/wdkl/callingbed/adapter/CostAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.adapter;
+package com.wdkl.callingbed2.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.entity.CostDataEntity.CostArray;
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.entity.CostDataEntity.CostArray;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingbed/adapter/DoctorAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.adapter;
+package com.wdkl.callingbed2.adapter;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -6,8 +6,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.entity.DoctorDataEntity.DoctorChargeArray;
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.entity.DoctorDataEntity.DoctorChargeArray;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingbed/base/BaseActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.base;
+package com.wdkl.callingbed2.base;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -7,10 +7,10 @@ import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.StringUtils;
-import com.wdkl.callingbed.widget.dialog.LoadingActivityDialog;
-import com.wdkl.callingbed.widget.loading.VaryViewHelperController;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.StringUtils;
+import com.wdkl.callingbed2.widget.dialog.LoadingActivityDialog;
+import com.wdkl.callingbed2.widget.loading.VaryViewHelperController;
 import com.zhy.autolayout.AutoLayoutActivity;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/wdkl/callingbed/base/BasePresenterI.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.base;
+package com.wdkl.callingbed2.base;
 
 import android.content.Context;
 

app/src/main/java/com/wdkl/callingbed/base/BaseViewI.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.base;
+package com.wdkl.callingbed2.base;
 
 /**
  * Created by Administrator on 2016/9/7 0007.

app/src/main/java/com/wdkl/callingbed/common/Constants.java

@@ -1,6 +1,6 @@
-package com.wdkl.callingbed.common;
+package com.wdkl.callingbed2.common;
 
-import com.wdkl.callingbed.ui.InitActivity;
+import com.wdkl.callingbed2.ui.InitActivity;
 
 /**
  * Created by 胡博文 on 2017/9/1.

app/src/main/java/com/wdkl/callingbed/entity/BroadCastEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 /**
  * Created by 胡博文 on 2017/10/26.

app/src/main/java/com/wdkl/callingbed/entity/CostDataEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingbed/entity/DoctorDataEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingbed/entity/InitDataEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 import java.io.Serializable;
 

app/src/main/java/com/wdkl/callingbed/entity/MainDataEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 /**
  * Created by 胡博文 on 2017/9/5.

app/src/main/java/com/wdkl/callingbed/entity/MessageEvent.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 /**
  * Created by Administrator on 2016/8/15 0015.

app/src/main/java/com/wdkl/callingbed/entity/NoticeDataEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 import java.io.Serializable;
 import java.util.List;

app/src/main/java/com/wdkl/callingbed/entity/NoticeEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 /**
  * Created by xuhuan on 2017/9/20.

app/src/main/java/com/wdkl/callingbed/entity/SipMessageEvent.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 import android.net.sip.SipAudioCall;
 

app/src/main/java/com/wdkl/callingbed/entity/SystemSetEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 public class SystemSetEntity {
     private String dayOrNight;

app/src/main/java/com/wdkl/callingbed/entity/UdpEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.entity;
+package com.wdkl.callingbed2.entity;
 
 /**
  * Created by fengxiangqian on 2017/8/31.

app/src/main/java/com/wdkl/callingbed/receive/AlarmReceiver.java

@@ -1,12 +1,12 @@
-package com.wdkl.callingbed.receive;
+package com.wdkl.callingbed2.receive;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.entity.NoticeEntity;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.entity.NoticeEntity;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/wdkl/callingbed/receive/NetworkConnectChangedReceiver.java

@@ -1,11 +1,11 @@
-package com.wdkl.callingbed.receive;
+package com.wdkl.callingbed2.receive;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 
-import com.wdkl.callingbed.util.NetUtil;
+import com.wdkl.callingbed2.util.NetUtil;
 
 
 public class NetworkConnectChangedReceiver extends BroadcastReceiver {

app/src/main/java/com/wdkl/callingbed/receive/StartupReceiver.java

@@ -1,10 +1,10 @@
-package com.wdkl.callingbed.receive;
+package com.wdkl.callingbed2.receive;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.wdkl.callingbed.ui.InitActivity;
+import com.wdkl.callingbed2.ui.InitActivity;
 
 
 public class StartupReceiver extends BroadcastReceiver {

app/src/main/java/com/wdkl/callingbed/service/APPService.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.service;
+package com.wdkl.callingbed2.service;
 
 import android.app.Service;
 import android.content.Intent;
@@ -6,12 +6,12 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.support.annotation.Nullable;
 
-import com.wdkl.callingbed.MyApplication;
+import com.wdkl.callingbed2.MyApplication;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.wdkl.callingbed.MyApplication.serialPortUtil;
+import static com.wdkl.callingbed2.MyApplication.serialPortUtil;
 
 /**
  * Created by Waderson on 2018/01/23.

app/src/main/java/com/wdkl/callingbed/ui/APPUpdateActivity.java

@@ -1,18 +1,18 @@
-package com.wdkl.callingbed.ui;
+package com.wdkl.callingbed2.ui;
 
 import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Message;
 
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.base.BaseActivity;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.util.DownloadUtil;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.StringUtils;
-import com.wdkl.callingbed.util.ToastUtil;
-import com.wdkl.callingbed.util.silentupdate.SilentUpdateUtil;
-import com.wdkl.callingbed.widget.view.ProgressView;
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.base.BaseActivity;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.util.DownloadUtil;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.StringUtils;
+import com.wdkl.callingbed2.util.ToastUtil;
+import com.wdkl.callingbed2.util.silentupdate.SilentUpdateUtil;
+import com.wdkl.callingbed2.widget.view.ProgressView;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.ui;
+package com.wdkl.callingbed2.ui;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -24,7 +24,6 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.animation.Animation;
@@ -42,48 +41,48 @@ import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Transformation;
 import com.vvsip.ansip.IVvsipServiceListener;
 import com.vvsip.ansip.VvsipCall;
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.adapter.CostAdapter;
-import com.wdkl.callingbed.adapter.DoctorAdapter;
-import com.wdkl.callingbed.base.BaseActivity;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.BroadCastEntity;
-import com.wdkl.callingbed.entity.CostDataEntity;
-import com.wdkl.callingbed.entity.CostDataEntity.CostArray;
-import com.wdkl.callingbed.entity.DoctorDataEntity;
-import com.wdkl.callingbed.entity.DoctorDataEntity.DoctorChargeArray;
-import com.wdkl.callingbed.entity.InitDataEntity;
-import com.wdkl.callingbed.entity.MainDataEntity;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.entity.NoticeDataEntity;
-import com.wdkl.callingbed.entity.NoticeEntity;
-import com.wdkl.callingbed.entity.UdpEntity;
-import com.wdkl.callingbed.receive.AlarmReceiver;
-import com.wdkl.callingbed.receive.NetworkConnectChangedReceiver;
-import com.wdkl.callingbed.util.BitmapUtils;
-import com.wdkl.callingbed.util.DateUtil;
-import com.wdkl.callingbed.util.DensityUtils;
-import com.wdkl.callingbed.util.DownloadUtil;
-import com.wdkl.callingbed.util.FullyLinearLayoutManager;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.MarqueeText;
-import com.wdkl.callingbed.util.MediaPlayerManger;
-import com.wdkl.callingbed.util.NetUtil;
-import com.wdkl.callingbed.util.ScreenManagerUtil;
-import com.wdkl.callingbed.util.SharedPreferencesUtil;
-import com.wdkl.callingbed.util.SipUtil.SipCallBackI;
-import com.wdkl.callingbed.util.SipUtil.SipHelperUtil;
-import com.wdkl.callingbed.util.StringUtils;
-import com.wdkl.callingbed.util.TimeUtil;
-import com.wdkl.callingbed.util.ToastUtil;
-import com.wdkl.callingbed.util.TwoDimensionCodeUtil;
-import com.wdkl.callingbed.util.UdpSendUtil;
-import com.wdkl.callingbed.util.VoiceManagerUtil;
-import com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector;
-import com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand;
-import com.wdkl.callingbed.widget.loading.IMediaPlayerVolume;
-import com.wdkl.callingbed.widget.view.MyTextView;
+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.base.BaseActivity;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.BroadCastEntity;
+import com.wdkl.callingbed2.entity.CostDataEntity;
+import com.wdkl.callingbed2.entity.CostDataEntity.CostArray;
+import com.wdkl.callingbed2.entity.DoctorDataEntity;
+import com.wdkl.callingbed2.entity.DoctorDataEntity.DoctorChargeArray;
+import com.wdkl.callingbed2.entity.InitDataEntity;
+import com.wdkl.callingbed2.entity.MainDataEntity;
+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.receive.AlarmReceiver;
+import com.wdkl.callingbed2.receive.NetworkConnectChangedReceiver;
+import com.wdkl.callingbed2.util.BitmapUtils;
+import com.wdkl.callingbed2.util.DateUtil;
+import com.wdkl.callingbed2.util.DensityUtils;
+import com.wdkl.callingbed2.util.DownloadUtil;
+import com.wdkl.callingbed2.util.FullyLinearLayoutManager;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.MarqueeText;
+import com.wdkl.callingbed2.util.MediaPlayerManger;
+import com.wdkl.callingbed2.util.NetUtil;
+import com.wdkl.callingbed2.util.ScreenManagerUtil;
+import com.wdkl.callingbed2.util.SharedPreferencesUtil;
+import com.wdkl.callingbed2.util.SipUtil.SipCallBackI;
+import com.wdkl.callingbed2.util.SipUtil.SipHelperUtil;
+import com.wdkl.callingbed2.util.StringUtils;
+import com.wdkl.callingbed2.util.TimeUtil;
+import com.wdkl.callingbed2.util.ToastUtil;
+import com.wdkl.callingbed2.util.TwoDimensionCodeUtil;
+import com.wdkl.callingbed2.util.UdpSendUtil;
+import com.wdkl.callingbed2.util.VoiceManagerUtil;
+import com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector;
+import com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand;
+import com.wdkl.callingbed2.widget.loading.IMediaPlayerVolume;
+import com.wdkl.callingbed2.widget.view.MyTextView;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -105,25 +104,23 @@ import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 import serialporttest.utils.SerialPortUtil.ISerialPortBedOnclickEvent;
 
-import static com.wdkl.callingbed.common.Constants.CALLINGTIMEOUT;
-import static com.wdkl.callingbed.common.Constants.CALLING_TIME_OUT;
-import static com.wdkl.callingbed.common.Constants.EVENT_MGR_RESET;
-import static com.wdkl.callingbed.common.Constants.EVENT_SIP_INTERNETPING;
-import static com.wdkl.callingbed.common.Constants.EVENT_SIP_REGISTER_STATUS;
-import static com.wdkl.callingbed.common.Constants.NURSE_CALL_TIMEOUT;
-import static com.wdkl.callingbed.common.Constants.STANDBY;
-import static com.wdkl.callingbed.common.Constants.innetSIPAddress;
-import static com.wdkl.callingbed.util.ToastUtil.showToast;
-import static com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector.ethernetStatus;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.closeHeart;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setBedLight;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setDoorLight;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setHandsMIC;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setNurseBrightness;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setSYSBrightness;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setSYSVoice;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setWSHLight;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setWSHLightFlicker;
+import static com.wdkl.callingbed2.common.Constants.EVENT_MGR_RESET;
+import static com.wdkl.callingbed2.common.Constants.EVENT_SIP_INTERNETPING;
+import static com.wdkl.callingbed2.common.Constants.EVENT_SIP_REGISTER_STATUS;
+import static com.wdkl.callingbed2.common.Constants.NURSE_CALL_TIMEOUT;
+import static com.wdkl.callingbed2.common.Constants.STANDBY;
+import static com.wdkl.callingbed2.common.Constants.innetSIPAddress;
+import static com.wdkl.callingbed2.util.ToastUtil.showToast;
+import static com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus.WifiBindSipStatusConnector.ethernetStatus;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.closeHeart;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setBedLight;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setDoorLight;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setHandsMIC;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setNurseBrightness;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setSYSBrightness;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setSYSVoice;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setWSHLight;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setWSHLightFlicker;
 
 /**
  * Created by 胡博文 on 2017/8/17.

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.ui;
+package com.wdkl.callingbed2.ui;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -13,27 +13,26 @@ import android.view.View;
 import android.widget.ImageView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.base.BaseActivity;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.InitDataEntity;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.util.AutoRebootUtil;
-import com.wdkl.callingbed.util.CutSerialPortUtil;
-import com.wdkl.callingbed.util.DateUtil;
-import com.wdkl.callingbed.util.DownloadUtil;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.NetUtil;
-import com.wdkl.callingbed.util.ScreenManagerUtil;
-import com.wdkl.callingbed.util.StringUtils;
-import com.wdkl.callingbed.util.ToastUtil;
-import com.wdkl.callingbed.util.UdpSendUtil;
-import com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand;
+import com.wdkl.callingbed2.MyApplication;
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.base.BaseActivity;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.InitDataEntity;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.util.AutoRebootUtil;
+import com.wdkl.callingbed2.util.CutSerialPortUtil;
+import com.wdkl.callingbed2.util.DateUtil;
+import com.wdkl.callingbed2.util.DownloadUtil;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.NetUtil;
+import com.wdkl.callingbed2.util.ScreenManagerUtil;
+import com.wdkl.callingbed2.util.StringUtils;
+import com.wdkl.callingbed2.util.ToastUtil;
+import com.wdkl.callingbed2.util.UdpSendUtil;
+import com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONObject;
@@ -43,9 +42,9 @@ import butterknife.OnClick;
 import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingbed.util.AutoRebootUtil.ethreboot;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.closeHeart;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.setNurseBrightness;
+import static com.wdkl.callingbed2.util.AutoRebootUtil.ethreboot;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.closeHeart;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.setNurseBrightness;
 
 /**
  * 类名称：InitActivity <br>

app/src/main/java/com/wdkl/callingbed/util/AnalysisUdpUtil.java

@@ -1,20 +1,17 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.BroadCastEntity;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.entity.SystemSetEntity;
-import com.wdkl.callingbed.entity.UdpEntity;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.BroadCastEntity;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.entity.SystemSetEntity;
+import com.wdkl.callingbed2.entity.UdpEntity;
 
 import org.greenrobot.eventbus.EventBus;
 
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingbed.MyApplication.serialPortUtil;
-
 /**
  * Created by 胡博文 on 2017/10/18.
  */

app/src/main/java/com/wdkl/callingbed/util/AutoRebootUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.content.Intent;
@@ -6,8 +6,8 @@ import android.os.SystemProperties;
 
 import java.util.Calendar;
 
-import static com.wdkl.callingbed.common.Constants.NET_ERROR_FIVE_AFTER_TOAST;
-import static com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand.closeHeart;
+import static com.wdkl.callingbed2.common.Constants.NET_ERROR_FIVE_AFTER_TOAST;
+import static com.wdkl.callingbed2.util.sendcommand.CallingBedSendCommand.closeHeart;
 
 /**
  * Created by dengzhe on 2018/4/18.

app/src/main/java/com/wdkl/callingbed/util/BitmapUtils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

app/src/main/java/com/wdkl/callingbed/util/CutSerialPortUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 /**
  * Created by 胡博文 on 2018/3/21.

app/src/main/java/com/wdkl/callingbed/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.app.AlarmManager;
 import android.content.Context;

app/src/main/java/com/wdkl/callingbed/util/DensityUtils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.util.TypedValue;

app/src/main/java/com/wdkl/callingbed/util/DownloadUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.os.Environment;
 import android.support.annotation.NonNull;

app/src/main/java/com/wdkl/callingbed/util/FullyGridLayoutManager.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.support.v7.widget.GridLayoutManager;

app/src/main/java/com/wdkl/callingbed/util/FullyLinearLayoutManager.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.support.v7.widget.LinearLayoutManager;

app/src/main/java/com/wdkl/callingbed/util/LogUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.util.Log;
 

app/src/main/java/com/wdkl/callingbed/util/MLog.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.text.TextUtils;
 import android.util.Log;

app/src/main/java/com/wdkl/callingbed/util/MarqueeText.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatTextView;

app/src/main/java/com/wdkl/callingbed/util/MediaPlayerManger.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;

app/src/main/java/com/wdkl/callingbed/util/MyOkHttpRetryInterceptor.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -12,7 +12,7 @@ import android.net.wifi.WifiManager;
 import android.text.TextUtils;
 import android.text.format.Formatter;
 
-import com.wdkl.callingbed.MyApplication;
+import com.wdkl.callingbed2.MyApplication;
 
 import java.io.BufferedReader;
 import java.io.IOException;

app/src/main/java/com/wdkl/callingbed/util/ReceiverUtil.java

@@ -1,11 +1,11 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.wdkl.callingbed.MyApplication;
+import com.wdkl.callingbed2.MyApplication;
 
 public class ReceiverUtil {
 

app/src/main/java/com/wdkl/callingbed/util/ScreenExtinguishUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 public class ScreenExtinguishUtil {
 

app/src/main/java/com/wdkl/callingbed/util/ScreenManagerUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 /**
  * Created by 胡博文 on 2017/9/19.

app/src/main/java/com/wdkl/callingbed/util/SharedPreferenceUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;

app/src/main/java/com/wdkl/callingbed/util/SharedPreferencesUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;

app/src/main/java/com/wdkl/callingbed/util/SipUtil/SipCallBackI.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.SipUtil;
+package com.wdkl.callingbed2.util.SipUtil;
 
 /**
  * ======================Sip回调接口=====================

app/src/main/java/com/wdkl/callingbed/util/SipUtil/SipHelperUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.SipUtil;
+package com.wdkl.callingbed2.util.SipUtil;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -20,11 +20,11 @@ import com.vvsip.ansip.VvsipCall;
 import com.vvsip.ansip.VvsipService;
 import com.vvsip.ansip.VvsipServiceBinder;
 import com.vvsip.ansip.VvsipTask;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.ui.CallingBedActivity;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus.EthernetWifiCallBackI;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.ui.CallingBedActivity;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus.EthernetWifiCallBackI;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -32,9 +32,9 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.wdkl.callingbed.common.Constants.CALLING_ENDING;
-import static com.wdkl.callingbed.common.Constants.EVENT_SIP_REGISTER_STATUS;
-import static com.wdkl.callingbed.common.Constants.SIP_IP_END;
+import static com.wdkl.callingbed2.common.Constants.CALLING_ENDING;
+import static com.wdkl.callingbed2.common.Constants.EVENT_SIP_REGISTER_STATUS;
+import static com.wdkl.callingbed2.common.Constants.SIP_IP_END;
 
 /**
  * Created by dengzhe on 2017/12/18.

app/src/main/java/com/wdkl/callingbed/util/StringUtils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
@@ -7,7 +7,7 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 
-import com.wdkl.callingbed.BuildConfig;
+import com.wdkl.callingbed2.BuildConfig;
 
 import java.io.BufferedReader;
 import java.io.IOException;

app/src/main/java/com/wdkl/callingbed/util/TimeUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import java.io.DataOutputStream;
 import java.io.IOException;

app/src/main/java/com/wdkl/callingbed/util/ToastUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -8,7 +8,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.wdkl.callingbed.MyApplication;
+import com.wdkl.callingbed2.MyApplication;
 
 /**
  * 类名称：ToastUtil <br>

app/src/main/java/com/wdkl/callingbed/util/TwoDimensionCodeUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

app/src/main/java/com/wdkl/callingbed/util/UdpHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.net.wifi.WifiManager;

app/src/main/java/com/wdkl/callingbed/util/UdpSendUtil.java

@@ -1,12 +1,12 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.InitDataEntity;
-import com.wdkl.callingbed.entity.MainDataEntity;
-import com.wdkl.callingbed.entity.UdpEntity;
+import com.wdkl.callingbed2.MyApplication;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.InitDataEntity;
+import com.wdkl.callingbed2.entity.MainDataEntity;
+import com.wdkl.callingbed2.entity.UdpEntity;
 
 
 /**

app/src/main/java/com/wdkl/callingbed/util/VoiceManagerUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util;
+package com.wdkl.callingbed2.util;
 
 import android.content.Context;
 import android.media.AudioManager;

app/src/main/java/com/wdkl/callingbed/util/anrfcutil/AnrFcExceptionUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.anrfcutil;
+package com.wdkl.callingbed2.util.anrfcutil;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -10,8 +10,8 @@ import android.util.Log;
 
 import com.github.anrwatchdog.ANRError;
 import com.github.anrwatchdog.ANRWatchDog;
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.common.Constants;
+import com.wdkl.callingbed2.MyApplication;
+import com.wdkl.callingbed2.common.Constants;
 
 /**
  * Created by dengzhe on 2018/4/2.

app/src/main/java/com/wdkl/callingbed/util/ethernetwifiwithsipconnectstatus/EthernetWifiCallBackI.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus;
+package com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus;
 
 /**
  * ======================以太网和wifi状态接口=====================

app/src/main/java/com/wdkl/callingbed/util/ethernetwifiwithsipconnectstatus/WifiBindSipStatusConnector.java

@@ -1,22 +1,22 @@
-package com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus;
+package com.wdkl.callingbed2.util.ethernetwifiwithsipconnectstatus;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 
-import com.wdkl.callingbed.R;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.entity.MessageEvent;
-import com.wdkl.callingbed.util.NetUtil;
-import com.wdkl.callingbed.util.SipUtil.SipHelperUtil;
+import com.wdkl.callingbed2.R;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.entity.MessageEvent;
+import com.wdkl.callingbed2.util.NetUtil;
+import com.wdkl.callingbed2.util.SipUtil.SipHelperUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.wdkl.callingbed.common.Constants.ETHERNETSTATUS;
+import static com.wdkl.callingbed2.common.Constants.ETHERNETSTATUS;
 
 /**
  * Created by dengzhe on 2017/11/29.

app/src/main/java/com/wdkl/callingbed/util/sendcommand/CallingBedSendCommand.java

@@ -1,13 +1,13 @@
-package com.wdkl.callingbed.util.sendcommand;
+package com.wdkl.callingbed2.util.sendcommand;
 
 import android.content.Context;
 
-import com.wdkl.callingbed.MyApplication;
-import com.wdkl.callingbed.common.Constants;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.ScreenManagerUtil;
-import com.wdkl.callingbed.util.StringUtils;
-import com.wdkl.callingbed.util.VoiceManagerUtil;
+import com.wdkl.callingbed2.MyApplication;
+import com.wdkl.callingbed2.common.Constants;
+import com.wdkl.callingbed2.util.LogUtil;
+import com.wdkl.callingbed2.util.ScreenManagerUtil;
+import com.wdkl.callingbed2.util.StringUtils;
+import com.wdkl.callingbed2.util.VoiceManagerUtil;
 
 import serialporttest.utils.SerialPortUtil;
 

app/src/main/java/com/wdkl/callingbed/util/silentupdate/CustomToast.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.silentupdate;
+package com.wdkl.callingbed2.util.silentupdate;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -11,7 +11,7 @@ import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingbed.R;
+import com.wdkl.callingbed2.R;
 
 
 /**

app/src/main/java/com/wdkl/callingbed/util/silentupdate/SilentUpdateUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.util.silentupdate;
+package com.wdkl.callingbed2.util.silentupdate;
 
 import android.content.Context;
 import android.content.pm.IPackageManager;
@@ -7,17 +7,16 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.IBinder;
 
-import com.wdkl.callingbed.util.AutoRebootUtil;
-import com.wdkl.callingbed.util.LogUtil;
-import com.wdkl.callingbed.util.ToastUtil;
+import com.wdkl.callingbed2.util.AutoRebootUtil;
+import com.wdkl.callingbed2.util.LogUtil;
 
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.wdkl.callingbed.util.DownloadUtil.FILE_APK_NAME;
-import static com.wdkl.callingbed.util.DownloadUtil.FILE_APK_PATH;
+import static com.wdkl.callingbed2.util.DownloadUtil.FILE_APK_NAME;
+import static com.wdkl.callingbed2.util.DownloadUtil.FILE_APK_PATH;
 
 /**
  * <br>

app/src/main/java/com/wdkl/callingbed/widget/dialog/LoadingActivityDialog.java

@@ -1,10 +1,10 @@
-package com.wdkl.callingbed.widget.dialog;
+package com.wdkl.callingbed2.widget.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.view.Gravity;
 
-import com.wdkl.callingbed.R;
+import com.wdkl.callingbed2.R;
 
 
 public class LoadingActivityDialog extends Dialog {

app/src/main/java/com/wdkl/callingbed/widget/loading/IMediaPlayerVolume.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.loading;
+package com.wdkl.callingbed2.widget.loading;
 
 /**
  * Created by 胡博文 on 2018/5/10.

app/src/main/java/com/wdkl/callingbed/widget/loading/IVaryViewHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.loading;
+package com.wdkl.callingbed2.widget.loading;
 
 import android.content.Context;
 import android.view.View;

app/src/main/java/com/wdkl/callingbed/widget/loading/VaryViewHelper.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.loading;
+package com.wdkl.callingbed2.widget.loading;
 
 import android.content.Context;
 import android.view.LayoutInflater;

app/src/main/java/com/wdkl/callingbed/widget/loading/VaryViewHelperController.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.loading;
+package com.wdkl.callingbed2.widget.loading;
 
 
 import android.graphics.drawable.AnimationDrawable;
@@ -8,7 +8,7 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.wdkl.callingbed.R;
+import com.wdkl.callingbed2.R;
 
 
 public class VaryViewHelperController {

app/src/main/java/com/wdkl/callingbed/widget/view/MyTextView.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.view;
+package com.wdkl.callingbed2.widget.view;
 
 import android.content.Context;
 import android.support.v7.widget.AppCompatTextView;

app/src/main/java/com/wdkl/callingbed/widget/view/ProgressView.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.view;
+package com.wdkl.callingbed2.widget.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -17,7 +17,7 @@ import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
 
-import com.wdkl.callingbed.R;
+import com.wdkl.callingbed2.R;
 
 /**
  * 类名称：ProgressView <br>

app/src/main/java/com/wdkl/callingbed/widget/view/ProgressWheel.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed.widget.view;
+package com.wdkl.callingbed2.widget.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -14,7 +14,7 @@ import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
 
-import com.wdkl.callingbed.R;
+import com.wdkl.callingbed2.R;
 
 
 public class ProgressWheel extends View {

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

@@ -15,7 +15,7 @@
         android:textColor="#3D3D63"
         android:textSize="30sp" />
 
-    <com.wdkl.callingbed.widget.view.ProgressView
+    <com.wdkl.callingbed2.widget.view.ProgressView
         android:id="@+id/activity_appupdate_dialog_progressview"
         android:layout_width="match_parent"
         android:layout_height="20dp"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.wdkl.callingbed.MainActivity">
+    tools:context="com.wdkl.callingbed2.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -13,7 +13,7 @@
         android:orientation="vertical"
         android:gravity="center"
         >
-        <com.wdkl.callingbed.widget.view.ProgressWheel
+        <com.wdkl.callingbed2.widget.view.ProgressWheel
             android:layout_width="80px"
             android:layout_height="80px"
             android:layout_centerHorizontal="true"

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

@@ -13,7 +13,7 @@
         android:orientation="vertical"
         android:gravity="center"
         >
-        <com.wdkl.callingbed.widget.view.ProgressWheel
+        <com.wdkl.callingbed2.widget.view.ProgressWheel
             android:layout_width="80px"
             android:layout_height="80px"
             android:layout_centerHorizontal="true"

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

@@ -6,7 +6,7 @@
     >
 
 
-    <com.wdkl.callingbed.widget.view.ProgressWheel
+    <com.wdkl.callingbed2.widget.view.ProgressWheel
         android:layout_width="80dip"
         android:layout_height="80dip"
         android:layout_centerInParent="true"

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

@@ -487,7 +487,7 @@
                 android:layout_weight="2"
                 android:background="@drawable/shape_main_bg_doctor_bottom">
 
-                <com.wdkl.callingbed.util.MarqueeText
+                <com.wdkl.callingbed2.util.MarqueeText
                     android:id="@+id/view_main_layout_tv_broadcasting"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -602,7 +602,7 @@
                 android:layout_weight="2"
                 android:background="@drawable/shape_main_bg_doctor_bottom">
 
-                <com.wdkl.callingbed.util.MarqueeText
+                <com.wdkl.callingbed2.util.MarqueeText
                     android:id="@+id/view_main_layout_tv_broadcasting"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"

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

@@ -30,7 +30,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_30" />
 
-            <com.wdkl.callingbed.util.MarqueeText
+            <com.wdkl.callingbed2.util.MarqueeText
                 android:id="@+id/view_main_layout_left_one_content_big"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -69,7 +69,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_30" />
 
-            <com.wdkl.callingbed.util.MarqueeText
+            <com.wdkl.callingbed2.util.MarqueeText
                 android:id="@+id/view_main_layout_left_two_content_big"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_30" />
 
-            <com.wdkl.callingbed.util.MarqueeText
+            <com.wdkl.callingbed2.util.MarqueeText
                 android:id="@+id/view_main_layout_left_three_content_big"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -145,7 +145,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_30" />
 
-            <com.wdkl.callingbed.util.MarqueeText
+            <com.wdkl.callingbed2.util.MarqueeText
                 android:id="@+id/view_main_layout_left_four_content_big"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_30" />
 
-            <com.wdkl.callingbed.util.MarqueeText
+            <com.wdkl.callingbed2.util.MarqueeText
                 android:id="@+id/view_main_layout_left_five_content_big"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -236,7 +236,7 @@
                             android:gravity="center"
                             android:orientation="vertical">
 
-                            <com.wdkl.callingbed.util.MarqueeText
+                            <com.wdkl.callingbed2.util.MarqueeText
                                 android:id="@+id/view_main_layout_tv_bed_num_big"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -286,7 +286,7 @@
                             android:textSize="36sp"
                             android:textStyle="bold" />
 
-                        <com.wdkl.callingbed.util.MarqueeText
+                        <com.wdkl.callingbed2.util.MarqueeText
                             android:id="@+id/view_main_layout_tv_name_big"
                             android:layout_width="300dp"
                             android:layout_height="85dp"

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

@@ -16,7 +16,7 @@
         android:src="@mipmap/ic_notice"
         android:visibility="invisible" />
 
-    <com.wdkl.callingbed.widget.view.MyTextView
+    <com.wdkl.callingbed2.widget.view.MyTextView
         android:id="@+id/view_main_layout_tv_msg"
         android:layout_width="200dp"
         android:layout_height="wrap_content"

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">床头机</string>
+    <string name="app_name">7寸床头机</string>
     <string name="loading_title">努力加载中</string>
 
     <!--初始化提示String-->

app/src/test/java/com/wdkl/callingbed/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingbed;
+package com.wdkl.callingbed2;
 
 import org.junit.Test;