<护士主机总控机修改包名为com.wdkl.callingmainnursemanager>

app/build.gradle

@@ -19,7 +19,7 @@ android {
     compileSdkVersion 26
     buildToolsVersion "26.0.1"
     defaultConfig {
-        applicationId "com.wdkl.callingmainnurse"
+        applicationId "com.wdkl.callingmainnursemanager"
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse;
+package com.wdkl.callingmainnursemanager;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.wdkl.callingmainnurse", appContext.getPackageName());
+        assertEquals("com.wdkl.callingmainnursemanager", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.wdkl.callingmainnurse"
+    package="com.wdkl.callingmainnursemanager"
     android:sharedUserId="android.uid.system"
     >
 
@@ -53,7 +53,7 @@
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"></uses-permission>
 
     <application
-        android:name=".MyApplication"
+        android:name="com.wdkl.callingmainnursemanager.MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/app_logo"
         android:label="@string/app_name"
@@ -61,7 +61,7 @@
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"
         tools:replace="android:icon">
         <activity
-            android:name=".ui.activity.InitActivity"
+            android:name="com.wdkl.callingmainnursemanager.ui.activity.InitActivity"
             android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -69,20 +69,20 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.activity.MainFragmentActivity"
+            android:name="com.wdkl.callingmainnursemanager.ui.activity.MainFragmentActivity"
             android:screenOrientation="landscape"
             android:launchMode="singleTask"></activity>
 
-        <activity android:name=".ui.activity.SysBrightSetActivity"
+        <activity android:name="com.wdkl.callingmainnursemanager.ui.activity.SysBrightSetActivity"
             android:screenOrientation="landscape"></activity>
-        <activity android:name=".ui.activity.SysCallingVolSetActivity"
+        <activity android:name="com.wdkl.callingmainnursemanager.ui.activity.SysCallingVolSetActivity"
             android:screenOrientation="landscape"></activity>
-        <activity android:name=".ui.activity.SysVoiceSetActivity"
+        <activity android:name="com.wdkl.callingmainnursemanager.ui.activity.SysVoiceSetActivity"
             android:screenOrientation="landscape"></activity>
-        <activity android:name=".ui.activity.SysLedSetActivity"
+        <activity android:name="com.wdkl.callingmainnursemanager.ui.activity.SysLedSetActivity"
             android:screenOrientation="landscape"></activity>
         <activity
-            android:name="com.wdkl.callingmainnurse.ui.activity.APPUpdateActivity"
+            android:name="com.wdkl.callingmainnursemanager.ui.activity.APPUpdateActivity"
             android:screenOrientation="landscape"
             android:launchMode="singleTop"></activity>
 
@@ -100,7 +100,7 @@
             android:icon="@drawable/ic_launcher"></service>
 
         <receiver
-            android:name=".util.ScreenExtinguishUtil$LightHelpUtil"
+            android:name="com.wdkl.callingmainnursemanager.util.ScreenExtinguishUtil$LightHelpUtil"
             android:enabled="true"
             android:exported="true">
             <intent-filter android:priority="1000">
@@ -111,10 +111,10 @@
             </intent-filter>
         </receiver>
 
-        <service android:name="com.wdkl.callingmainnurse.service.APPService"></service>
+        <service android:name="com.wdkl.callingmainnursemanager.service.APPService"></service>
 
         <service
-            android:name="com.wdkl.callingmainnurse.service.MyAccessibilityService"
+            android:name="com.wdkl.callingmainnursemanager.service.MyAccessibilityService"
             android:label="护士主机智能安装"
             android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
@@ -127,7 +127,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.wdkl.callingmainnurse.fileprovider"
+            android:authorities="com.wdkl.callingmainnursemanager.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 

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

@@ -1,8 +1,10 @@
-package com.wdkl.callingmainnurse;
+package com.wdkl.callingmainnursemanager;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
+import com.wdkl.callingmainnursemanager.R;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse;
+package com.wdkl.callingmainnursemanager;
 
 import android.app.Application;
 import android.content.ComponentName;
@@ -8,11 +8,11 @@ import android.content.ServiceConnection;
 import android.net.wifi.WifiManager;
 import android.os.IBinder;
 
-import com.wdkl.callingmainnurse.entity.UdpEntity;
-import com.wdkl.callingmainnurse.service.APPService;
-import com.wdkl.callingmainnurse.util.ScreenExtinguishUtil;
-import com.wdkl.callingmainnurse.util.UdpHelper;
-import com.wdkl.callingmainnurse.util.anrfcutil.AnrFcExceptionUtil;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.service.APPService;
+import com.wdkl.callingmainnursemanager.util.ScreenExtinguishUtil;
+import com.wdkl.callingmainnursemanager.util.UdpHelper;
+import com.wdkl.callingmainnursemanager.util.anrfcutil.AnrFcExceptionUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 
 import java.util.ArrayList;

app/src/main/java/com/wdkl/callingmainnurse/adapter/AllBroadcastAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -10,9 +10,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.BroadcastEntity;
-import com.wdkl.callingmainnurse.util.UIUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.BroadcastEntity;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/CallListAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -10,10 +10,10 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
-import com.wdkl.callingmainnurse.util.StringUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/CallingQueuingInfoAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.CallingQueuingInfoEntity;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.CallingQueuingInfoEntity;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/DoctorHostAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.DoctorHostEntity;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.DoctorHostEntity;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/DutyDoctorAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
+import com.wdkl.callingmainnursemanager.R;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/DutyNurseAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
+import com.wdkl.callingmainnursemanager.R;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/ImportantMessageAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
+import com.wdkl.callingmainnursemanager.R;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/MedicalHostsAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
+import com.wdkl.callingmainnursemanager.R;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/MedicalHostsCallingQueuingInfoAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -9,8 +9,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.CallingQueuingInfoEntity;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.CallingQueuingInfoEntity;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/MyListViewAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,9 +7,9 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.Mp3Info;
-import com.wdkl.callingmainnurse.util.UIUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.Mp3Info;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/NurseHostAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.NurseHostListInfo;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.NurseHostListInfo;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/SettingAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
+import com.wdkl.callingmainnursemanager.R;
 
 import java.util.List;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/SicknessBedAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -9,10 +9,10 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.RoomEntity;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.RoomEntity;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/SicknessRoomAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -10,12 +10,11 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.RoomEntity;
-import com.wdkl.callingmainnurse.util.LogUtil;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.RoomEntity;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
 
 import org.greenrobot.eventbus.EventBus;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/TimingBroadcastAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -10,9 +10,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.BroadcastEntity;
-import com.wdkl.callingmainnurse.util.UIUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.BroadcastEntity;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/wdkl/callingmainnurse/adapter/TrusteeshipAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.NurseHostListInfo;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.NurseHostListInfo;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/adapter/VoiceMessageAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -11,12 +11,12 @@ import android.widget.TextView;
 
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.util.MediaPlayerManger;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.util.MediaPlayerManger;
 
-import static com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
+import static com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
 
 
 public class VoiceMessageAdapter extends RecyclerArrayAdapter<MessageEntity> {

app/src/main/java/com/wdkl/callingmainnurse/adapter/VoiceMessageListAdapter.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -10,15 +10,12 @@ import android.widget.TextView;
 
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.util.PopupwindowVoiceNoticeUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp;
-
 public class VoiceMessageListAdapter extends RecyclerArrayAdapter<MessageEntity> implements Filterable {
 
     public static final String TAG = "ExcavatorSearchAdapter";
@@ -113,9 +110,9 @@ public class VoiceMessageListAdapter extends RecyclerArrayAdapter<MessageEntity>
             }
             PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList = (ArrayList<MessageEntity>) results.values;
             if (results.count > 0) {// 有结果 // 只是数据的变化
-                mVoiceCustomerShowList.add(0, new MessageEntity());
+                PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList.add(0, new MessageEntity());
                 VoiceMessageListAdapter.this.clear();
-                mVoiceMessageListAdapter.addAll(mVoiceCustomerShowList);
+                mVoiceMessageListAdapter.addAll(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList);
                 textview.setVisibility(View.GONE);
             } else {// 没有结果
                 setDefaultListData(constraint);

app/src/main/java/com/wdkl/callingmainnurse/adapter/VoiceMessageListHolder.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.adapter;
+package com.wdkl.callingmainnursemanager.adapter;
 
 import android.graphics.Color;
 import android.util.DisplayMetrics;
@@ -9,8 +9,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
 
 
 public class VoiceMessageListHolder extends BaseViewHolder<MessageEntity> implements View.OnClickListener {

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.base;
+package com.wdkl.callingmainnursemanager.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.callingmainnurse.util.MLog;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.widget.dialog.LoadingActivityDialog;
-import com.wdkl.callingmainnurse.widget.loading.VaryViewHelperController;
+import com.wdkl.callingmainnursemanager.util.MLog;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.widget.dialog.LoadingActivityDialog;
+import com.wdkl.callingmainnursemanager.widget.loading.VaryViewHelperController;
 import com.zhy.autolayout.AutoLayoutActivity;
 
 import org.greenrobot.eventbus.EventBus;

app/src/main/java/com/wdkl/callingmainnurse/base/BaseFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.base;
+package com.wdkl.callingmainnursemanager.base;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -8,8 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.wdkl.callingmainnurse.widget.dialog.LoadingFragmentDialog;
-import com.wdkl.callingmainnurse.widget.loading.VaryViewHelperController;
+import com.wdkl.callingmainnursemanager.widget.dialog.LoadingFragmentDialog;
+import com.wdkl.callingmainnursemanager.widget.loading.VaryViewHelperController;
 
 import org.greenrobot.eventbus.EventBus;
 

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

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

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

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

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

@@ -1,6 +1,6 @@
-package com.wdkl.callingmainnurse.common;
+package com.wdkl.callingmainnursemanager.common;
 
-import com.wdkl.callingmainnurse.ui.activity.InitActivity;
+import com.wdkl.callingmainnursemanager.ui.activity.InitActivity;
 
 /**
  * Created by xuhuan on 2017/9/13.

app/src/main/java/com/wdkl/callingmainnurse/entity/AllBroadcastEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by xuhuan on 2017/9/5.

app/src/main/java/com/wdkl/callingmainnurse/entity/BroadcastEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by fengxiangqian on 2017/9/28.

app/src/main/java/com/wdkl/callingmainnurse/entity/CallingQueuingInfoEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by xuhuan on 2017/9/15.

app/src/main/java/com/wdkl/callingmainnurse/entity/DoctorHostEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by Administrator on 2017/9/7.

app/src/main/java/com/wdkl/callingmainnurse/entity/FindSongs.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -6,7 +6,7 @@ import android.database.Cursor;
 import android.provider.MediaStore;
 import android.widget.ListView;
 
-import com.wdkl.callingmainnurse.adapter.MyListViewAdapter;
+import com.wdkl.callingmainnursemanager.adapter.MyListViewAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/wdkl/callingmainnurse/entity/HospitalInfoEntity.java

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

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

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

app/src/main/java/com/wdkl/callingmainnurse/entity/MessageEntity.java

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

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by fengxiangqian on 2017/9/13.

app/src/main/java/com/wdkl/callingmainnurse/entity/Mp3Info.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 public class Mp3Info {
     private long id;

app/src/main/java/com/wdkl/callingmainnurse/entity/NurseHostEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by Administrator on 2017/9/7.

app/src/main/java/com/wdkl/callingmainnurse/entity/NurseHostListInfo.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/wdkl/callingmainnurse/entity/RoomEntity.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2017 bejson.com
  */
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/entity/SystemInfoEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by 胡博文 on 2017/11/30.

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

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

app/src/main/java/com/wdkl/callingmainnurse/entity/TimingBroadcastEntity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.entity;
+package com.wdkl.callingmainnursemanager.entity;
 
 /**
  * Created by xuhuan on 2017/9/6.

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

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

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

@@ -1,17 +1,16 @@
-package com.wdkl.callingmainnurse.receive;
+package com.wdkl.callingmainnursemanager.receive;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.util.NetUtil;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.util.NetUtil;
+import com.wdkl.callingmainnursemanager.common.Constants;
 
 import org.greenrobot.eventbus.EventBus;
 
-import static com.wdkl.callingmainnurse.common.Constants.EVENT_INTERNET_STATUS;
-
 public class NetworkConnectChangedReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -20,7 +19,7 @@ public class NetworkConnectChangedReceiver extends BroadcastReceiver {
         if (intent.getAction().equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
             int netWorkState = NetUtil.getNetWorkState(context);
             // 接口回调传过去状态的类型
-            EventBus.getDefault().post(new MessageEvent(netWorkState, EVENT_INTERNET_STATUS));
+            EventBus.getDefault().post(new MessageEvent(netWorkState, Constants.EVENT_INTERNET_STATUS));
         }
     }
 }

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.service;
+package com.wdkl.callingmainnursemanager.service;
 
 import android.app.Service;
 import android.content.Intent;
@@ -6,13 +6,11 @@ import android.os.Binder;
 import android.os.IBinder;
 import android.support.annotation.Nullable;
 
-import com.wdkl.callingmainnurse.MyApplication;
+import com.wdkl.callingmainnursemanager.MyApplication;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.wdkl.callingmainnurse.MyApplication.serialPortUtil;
-
 
 /**
  * Created by Waderson on 2018/01/23.
@@ -58,9 +56,9 @@ public class APPService extends Service {
             @Override
             public void run() {
                 if (MyApplication.HEARTBEAT) {
-                    serialPortUtil.startHeart();
+                    MyApplication.serialPortUtil.startHeart();
                 } else {
-                    serialPortUtil.closeHeart();
+                    MyApplication.serialPortUtil.closeHeart();
                 }
             }
         };

app/src/main/java/com/wdkl/callingmainnurse/service/MyAccessibilityService.java

@@ -1,10 +1,10 @@
-package com.wdkl.callingmainnurse.service;
+package com.wdkl.callingmainnursemanager.service;
 
 import android.accessibilityservice.AccessibilityService;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 
-import com.wdkl.callingmainnurse.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/APPUpdateActivity.java

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

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/InitActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -15,37 +15,36 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.base.BaseActivity;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.util.AutoRebootUtil;
-import com.wdkl.callingmainnurse.util.CutSerialPortUtil;
-import com.wdkl.callingmainnurse.util.DownloadUtil;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.NetUtil;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.TimeUtil;
-import com.wdkl.callingmainnurse.util.ToastUtil;
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
-import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
-import com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.EthernetStatus;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.base.BaseActivity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.util.AutoRebootUtil;
+import com.wdkl.callingmainnursemanager.util.CutSerialPortUtil;
+import com.wdkl.callingmainnursemanager.util.DownloadUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.NetUtil;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.TimeUtil;
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
+import com.wdkl.callingmainnursemanager.util.VoiceManagerUtil;
+import com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.EthernetStatus;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import butterknife.Bind;
 import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingmainnurse.MyApplication.serialPortUtil;
+import static com.wdkl.callingmainnursemanager.MyApplication.serialPortUtil;
 
 /**
  * Created by xuhuan on 2017/8/22.<br></>

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/MainFragmentActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.app.AlarmManager;
 import android.app.FragmentManager;
@@ -26,34 +26,34 @@ import android.widget.TextView;
 
 import com.vvsip.ansip.IVvsipServiceListener;
 import com.vvsip.ansip.VvsipCall;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.receive.NetworkConnectChangedReceiver;
-import com.wdkl.callingmainnurse.ui.fragment.BroadcastFragment;
-import com.wdkl.callingmainnurse.ui.fragment.CallingBedFragment;
-import com.wdkl.callingmainnurse.ui.fragment.CallingHostFragment;
-import com.wdkl.callingmainnurse.ui.fragment.SystemSettingFragment;
-import com.wdkl.callingmainnurse.ui.fragment.TrusteeshipFragment;
-import com.wdkl.callingmainnurse.ui.fragment.VoiceMessageFragment;
-import com.wdkl.callingmainnurse.util.DownloadUtil;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.NetUtil;
-import com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.SipUtil.SipCallBackI;
-import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.TimeUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.util.VoiceMessageRoomWardInformationUtil;
-import com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil;
-import com.wdkl.callingmainnurse.widget.VoiceMessageDetailPopupwindow;
-import com.wdkl.callingmainnurse.widget.VoiceMessagePopupwindow;
-import com.wdkl.callingmainnurse.widget.dialog.CallingPopUpWindow;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.receive.NetworkConnectChangedReceiver;
+import com.wdkl.callingmainnursemanager.ui.fragment.BroadcastFragment;
+import com.wdkl.callingmainnursemanager.ui.fragment.CallingBedFragment;
+import com.wdkl.callingmainnursemanager.ui.fragment.CallingHostFragment;
+import com.wdkl.callingmainnursemanager.ui.fragment.SystemSettingFragment;
+import com.wdkl.callingmainnursemanager.ui.fragment.TrusteeshipFragment;
+import com.wdkl.callingmainnursemanager.ui.fragment.VoiceMessageFragment;
+import com.wdkl.callingmainnursemanager.util.DownloadUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.NetUtil;
+import com.wdkl.callingmainnursemanager.util.PopupwindowVoiceNoticeUtil;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.SipUtil.SipCallBackI;
+import com.wdkl.callingmainnursemanager.util.SipUtil.SipHelperUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.TimeUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.util.VoiceMessageRoomWardInformationUtil;
+import com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil;
+import com.wdkl.callingmainnursemanager.widget.VoiceMessageDetailPopupwindow;
+import com.wdkl.callingmainnursemanager.widget.VoiceMessagePopupwindow;
+import com.wdkl.callingmainnursemanager.widget.dialog.CallingPopUpWindow;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -69,14 +69,11 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingmainnurse.common.Constants.ETHERNETSTATUS;
-import static com.wdkl.callingmainnurse.common.Constants.EVENT_MGR_RESET;
-import static com.wdkl.callingmainnurse.common.Constants.EVENT_SIP_INTERNETPING;
-import static com.wdkl.callingmainnurse.common.Constants.TRUST_OLD_MAIN_ID;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.showVoiceMessageWindow;
-import static com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
+import static com.wdkl.callingmainnursemanager.common.Constants.ETHERNETSTATUS;
+import static com.wdkl.callingmainnursemanager.common.Constants.EVENT_MGR_RESET;
+import static com.wdkl.callingmainnursemanager.common.Constants.EVENT_SIP_INTERNETPING;
+import static com.wdkl.callingmainnursemanager.common.Constants.TRUST_OLD_MAIN_ID;
+import static com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
 
 public class MainFragmentActivity extends FragmentActivity implements IVvsipServiceListener, SipCallBackI {
 
@@ -266,7 +263,7 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
         circulationCheckNetworkStatus();
         //语音留言数据
         PopupwindowVoiceNoticeUtil.initialModelVoiceList(this);
-        mVoiceCustomerShowListTemp.addAll(mVoiceCustomerShowList);
+        PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.addAll(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowList);
     }
 
     @Override
@@ -968,17 +965,17 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
         if (messageEntity != null && messageEntity.getIndexes().equals("MGR_VOICEMESSAGE")) {
 
             messageEntity.setRoomBedNum(VoiceMessageRoomWardInformationUtil.getInstance().getRoomWard(messageEntity.getPatientID()));
-            for (int i = 0; i < mVoiceCustomerShowListTemp.size(); i++) {
+            for (int i = 0; i < PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.size(); i++) {
 
-                MessageEntity messageEntity1 = mVoiceCustomerShowListTemp.get(i);
+                MessageEntity messageEntity1 = PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.get(i);
                 if (messageEntity1.getPatientID().equals(messageEntity.getPatientID()) && messageEntity1.getPatientName().equals(messageEntity.getPatientName())) {
                     if (!messageEntity.getDeviceType().equals("0")) {//护士主机不展示提示
                         messageEntity1.setMessageNum(String.valueOf(Integer.valueOf(messageEntity1.getMessageNum()) + 1));
                         if (PopupwindowVoiceNoticeUtil.refreshInformationNumber(messageEntity1)) {
-                            showVoiceMessageWindow(messageEntity1);
+                            PopupwindowVoiceNoticeUtil.showVoiceMessageWindow(messageEntity1);
                         } else {
                             messageEntity1.setMessageNum("1");
-                            showVoiceMessageWindow(messageEntity1);
+                            PopupwindowVoiceNoticeUtil.showVoiceMessageWindow(messageEntity1);
                         }
                     }
                     return;
@@ -986,18 +983,18 @@ public class MainFragmentActivity extends FragmentActivity implements IVvsipServ
                 }
             }
             {       //排序倒序
-                if (mVoiceCustomerShowListTemp.size() == 0) {//调整为0
-                    mVoiceCustomerShowListTemp.add(messageEntity);//展示数据
+                if (PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.size() == 0) {//调整为0
+                    PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.add(messageEntity);//展示数据
                 } else {
-                    mVoiceCustomerShowListTemp.add(0, messageEntity);//展示数据
+                    PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.add(0, messageEntity);//展示数据
                 }
-                for (MessageEntity messageE : mVoiceCustomerShowListTemp) {
+                for (MessageEntity messageE : PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp) {
                     if (PopupwindowVoiceNoticeUtil.mVoiceMessagePopupwindowHashMap.get(messageE.getPatientID() + messageE.getPatientName()) == null) {
                         PopupwindowVoiceNoticeUtil.mVoiceMessagePopupwindowHashMap.put(messageE.getPatientID() + messageE.getPatientName()
                                 , new VoiceMessagePopupwindow(this, new View(this), VoiceMessagePopupwindow.ATPARENT_TOP, false));
                     }
                 }
-                showVoiceMessageWindow(messageEntity);
+                PopupwindowVoiceNoticeUtil.showVoiceMessageWindow(messageEntity);
             }
         }
 

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/SysBrightSetActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
@@ -7,13 +7,13 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.base.BaseActivity;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
-import com.wdkl.callingmainnurse.util.ScreenManagerUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.base.BaseActivity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
+import com.wdkl.callingmainnursemanager.util.ScreenManagerUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/SysCallingVolSetActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
@@ -6,17 +6,17 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.base.BaseActivity;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.base.BaseActivity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.SipUtil.SipHelperUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.VoiceManagerUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -29,8 +29,6 @@ import org.json.JSONObject;
 import butterknife.Bind;
 import okhttp3.Call;
 
-import static com.wdkl.callingmainnurse.util.VoiceManagerUtil.getCallMax;
-
 /**
  * Created by 胡博文 on 2017/12/5.
  */

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/SysLedSetActivity.java

@@ -1,16 +1,16 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.base.BaseActivity;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
-import com.wdkl.callingmainnurse.util.StringUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.base.BaseActivity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 

app/src/main/java/com/wdkl/callingmainnurse/ui/activity/SysVoiceSetActivity.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.activity;
+package com.wdkl.callingmainnursemanager.ui.activity;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -14,18 +14,17 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.base.BaseActivity;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
-import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.base.BaseActivity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
+import com.wdkl.callingmainnursemanager.util.VoiceManagerUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -38,8 +37,6 @@ import org.json.JSONObject;
 import butterknife.Bind;
 import okhttp3.Call;
 
-import static com.wdkl.callingmainnurse.util.VoiceManagerUtil.getSystemMax;
-
 public class SysVoiceSetActivity extends BaseActivity {
 
     //声音设置的seekBar

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/BroadcastFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -24,24 +24,24 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.AllBroadcastAdapter;
-import com.wdkl.callingmainnurse.adapter.TimingBroadcastAdapter;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.BroadcastEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.util.FtpUtil;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.MediaPlayerManger;
-import com.wdkl.callingmainnurse.util.NetUtil;
-import com.wdkl.callingmainnurse.util.PalyPhonetics;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.ToastUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
-import com.wdkl.callingmainnurse.widget.record.RecordPlayer;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.AllBroadcastAdapter;
+import com.wdkl.callingmainnursemanager.adapter.TimingBroadcastAdapter;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.BroadcastEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.util.FtpUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.MediaPlayerManger;
+import com.wdkl.callingmainnursemanager.util.NetUtil;
+import com.wdkl.callingmainnursemanager.util.PalyPhonetics;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
+import com.wdkl.callingmainnursemanager.widget.record.RecordPlayer;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -62,9 +62,9 @@ import butterknife.ButterKnife;
 import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingmainnurse.common.Constants.ETHERNETSTATUS;
-import static com.wdkl.callingmainnurse.common.Constants.MYSELF_ID;
-import static com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
+import static com.wdkl.callingmainnursemanager.common.Constants.ETHERNETSTATUS;
+import static com.wdkl.callingmainnursemanager.common.Constants.MYSELF_ID;
+import static com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.WifiHotBindSipStatusConnectorUtil.ethernetStatus;
 
 /**
  * Created by xuhuan on 2017/8/23.

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingBedFragment.java

@@ -1,8 +1,6 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.annotation.SuppressLint;
-import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -27,52 +25,49 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.CallListAdapter;
-import com.wdkl.callingmainnurse.adapter.CallingQueuingInfoAdapter;
-import com.wdkl.callingmainnurse.adapter.DutyDoctorAdapter;
-import com.wdkl.callingmainnurse.adapter.DutyNurseAdapter;
-import com.wdkl.callingmainnurse.adapter.ImportantMessageAdapter;
-import com.wdkl.callingmainnurse.adapter.SicknessBedAdapter;
-import com.wdkl.callingmainnurse.adapter.SicknessRoomAdapter;
-import com.wdkl.callingmainnurse.adapter.VoiceMessageAdapter;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.CallingQueuingInfoEntity;
-import com.wdkl.callingmainnurse.entity.HospitalInfoEntity;
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.RoomEntity;
-import com.wdkl.callingmainnurse.entity.SystemInfoEntity;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
-import com.wdkl.callingmainnurse.ui.activity.MainFragmentActivity;
-import com.wdkl.callingmainnurse.ui.activity.SysCallingVolSetActivity;
-import com.wdkl.callingmainnurse.util.ListComparatorUtil;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.PalyPhonetics;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.SipUtil.SipHelperUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.ToastUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
-import com.wdkl.callingmainnurse.util.VoiceManagerUtil;
-import com.wdkl.callingmainnurse.util.VoiceMessageRoomWardInformationUtil;
-import com.wdkl.callingmainnurse.widget.dialog.UrgentPopupwindow;
-import com.wdkl.callingmainnurse.widget.view.GridSpacingItemDecoration;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.CallListAdapter;
+import com.wdkl.callingmainnursemanager.adapter.CallingQueuingInfoAdapter;
+import com.wdkl.callingmainnursemanager.adapter.DutyDoctorAdapter;
+import com.wdkl.callingmainnursemanager.adapter.DutyNurseAdapter;
+import com.wdkl.callingmainnursemanager.adapter.ImportantMessageAdapter;
+import com.wdkl.callingmainnursemanager.adapter.SicknessBedAdapter;
+import com.wdkl.callingmainnursemanager.adapter.SicknessRoomAdapter;
+import com.wdkl.callingmainnursemanager.adapter.VoiceMessageAdapter;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.CallingQueuingInfoEntity;
+import com.wdkl.callingmainnursemanager.entity.HospitalInfoEntity;
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.RoomEntity;
+import com.wdkl.callingmainnursemanager.entity.SystemInfoEntity;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.ui.activity.MainFragmentActivity;
+import com.wdkl.callingmainnursemanager.util.ListComparatorUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.PalyPhonetics;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
+import com.wdkl.callingmainnursemanager.util.VoiceManagerUtil;
+import com.wdkl.callingmainnursemanager.util.VoiceMessageRoomWardInformationUtil;
+import com.wdkl.callingmainnursemanager.widget.dialog.UrgentPopupwindow;
+import com.wdkl.callingmainnursemanager.widget.view.GridSpacingItemDecoration;
+import com.wdkl.callingmainnursemanager.util.PopupwindowVoiceNoticeUtil;
 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.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -80,14 +75,13 @@ import butterknife.OnClick;
 import okhttp3.Call;
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingmainnurse.common.Constants.DOOR_CALL;
-import static com.wdkl.callingmainnurse.common.Constants.FTP_VOICE;
-import static com.wdkl.callingmainnurse.util.FtpUtil.ftpFilePath;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow;
-import static com.wdkl.callingmainnurse.util.StringUtils.notEmpty;
-import static com.wdkl.callingmainnurse.util.ToastUtil.showToast;
-import static com.wdkl.callingmainnurse.widget.VoiceMessageRecordPopupwindow.fileOriginalName;
-import static com.wdkl.callingmainnurse.widget.VoiceMessageRecordPopupwindow.getCurrentDate;
+import static com.wdkl.callingmainnursemanager.common.Constants.DOOR_CALL;
+import static com.wdkl.callingmainnursemanager.common.Constants.FTP_VOICE;
+import static com.wdkl.callingmainnursemanager.util.FtpUtil.ftpFilePath;
+import static com.wdkl.callingmainnursemanager.util.StringUtils.notEmpty;
+import static com.wdkl.callingmainnursemanager.util.ToastUtil.showToast;
+import static com.wdkl.callingmainnursemanager.widget.VoiceMessageRecordPopupwindow.fileOriginalName;
+import static com.wdkl.callingmainnursemanager.widget.VoiceMessageRecordPopupwindow.getCurrentDate;
 
 /**
  * Created by xuhuan  on 2017/8/23 <br></>
@@ -537,6 +531,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         initRecyclerManager();
         //初始化病房数据
         getRoomData();
+        //getRoomTestData();
         //获得医院信息
         getHospitalData();
         //初始化排队信息栏数据
@@ -651,7 +646,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 loopVoice.setPalyDismiss(true);
             }
         } else {
-            for (int i=0; i<PalyPhonetics.speakEntityList.size(); i++) {//将播报列表也删除该元素 两种实体格式不一样，所以要用循环
+            for (int i = 0; i< PalyPhonetics.speakEntityList.size(); i++) {//将播报列表也删除该元素 两种实体格式不一样，所以要用循环
                 if(PalyPhonetics.speakEntityList.get(i).equals(deleteEntity)) {
                     PalyPhonetics.speakEntityList.remove(i);
                 }
@@ -682,13 +677,13 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         }
         RoomEntity entity = new RoomEntity();
         ArrayList<RoomEntity.WardInformation> wardInformations = new ArrayList<>();
-        for (int i = 0; i < 50; i++) {
+        for (int i = 0; i < 200; i++) {
             ArrayList<RoomEntity.WardInformation.SickbedInformation> sickbedInformations = new ArrayList<>();
             RoomEntity.WardInformation wardInfo = new RoomEntity.WardInformation();
             wardInfo.setRoomNum("" + i);
-            for (int j = 0; j < 5; j++) {
+            for (int j = 0; j < 2; j++) {
                 RoomEntity.WardInformation.SickbedInformation sickBedInfo = new RoomEntity.WardInformation.SickbedInformation();
-                int bedNum = i*5 + j;
+                int bedNum = i*2 + j;
                 sickBedInfo.setBedNum("" + bedNum);
                 sickBedInfo.setPatientName("" + bedNum);
                 sickbedInformations.add(sickBedInfo);
@@ -1280,7 +1275,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
         } else {
             if (!Constants.CALL_STATE.equals(Constants.STANDBY)) return;
             if (MyApplication.callEntityList.get(position).getType().equals(Constants.WSHROOM_CALL)) {
-                showToast("不支持卫生间通话");
+                ToastUtil.showToast("不支持卫生间通话");
                 vRightCallListInfo.setVisibility(View.GONE);
                 vRightPatientInfo.setVisibility(View.VISIBLE);
                 vRightCallInfo.setVisibility(View.GONE);
@@ -1289,7 +1284,7 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
                 //tvCallListRoomMsg.setText(MyApplication.callEntityList.get(position).getRoomNumber() + "房卫生间紧急呼叫");
                 return;
             } else if (MyApplication.callEntityList.get(position).getType().equals(Constants.ROOMHELP_CALL)) {
-                showToast("不支持紧急增援通话");
+                ToastUtil.showToast("不支持紧急增援通话");
                 vRightCallListInfo.setVisibility(View.GONE);
                 vRightPatientInfo.setVisibility(View.VISIBLE);
                 vRightCallInfo.setVisibility(View.GONE);
@@ -1535,16 +1530,16 @@ public class CallingBedFragment extends BaseFragment implements SicknessBedAdapt
      */
     private void sendUdpVoiceMessage(String fileName) {
         MessageEntity messageEntity = new MessageEntity();
-        messageEntity.setHosManInfo(mVoiceMessageDetailPopupwindow.getMessageEntity().getHosManInfo());
+        messageEntity.setHosManInfo(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getHosManInfo());
         messageEntity.setDeviceType(VoiceMessageAdapter.CHAT_ITEM_TYPE_RIGHT + "");
-        messageEntity.setDeviceID(mVoiceMessageDetailPopupwindow.getMessageEntity().getDeviceID());
-        messageEntity.setPatientID(mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientID());
-        messageEntity.setPatientName(mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientName());
+        messageEntity.setDeviceID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getDeviceID());
+        messageEntity.setPatientID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientID());
+        messageEntity.setPatientName(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getPatientName());
         messageEntity.setFileOriginalName(fileName);
         messageEntity.setFileStoreName(fileName);
         messageEntity.setMessageTime(getCurrentDate());
         messageEntity.setContent("");
-        messageEntity.setID(mVoiceMessageDetailPopupwindow.getMessageEntity().getID());
+        messageEntity.setID(PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.getMessageEntity().getID());
         UdpSendUtil.sendVoiceMessage(messageEntity);
     }
 

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/CallingHostFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -16,21 +16,22 @@ import android.widget.TextView;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.DoctorHostAdapter;
-import com.wdkl.callingmainnurse.adapter.DutyDoctorAdapter;
-import com.wdkl.callingmainnurse.adapter.DutyNurseAdapter;
-import com.wdkl.callingmainnurse.adapter.MedicalHostsCallingQueuingInfoAdapter;
-import com.wdkl.callingmainnurse.adapter.NurseHostAdapter;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.CallingQueuingInfoEntity;
-import com.wdkl.callingmainnurse.entity.DoctorHostEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.NurseHostListInfo;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.UIUtils;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.DoctorHostAdapter;
+import com.wdkl.callingmainnursemanager.adapter.DutyDoctorAdapter;
+import com.wdkl.callingmainnursemanager.adapter.DutyNurseAdapter;
+import com.wdkl.callingmainnursemanager.adapter.MedicalHostsCallingQueuingInfoAdapter;
+import com.wdkl.callingmainnursemanager.adapter.NurseHostAdapter;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.CallingQueuingInfoEntity;
+import com.wdkl.callingmainnursemanager.entity.DoctorHostEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.NurseHostListInfo;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -40,14 +41,13 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import okhttp3.Call;
 
-import static com.wdkl.callingmainnurse.util.StringUtils.notEmpty;
-import static com.wdkl.callingmainnurse.util.ToastUtil.showToast;
+import static com.wdkl.callingmainnursemanager.util.StringUtils.notEmpty;
+import static com.wdkl.callingmainnursemanager.util.ToastUtil.showToast;
 
 /**
  * Created by xuhuan on 2017/8/23.<br></>
@@ -434,7 +434,7 @@ public class CallingHostFragment extends BaseFragment implements DoctorHostAdapt
                 entity.setChecked(false);
             }
             doctorHostList.get(position).setChecked(true);
-            showToast("该功能还在开发中...");
+            ToastUtil.showToast("该功能还在开发中...");
         }
         doctorHostAdapter.notifyDataSetChanged();
     }

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/SystemSettingFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -15,20 +15,20 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.SettingAdapter;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.ui.activity.SysBrightSetActivity;
-import com.wdkl.callingmainnurse.ui.activity.SysCallingVolSetActivity;
-import com.wdkl.callingmainnurse.ui.activity.SysLedSetActivity;
-import com.wdkl.callingmainnurse.ui.activity.SysVoiceSetActivity;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.TimeUtil;
-import com.wdkl.callingmainnurse.util.ToastUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.widget.view.NumberKeyboardView;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.SettingAdapter;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.ui.activity.SysBrightSetActivity;
+import com.wdkl.callingmainnursemanager.ui.activity.SysCallingVolSetActivity;
+import com.wdkl.callingmainnursemanager.ui.activity.SysLedSetActivity;
+import com.wdkl.callingmainnursemanager.ui.activity.SysVoiceSetActivity;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.TimeUtil;
+import com.wdkl.callingmainnursemanager.util.ToastUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.widget.view.NumberKeyboardView;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/TrusteeshipFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -17,25 +17,25 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.google.gson.Gson;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.TrusteeshipAdapter;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.NurseHostListInfo;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
-import com.wdkl.callingmainnurse.ui.activity.MainFragmentActivity;
-import com.wdkl.callingmainnurse.util.AnalysisUdpUtil;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.NetUtil;
-import com.wdkl.callingmainnurse.util.SharedPreferencesUtil;
-import com.wdkl.callingmainnurse.util.StringUtils;
-import com.wdkl.callingmainnurse.util.TimeUtil;
-import com.wdkl.callingmainnurse.util.TrustToastTextUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.util.UdpSendUtil;
-import com.wdkl.callingmainnurse.widget.dialog.CallingPopUpWindow;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.TrusteeshipAdapter;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.NurseHostListInfo;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.ui.activity.MainFragmentActivity;
+import com.wdkl.callingmainnursemanager.util.AnalysisUdpUtil;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.NetUtil;
+import com.wdkl.callingmainnursemanager.util.SharedPreferencesUtil;
+import com.wdkl.callingmainnursemanager.util.StringUtils;
+import com.wdkl.callingmainnursemanager.util.TimeUtil;
+import com.wdkl.callingmainnursemanager.util.TrustToastTextUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.util.UdpSendUtil;
+import com.wdkl.callingmainnursemanager.widget.dialog.CallingPopUpWindow;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.StringCallback;
 
@@ -52,14 +52,11 @@ import butterknife.Bind;
 import butterknife.ButterKnife;
 import okhttp3.Call;
 
-import static com.wdkl.callingmainnurse.common.Constants.CALLMAIN_ID;
-import static com.wdkl.callingmainnurse.common.Constants.INITTRUST;
-import static com.wdkl.callingmainnurse.common.Constants.MYSELF_ID;
-import static com.wdkl.callingmainnurse.common.Constants.TRUST_FLAG_VALUE;
-import static com.wdkl.callingmainnurse.common.Constants.trustStatused;
-import static com.wdkl.callingmainnurse.util.AnalysisUdpUtil.udpEntitys;
-import static com.wdkl.callingmainnurse.util.TrustToastTextUtil.mTrustingNoticeOne;
-import static com.wdkl.callingmainnurse.util.TrustToastTextUtil.mTrustingNoticeTwo;
+import static com.wdkl.callingmainnursemanager.common.Constants.CALLMAIN_ID;
+import static com.wdkl.callingmainnursemanager.common.Constants.INITTRUST;
+import static com.wdkl.callingmainnursemanager.common.Constants.MYSELF_ID;
+import static com.wdkl.callingmainnursemanager.common.Constants.TRUST_FLAG_VALUE;
+import static com.wdkl.callingmainnursemanager.common.Constants.trustStatused;
 
 /**
  * Created by xuhuan on 2017/8/23.
@@ -284,7 +281,7 @@ public class TrusteeshipFragment extends BaseFragment implements TrusteeshipAdap
                                             }
                                         }
                                         trusteeshipAdapter.updateList(trusteeshipEntityList, initdataentity.getId());
-                                        if (udpEntitys != null && udpEntitys.getShowText().equals("护士主机托管护士主机")) {
+                                        if (AnalysisUdpUtil.udpEntitys != null && AnalysisUdpUtil.udpEntitys.getShowText().equals("护士主机托管护士主机")) {
                                             udpReceive();
 
                                         }
@@ -424,11 +421,11 @@ public class TrusteeshipFragment extends BaseFragment implements TrusteeshipAdap
         switch (view.getId()) {
             case R.id.fragment_btn_request_trusteeship://请求托管（主机一）=======================================
                 if (!mIsClick) {
-                    tvQuestTp.setText(mTrustingNoticeOne);
+                    tvQuestTp.setText(TrustToastTextUtil.mTrustingNoticeOne);
                     return;
                 }
                 if (initdataentity.getId().equals(trusteeshipEntityList.get(position).getId())) {
-                    tvQuestTp.setText(mTrustingNoticeTwo);
+                    tvQuestTp.setText(TrustToastTextUtil.mTrustingNoticeTwo);
                     return;
                 }
                 if (trusteeshipEntityList.get(position).getDeviceHostingID().contains("#")) {
@@ -594,7 +591,7 @@ public class TrusteeshipFragment extends BaseFragment implements TrusteeshipAdap
      */
     public void udpReceive() {
         //接收参数
-        mUdpEntityInfo = udpEntitys;
+        mUdpEntityInfo = AnalysisUdpUtil.udpEntitys;
         switch (mUdpEntityInfo.getIndexes()) {
             case "deposit_1":
                 //-------------------------------------------------------------------------------------------------------//主机二：接收主机一的托管请求

app/src/main/java/com/wdkl/callingmainnurse/ui/fragment/VoiceMessageFragment.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.ui.fragment;
+package com.wdkl.callingmainnursemanager.ui.fragment;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -15,17 +15,18 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.jude.easyrecyclerview.EasyRecyclerView;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.adapter.VoiceMessageListAdapter;
-import com.wdkl.callingmainnurse.adapter.VoiceMessageListHolder;
-import com.wdkl.callingmainnurse.base.BaseFragment;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil;
-import com.wdkl.callingmainnurse.util.UIUtils;
-import com.wdkl.callingmainnurse.widget.VoiceMessageDetailPopupwindow;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.adapter.VoiceMessageListAdapter;
+import com.wdkl.callingmainnursemanager.adapter.VoiceMessageListHolder;
+import com.wdkl.callingmainnursemanager.base.BaseFragment;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.PopupwindowVoiceNoticeUtil;
+import com.wdkl.callingmainnursemanager.util.UIUtils;
+import com.wdkl.callingmainnursemanager.widget.VoiceMessageDetailPopupwindow;
+import com.wdkl.callingmainnursemanager.widget.view.GridSpacingItemDecoration;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -36,9 +37,6 @@ import java.util.HashMap;
 import butterknife.Bind;
 import butterknife.ButterKnife;
 
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp;
-import static com.wdkl.callingmainnurse.util.PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow;
-
 /**
  * Created by xuhuan  on 2017/8/23 <br></>
  * Changed by Waderson on 2017/11/01
@@ -117,7 +115,7 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
         voiceMessageListAdapter = new VoiceMessageListAdapter(getActivity(), tvVoiceMessageNothingSearchResult);
         final GridLayoutManager gridLayoutRoomManager = new GridLayoutManager(getActivity(), 9, GridLayoutManager.VERTICAL, false);
         rvVoiceMessage.setLayoutManager(gridLayoutRoomManager);
-        rvVoiceMessage.addItemDecoration(new com.wdkl.callingmainnurse.widget.view.GridSpacingItemDecoration(9, 13, true));
+        rvVoiceMessage.addItemDecoration(new GridSpacingItemDecoration(9, 13, true));
         voiceMessageListAdapter.setVoiceMessageListItemOnClickListener(this);
         rvVoiceMessage.setAdapter(voiceMessageListAdapter);
 
@@ -154,9 +152,9 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
     @Override
     public void onResume() {
         super.onResume();
-        if (!mVoiceCustomerShowListTemp.isEmpty()) {
+        if (!PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.isEmpty()) {
             voiceMessageListAdapter.clear();
-            voiceMessageListAdapter.addAll(mVoiceCustomerShowListTemp);
+            voiceMessageListAdapter.addAll(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp);
         }
     }
 
@@ -238,7 +236,7 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
             {
                 if (!messageEntity.getDeviceType().equals("0")) {
                     voiceMessageListAdapter.clear();
-                    voiceMessageListAdapter.addAll(mVoiceCustomerShowListTemp);
+                    voiceMessageListAdapter.addAll(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp);
 
                 } else {
                     switch (VoiceMessageListAdapter.selectFilterDataList()) {
@@ -253,7 +251,7 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
                             break;
                         default:
                             voiceMessageListAdapter.clear();
-                            voiceMessageListAdapter.addAll(mVoiceCustomerShowListTemp);
+                            voiceMessageListAdapter.addAll(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp);
                             break;
                     }
                 }
@@ -291,7 +289,7 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
         //选择的position赋值给参数，
         voiceMessageListAdapter.notifyDataSetChanged();
         imgVoiceMessageSearch.setVisibility(View.GONE);
-        showVoiceMessageDetailWindow(mVoiceCustomerShowListTemp.get(position));
+        showVoiceMessageDetailWindow(PopupwindowVoiceNoticeUtil.mVoiceCustomerShowListTemp.get(position));
 
     }
 
@@ -304,15 +302,15 @@ public class VoiceMessageFragment extends BaseFragment implements VoiceMessageLi
         if (null == messageEntity) {
             return;
         }
-        if (mVoiceMessageDetailPopupwindow != null && mVoiceMessageDetailPopupwindow.checkWindowHaveShow()) {
+        if (PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow != null && PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.checkWindowHaveShow()) {
             return;
         }
-        mVoiceMessageDetailPopupwindow = new VoiceMessageDetailPopupwindow(getActivity(), messageEntity, null, VoiceMessageDetailPopupwindow.ATPARENT_TOP, false);
-        mVoiceMessageDetailPopupwindow.setAnimation(R.style.DialogIOSAnimation);
-        mVoiceMessageDetailPopupwindow.show();
+        PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow = new VoiceMessageDetailPopupwindow(getActivity(), messageEntity, null, VoiceMessageDetailPopupwindow.ATPARENT_TOP, false);
+        PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.setAnimation(R.style.DialogIOSAnimation);
+        PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.show();
 
-        if (mVoiceMessageDetailPopupwindow.checkWindowHaveShow()) {
-            mVoiceMessageDetailPopupwindow.refreshMessageEntityLeft(messageEntity);
+        if (PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.checkWindowHaveShow()) {
+            PopupwindowVoiceNoticeUtil.mVoiceMessageDetailPopupwindow.refreshMessageEntityLeft(messageEntity);
         }
 
     }

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -6,20 +6,20 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.entity.SystemSetEntity;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
-import com.wdkl.callingmainnurse.ui.activity.InitActivity;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.entity.SystemSetEntity;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.ui.activity.InitActivity;
 
 import org.greenrobot.eventbus.EventBus;
 
 import serialporttest.utils.SerialPortUtil;
 
-import static com.wdkl.callingmainnurse.common.Constants.MYSELF_ID;
-import static com.wdkl.callingmainnurse.common.Constants.TRUST_FLAG_VALUE;
+import static com.wdkl.callingmainnursemanager.common.Constants.MYSELF_ID;
+import static com.wdkl.callingmainnursemanager.common.Constants.TRUST_FLAG_VALUE;
 
 /**
  * Created by 胡博文 on 2017/10/18.

app/src/main/java/com/wdkl/callingmainnurse/util/AudioRecoderUtils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 import android.media.MediaRecorder;

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

@@ -1,14 +1,14 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemProperties;
 import android.util.Log;
 
-import serialporttest.utils.SerialPortUtil;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.ui.activity.InitActivity;
 
-import static com.wdkl.callingmainnurse.common.Constants.NET_ERROR_FIVE_AFTER_TOAST;
-import static com.wdkl.callingmainnurse.ui.activity.InitActivity.closeHeart;
+import serialporttest.utils.SerialPortUtil;
 
 public class AutoRebootUtil {
 
@@ -19,7 +19,7 @@ public class AutoRebootUtil {
     public static void reboot(Context context) {
         if (!sys_Reset) {
             sys_Reset = true;
-            closeHeart();//关闭心跳
+            InitActivity.closeHeart();//关闭心跳
             Intent intent = new Intent(Intent.ACTION_REBOOT);
             intent.putExtra("nowait", 1);
             intent.putExtra("interval", 1);
@@ -30,7 +30,7 @@ public class AutoRebootUtil {
     public static void shutdown(Context context) {
         if (!sys_Shutdown) {
             sys_Shutdown = true;
-            closeHeart();//关闭心跳
+            InitActivity.closeHeart();//关闭心跳
             Intent intent = new Intent(Intent.ACTION_SHUTDOWN);
             intent.putExtra("nowait", 1);
             intent.putExtra("interval", 1);
@@ -43,7 +43,7 @@ public class AutoRebootUtil {
     public static void reboot() {
         if (!sys_Reset) {
             sys_Reset = true;
-            closeHeart();
+            InitActivity.closeHeart();
             try {
                 if (SerialPortUtil.systemVersionIsO()) {// android8.1 //wuyq modify
                     SystemProperties.set("persist.sys.reboot", "1");
@@ -74,7 +74,7 @@ public class AutoRebootUtil {
     public static void shutdown() {
         if (!sys_Shutdown) {
             sys_Shutdown = true;
-            closeHeart();
+            InitActivity.closeHeart();
             try {
                 if (SerialPortUtil.systemVersionIsO()) {// android8.1 //wuyq modify
                     SystemProperties.set("persist.sys.shutdown", "1");
@@ -119,11 +119,11 @@ public class AutoRebootUtil {
     }
 
     public static void rebootContinueCounts(Context c, int counts) {
-        SharedPreferencesUtil.putStringSp(c, NET_ERROR_FIVE_AFTER_TOAST, NET_ERROR_FIVE_AFTER_TOAST, String.valueOf(counts));
+        SharedPreferencesUtil.putStringSp(c, Constants.NET_ERROR_FIVE_AFTER_TOAST, Constants.NET_ERROR_FIVE_AFTER_TOAST, String.valueOf(counts));
     }
 
     public static int getRepeatRebootCounts(Context c) {
-        return StringUtils.parseInt(SharedPreferencesUtil.getStringSp(c, NET_ERROR_FIVE_AFTER_TOAST, NET_ERROR_FIVE_AFTER_TOAST));
+        return StringUtils.parseInt(SharedPreferencesUtil.getStringSp(c, Constants.NET_ERROR_FIVE_AFTER_TOAST, Constants.NET_ERROR_FIVE_AFTER_TOAST));
     }
 
     /**

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

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

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

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

app/src/main/java/com/wdkl/callingmainnurse/util/DiffCallBack.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 /**
  * Created by 胡博文 on 2018/3/22.

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

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

app/src/main/java/com/wdkl/callingmainnurse/util/DownloadUtils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.app.DownloadManager;
 import android.content.BroadcastReceiver;
@@ -122,7 +122,7 @@ public class DownloadUtils {
         if (Build.VERSION.SDK_INT >= 24) {
             File file = new File(filePath);
             //参数1 上下文, 参数2 Provider主机地址 和配置文件中保持一致   参数3  共享的文件
-            Uri apkUri = FileProvider.getUriForFile(mContext, "com.wdkl.callingmainnurse.fileprovider", file);
+            Uri apkUri = FileProvider.getUriForFile(mContext, "com.wdkl.callingmainnursemanager.fileprovider", file);
             //添加这一句表示对目标应用临时授权该Uri所代表的文件
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             intent.setDataAndType(apkUri, "application/vnd.android.package-archive");

app/src/main/java/com/wdkl/callingmainnurse/util/FtpUtil.java

@@ -1,11 +1,11 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
 
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
 
 import org.greenrobot.eventbus.EventBus;
 import org.jibble.simpleftp.SimpleFTP;

app/src/main/java/com/wdkl/callingmainnurse/util/ListComparatorUtil.java

@@ -1,6 +1,6 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
-import com.wdkl.callingmainnurse.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
 
 import java.util.ArrayList;
 import java.util.Collections;

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.util.Log;
 

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -13,7 +13,7 @@ import android.text.TextUtils;
 import android.text.format.Formatter;
 import android.util.Log;
 
-import com.wdkl.callingmainnurse.MyApplication;
+import com.wdkl.callingmainnursemanager.MyApplication;
 
 import java.io.BufferedReader;
 import java.io.IOException;

app/src/main/java/com/wdkl/callingmainnurse/util/PalyPhonetics.java

@@ -1,13 +1,12 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
-import android.media.AudioManager;
 import android.media.MediaPlayer;
 
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
 
 import java.util.ArrayList;
 

app/src/main/java/com/wdkl/callingmainnurse/util/PopupwindowVoiceNoticeUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 import android.media.Ringtone;
@@ -7,17 +7,17 @@ import android.net.Uri;
 import android.view.View;
 import android.widget.PopupWindow;
 
-import com.wdkl.callingmainnurse.MyApplication;
-import com.wdkl.callingmainnurse.R;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.widget.VoiceMessageDetailPopupwindow;
-import com.wdkl.callingmainnurse.widget.VoiceMessagePopupwindow;
+import com.wdkl.callingmainnursemanager.MyApplication;
+import com.wdkl.callingmainnursemanager.R;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.widget.VoiceMessageDetailPopupwindow;
+import com.wdkl.callingmainnursemanager.widget.VoiceMessagePopupwindow;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import static com.wdkl.callingmainnurse.ui.fragment.VoiceMessageFragment.mVoiceLocalPersonShowList;
+import static com.wdkl.callingmainnursemanager.ui.fragment.VoiceMessageFragment.mVoiceLocalPersonShowList;
 
 
 /**

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

@@ -1,11 +1,11 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.wdkl.callingmainnurse.MyApplication;
+import com.wdkl.callingmainnursemanager.MyApplication;
 
 /**
  * 类名称：ReceiverUtil <br>

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
@@ -9,8 +9,6 @@ import android.os.Build;
 import android.os.PowerManager;
 import android.support.annotation.RequiresApi;
 
-import java.lang.ref.WeakReference;
-
 /**
  * Created by dengzhe on 2018/5/7.
  * //===============息屏工具类===============//

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

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

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

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

app/src/main/java/com/wdkl/callingmainnurse/util/SilentInstallUtil.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.util.Log;
 

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

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

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util.SipUtil;
+package com.wdkl.callingmainnursemanager.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.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.MessageEvent;
-import com.wdkl.callingmainnurse.ui.activity.MainFragmentActivity;
-import com.wdkl.callingmainnurse.util.LogUtil;
-import com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus.EthernetWifiCallBackI;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.MessageEvent;
+import com.wdkl.callingmainnursemanager.ui.activity.MainFragmentActivity;
+import com.wdkl.callingmainnursemanager.util.LogUtil;
+import com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus.EthernetWifiCallBackI;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -32,10 +32,6 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.wdkl.callingmainnurse.common.Constants.CALLING_ENDING;
-import static com.wdkl.callingmainnurse.common.Constants.EVENT_SIP_INTERNETPING;
-import static com.wdkl.callingmainnurse.common.Constants.SIP_IP_END;
-
 
 /**
  * Created by dengzhe on 2017/12/18.
@@ -216,24 +212,24 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
 //            LogUtil.i(SipInfoTag, "Sip信息" + sipinfo);
 
             if (msg.what == 22) {//释放资源
-                EventBus.getDefault().post(new MessageEvent(msg.what, EVENT_SIP_INTERNETPING));
+                EventBus.getDefault().post(new MessageEvent(msg.what, Constants.EVENT_SIP_INTERNETPING));
             }
 
             if (sipinfo.contains("200 OK")) {//注册成功
                 sipMessageCounts = MainFragmentActivity.REGISTERCOM;
-                EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERCOM, EVENT_SIP_INTERNETPING));
+                EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERCOM, Constants.EVENT_SIP_INTERNETPING));
                 if (mSipThread != null) {
                     mSipThread.interrupt();
                     mSipThread = null;
                 }
                 if (msg.obj.toString().contains("408")) {//超时
                     sipMessageCounts = MainFragmentActivity.REGISTERFAIL;
-                    EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, EVENT_SIP_INTERNETPING));
+                    EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, Constants.EVENT_SIP_INTERNETPING));
                     sipRegister();
                 }
             } else {//注册失败
                 sipMessageCounts = MainFragmentActivity.REGISTERFAIL;
-                EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, EVENT_SIP_INTERNETPING));
+                EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, Constants.EVENT_SIP_INTERNETPING));
                 if (mSipThread != null) {
                     mSipThread.interrupt();
                     mSipThread = null;
@@ -293,8 +289,8 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
                 try {
                     if (sipService != null && !SipHelperUtil.getInstance(contexts).sipinfo.contains("200 OK") && ethernetS) {//注册正在进行中
                         sipMessageCounts = MainFragmentActivity.REGISTERING;
-                        EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERING, EVENT_SIP_INTERNETPING));
-                        sipService.register(Constants.SIP_IP + SIP_IP_END,
+                        EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERING, Constants.EVENT_SIP_INTERNETPING));
+                        sipService.register(Constants.SIP_IP + Constants.SIP_IP_END,
                                 Constants.SIP_ID, Constants.SIP_PASS_WORD);
 //                    LogUtil.i(SipInfoTag, "Sip地址" + Constants.SIP_IP + SIP_IP_END + "\nSip账号" + Constants.SIP_ID + "\nSip密码" + Constants.SIP_PASS_WORD);
                         handleCount++;
@@ -302,7 +298,7 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
                         LogUtil.e(SipInfoTag, "以太网连接，SIP UI状态刷新为注册中");
                     } else if (sipService != null && SipHelperUtil.getInstance(contexts).sipinfo.contains("200 OK")) {
                         sipMessageCounts = MainFragmentActivity.REGISTERCOM;
-                        EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERCOM, EVENT_SIP_INTERNETPING));
+                        EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERCOM, Constants.EVENT_SIP_INTERNETPING));
                     }
                 } catch (NullPointerException e) {
                     e.printStackTrace();
@@ -360,7 +356,7 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
     public void failUiRefreshSip() {
         if (!ethernetS) {
             sipMessageCounts = MainFragmentActivity.REGISTERFAIL;
-            EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, EVENT_SIP_INTERNETPING));
+            EventBus.getDefault().post(new MessageEvent(MainFragmentActivity.REGISTERFAIL, Constants.EVENT_SIP_INTERNETPING));
             if (mSipThread != null) {
                 mSipThread.interrupt();
                 mSipThread = null;
@@ -405,7 +401,7 @@ public class SipHelperUtil implements EthernetWifiCallBackI {
         if (sipService == null) return;
         VvsipTask sipTask = sipService.getVvsipTask();
         if (sipTask == null) return;
-        VvsipService.getService().mainEndCall(CALLING_ENDING);
+        VvsipService.getService().mainEndCall(Constants.CALLING_ENDING);
         call.stop();
         sipService.setSpeakerModeOff();
         sipService.stopPlayer();

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.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.callingmainnurse.BuildConfig;
+import com.wdkl.callingmainnursemanager.BuildConfig;
 
 import java.io.BufferedReader;
 import java.io.IOException;

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

@@ -1,6 +1,4 @@
-package com.wdkl.callingmainnurse.util;
-
-import android.os.Build;
+package com.wdkl.callingmainnursemanager.util;
 
 import java.io.DataOutputStream;
 import java.io.IOException;

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

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.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.callingmainnurse.MyApplication;
+import com.wdkl.callingmainnursemanager.MyApplication;
 
 /**
  * 类名称：ToastUtil <br>

app/src/main/java/com/wdkl/callingmainnurse/util/TrustToastTextUtil.java

@@ -1,8 +1,8 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 
-import static com.wdkl.callingmainnurse.common.Constants.INITTRUST;
+import static com.wdkl.callingmainnursemanager.common.Constants.INITTRUST;
 
 /**
  * Created by dengzhe on 2018/1/2.

app/src/main/java/com/wdkl/callingmainnurse/util/UIUtils.java

@@ -1,11 +1,11 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 import android.os.Looper;
 import android.view.MotionEvent;
 import android.widget.Toast;
 
-import com.wdkl.callingmainnurse.widget.dialog.CallingPopUpWindow;
+import com.wdkl.callingmainnursemanager.widget.dialog.CallingPopUpWindow;
 
 /**
  * Created by xuhuan on 2017/6/9.

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

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

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

@@ -1,11 +1,11 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.entity.InitDataEntity;
-import com.wdkl.callingmainnurse.entity.MessageEntity;
-import com.wdkl.callingmainnurse.entity.UdpEntity;
+import com.wdkl.callingmainnursemanager.common.Constants;
+import com.wdkl.callingmainnursemanager.entity.InitDataEntity;
+import com.wdkl.callingmainnursemanager.entity.MessageEntity;
+import com.wdkl.callingmainnursemanager.entity.UdpEntity;
 
 /**
  * Created by dengzhe on 2018/4/28.

app/src/main/java/com/wdkl/callingmainnurse/util/Utils.java

@@ -1,4 +1,4 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
 import android.content.Context;
 

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

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

app/src/main/java/com/wdkl/callingmainnurse/util/VoiceMessageRoomWardInformationUtil.java

@@ -1,6 +1,6 @@
-package com.wdkl.callingmainnurse.util;
+package com.wdkl.callingmainnursemanager.util;
 
-import com.wdkl.callingmainnurse.entity.RoomEntity;
+import com.wdkl.callingmainnursemanager.entity.RoomEntity;
 
 import java.util.ArrayList;
 

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

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

app/src/main/java/com/wdkl/callingmainnurse/util/ethernetwifiwithsipconnectstatus/EthernetStatus.java

@@ -1,13 +1,9 @@
-package com.wdkl.callingmainnurse.util.ethernetwifiwithsipconnectstatus;
+package com.wdkl.callingmainnursemanager.util.ethernetwifiwithsipconnectstatus;
 
 import android.net.ethernet.EthernetDevInfo;
 import android.net.ethernet.EthernetManager;
 import android.util.Log;
 
-import com.wdkl.callingmainnurse.common.Constants;
-import com.wdkl.callingmainnurse.util.AutoRebootUtil;
-import com.wdkl.callingmainnurse.util.NetUtil;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

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

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