修改全部背景色

修改接口路径
修改接口名称
添加APP为主界面设置
优化APP获取Mac方式
修改接口请求路径为本地路径

app/src/main/AndroidManifest.xml

@@ -48,6 +48,10 @@
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
+
+                <!-- 设置成主题界面 -->
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 

home/src/main/AndroidManifest.xml

@@ -10,13 +10,13 @@
             android:name=".activity.HomeActivity"
             android:launchMode="singleTask" />
         <activity android:name=".activity.WatchHomeActivity" />
-        <activity android:name=".activity.WatchContractsActivity" />
+        <activity android:name=".activity.WatchContactsActivity" />
         <activity android:name=".activity.WatchCallRecordsActivity" />
         <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioRingingActivity" />
         <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioActivity" />
         <activity android:name=".activity.EventActivity" />
         <activity android:name=".activity.WatchEventDetailActivity"/>
-        <activity android:name=".activity.UserSettingActivity"/>
+        <activity android:name=".activity.WatchUserSettingActivity"/>
         <service android:name="com.starrtc.demo.demo.service.KeepLiveService">
             <intent-filter>
                 <action android:name="com.starrtc.demo.service.KeepLiveService" />

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchContractsActivity.kt

@@ -1,7 +1,6 @@
 package com.wdkl.ncs.android.component.home.activity
 
 import android.content.Intent
-import android.graphics.Color
 import android.util.Log
 import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
@@ -14,7 +13,6 @@ import com.wdkl.ncs.android.component.home.databinding.WatchContactsLayBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.lib.base.BaseActivity
-import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchActivityPresenter
@@ -26,8 +24,8 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 @Router(path = "/watch/contacts")
-class WatchContractsActivity : BaseActivity<WatchActivityPresenter, WatchContactsLayBinding>(), WatchActivityContract.View {
-    var TAG = WatchContractsActivity::class.java.getSimpleName()
+class WatchContactsActivity : BaseActivity<WatchActivityPresenter, WatchContactsLayBinding>(), WatchActivityContract.View {
+    var TAG = WatchContactsActivity::class.java.getSimpleName()
 
     private var page: Int = 1
     private val adapter = WatchContactsItemAdapter(ArrayList())

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHomeActivity.kt

@@ -5,8 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.graphics.Color
-import android.net.ConnectivityManager
-import android.net.wifi.WifiInfo
 import android.net.wifi.WifiManager
 import android.telephony.PhoneStateListener
 import android.telephony.SignalStrength
@@ -26,7 +24,6 @@ import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.wdkl.ncs.android.lib.utils.AppTool
 import com.wdkl.ncs.android.lib.utils.push
-import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
 
@@ -39,7 +36,6 @@ import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.watch_activity_home.*
-import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -168,7 +164,7 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
     override fun onLongClick(p0: View): Boolean {
         when (p0.id) {
             R.id.user_nume_linlyout ->{
-                val intent = Intent(this, UserSettingActivity::class.java)
+                val intent = Intent(this, WatchUserSettingActivity::class.java)
                 startActivity(intent)
             }
         }

home/src/main/code/com/wdkl/ncs/android/component/home/activity/UserSettingActivity.java

@@ -8,7 +8,6 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import com.wdkl.ncs.android.component.home.R;
-import com.wdkl.ncs.android.component.home.util.AppUtils;
 import com.wdkl.ncs.android.component.home.util.NetHelper;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
@@ -16,7 +15,7 @@ import com.wdkl.ncs.android.middleware.tcp.TcpClient;
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceUtil;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 
-public class UserSettingActivity extends Activity {
+public class WatchUserSettingActivity extends Activity {
 
     private TextView tvDeviceId;
     private TextView tvDeviceMac;
@@ -46,7 +45,7 @@ public class UserSettingActivity extends Activity {
                 TcpModel userChangeModel = DeviceUtil.userChange(Integer.parseInt(Constants.Companion.getIds()));
                 TcpClient.getInstance().sendMsg(userChangeModel.toJson());
                 ExtendMethodsKt.showMessage("换班通知发送成功，请等待处理...");
-                UserSettingActivity.this.finish();
+                WatchUserSettingActivity.this.finish();
             }
         });
     }

home/src/main/code/com/wdkl/ncs/android/component/home/di/HomeComponent.kt

@@ -24,7 +24,7 @@ interface HomeComponent {
     //手表
     fun inject(activity: WatchHomeActivity)
 
-    fun inject(activity: WatchContractsActivity)
+    fun inject(activity: WatchContactsActivity)
 
     fun inject(activity: WatchCallRecordsActivity)
 

home/src/main/code/com/wdkl/ncs/android/component/home/util/NetHelper.java

@@ -324,20 +324,20 @@ public class NetHelper {
      * @return String
      */
     public String getMacAddress() {
-        if(Build.VERSION.SDK_INT <= Build.VERSION_CODES.O){//小于安卓8 走这里
+        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.N){//小于安卓7 走这里
             String mac = "";
             try {
-                mac = getLocalMacAddressFromIp();
-                if (TextUtils.isEmpty(mac)) {
-                    mac = getNetworkMac();
-                }
+//                mac = getLocalMacAddressFromIp();
+//                if (TextUtils.isEmpty(mac)) {
+//                    mac = getNetworkMac();
+//                }
                 if (TextUtils.isEmpty(mac)) {
                     mac = tryGetWifiMac();
                 }
             } catch (Exception e) {
             }
             return mac;
-        }else {//大于安卓8走这里
+        }else {//大于等于安卓7走这里
             List<NetworkInterface> interfaces = null;
             try {
                 interfaces = Collections.list(NetworkInterface.getNetworkInterfaces());

home/src/main/res/layout/user_setting_layout.xml

@@ -1,49 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#FFBDC3"
     android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/tv_device_id"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:layout_marginLeft="20dp"
-        android:text="设备ID: --"/>
-
-    <TextView
-        android:id="@+id/tv_device_mac"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
-        android:layout_marginLeft="20dp"
-        android:text="设备MAC: --"/>
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/tv_device_ip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="20dp"
-        android:text="设备IP: --"/>
+        <TextView
+            android:id="@+id/tv_device_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="设备ID: --"
+            android:textSize="16dp" />
 
-    <TextView
-        android:id="@+id/tv_device_user_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginLeft="20dp"
-        android:text="当前用户: 王护士"/>
+        <TextView
+            android:id="@+id/tv_device_mac"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="设备MAC: --"
+            android:textSize="16dp" />
+
+        <TextView
+            android:id="@+id/tv_device_ip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="设备IP: --"
+            android:textSize="16dp" />
+
+        <TextView
+            android:id="@+id/tv_device_user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="当前用户: 王护士"
+            android:textSize="16dp" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/btn_user_change"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
         android:layout_gravity="center_horizontal"
+        android:layout_marginTop="10dp"
         android:background="#00B5DC"
         android:text="换班"
-        android:textColor="@drawable/selector_button_text_color"/>
+        android:textColor="@drawable/selector_button_text_color"
+        android:textSize="16dp" />
 </LinearLayout>

home/src/main/res/layout/watch_activity_call_records.xml

@@ -4,7 +4,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFE6E8">
+        android:background="#FFBDC3">
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/refresh"
@@ -19,7 +19,7 @@
                 android:id="@+id/call_records_recyv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="#FFE6E8"></android.support.v7.widget.RecyclerView>
+                android:background="#FFBDC3"></android.support.v7.widget.RecyclerView>
         </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
         <RelativeLayout

home/src/main/res/layout/watch_activity_event_detail.xml

@@ -3,7 +3,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#FFE6E8">
+    android:background="#FFBDC3">
 
     <LinearLayout
         android:id="@+id/ll_title_name"

home/src/main/res/layout/watch_activity_register.xml

@@ -3,6 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#FFBDC3"
     android:padding="10dp"
     android:orientation="vertical">
     <TextView

home/src/main/res/layout/watch_contacts_lay.xml

@@ -5,7 +5,7 @@
         xmlns:bind="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFE6E8">
+        android:background="#FFBDC3">
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/refresh"

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/ApiManager.kt

@@ -130,37 +130,39 @@ object ApiManager {
          */
         val PASSPORT_API :PassportApi by lazy { apiFactory.createService(PassportApi::class.java, urlManager.device_url) }
 
-        val API_HELLO :HelloApi by lazy { apiFactory.createService(HelloApi::class.java, urlManager.device_url)}
-
+//   =========================================   以下是护士手表相关的  ==========================================================
         /**
-         * 获取用户列表api
+         * 测试api
          */
-        val API_DEVICE :DeviceApi by lazy { apiFactory.createService(DeviceApi::class.java, urlManager.device_url) }
+        val API_HELLO :HelloApi by lazy { apiFactory.createService(HelloApi::class.java, urlManager.device_url)}
+
 
         /**
-         * @Name  API_NurseHome
-         * @Type  API_NurseHome
-         * @Note  通话记录
+         * @Name
+         * @Type  API_RegisterDevice
+         * @Note 获取设备信息和通讯地址
          */
-        val API_CallRecords :WatchCallRecordsFragmentApi by lazy { apiFactory.createService(WatchCallRecordsFragmentApi::class.java, urlManager.device_url)}
-
+        val API_WatchDeviceInfoAndTCPMailingAddress :WatchDeviceInfoAndTCPMailingAddressApi by lazy { apiFactory.createService(WatchDeviceInfoAndTCPMailingAddressApi::class.java, urlManager.device_url)}
 
 
         /**
-         * @Name
-         * @Type  API_RegisterDevice
-         * @Note
+         * 获取用户列表api
          */
-        val API_RegisterDevice :RegisterDeviceApi by lazy { apiFactory.createService(RegisterDeviceApi::class.java, urlManager.device_url)}
+        val API_WatchManageDevice :WatchManageDeviceApi by lazy { apiFactory.createService(WatchManageDeviceApi::class.java, urlManager.device_url) }
 
+        /**
+         * @Name  API_NurseHome
+         * @Type  API_NurseHome
+         * @Note  全部通话记录api
+         */
+        val API_WatchCallRecords :WatchCallRecordsApi by lazy { apiFactory.createService(WatchCallRecordsApi::class.java, urlManager.device_url)}
 
         /**
          * @Name
          * @Type  Api_WatchInitiator
-         * @Note
+         * @Note 获取指定用户呼叫记录
          */
-        val Api_WatchInitiator :WatchInitiatorApi by lazy { apiFactory.createService(WatchInitiatorApi::class.java, urlManager.device_url)}
-
+        val Api_WatchNamedUser :WatchNamedUserApi by lazy { apiFactory.createService(WatchNamedUserApi::class.java, urlManager.device_url)}
 
         /**
          * @Name

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -54,12 +54,12 @@ interface UrlManager {
 private class DevUrlManager : UrlManager{
 
     override val base: String
-        //get() = "http://192.168.1.138"
-        get() = "http://dev.base.wdklian.com"
+        get() = "http://192.168.1.138"
+//        get() = "http://dev.base.wdklian.com"
 
     override val device_url: String
-        get() = "${base}:6005/"
-
+//        get() = "${base}:6005/"
+get() = "${base}:8006/"
     override val basic: String
         get() = "${base}:7002/"
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/WatchCallRecordsFragmentApi.kt

@@ -10,7 +10,7 @@ import retrofit2.http.Query
 /**
  * 获取呼叫记录列表api
  */
-interface WatchCallRecordsFragmentApi{
+interface WatchCallRecordsApi{
 
      @POST("/watch/getInteractionVOByDeviceId")
     fun getCallRecords(@Query("page_no")page_no:Int,@Query("page_size")page_size:Int

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/RegisterDeviceApi.kt

@@ -7,12 +7,12 @@ import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-interface RegisterDeviceApi {
+interface WatchDeviceInfoAndTCPMailingAddressApi {
 
-    @GET("/watch/device/getDeviceByEthMac/{eth_mac}")
-    fun getDeviceMessage(@Path("eth_mac")eth_mac:String): Observable<ResponseBody>
+    @GET("/watch/getDeviceByEthMac/{ethMac}")
+    fun getDeviceMessage(@Path("ethMac")ethMac:String): Observable<ResponseBody>
 
     //tcp服务器地址
-    @GET("ncs_url/getHostIP")
+    @GET("/ncs_url/getHostIP")
     fun getTcpServerHost(): Observable<ResponseBody>
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/DeviceApi.kt

@@ -7,8 +7,8 @@ import retrofit2.http.POST
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-interface DeviceApi {
-    @POST("watch")
+interface WatchManageDeviceApi {
+    @POST("/watch/getWatchContacts")
     fun getWatchContacts(@Query("page_no") pageNo: Int,
                          @Query("device_id") deviceId: Int,
                          @Query("page_size") pageSize: Int= ApiManager.PAGE_SIZE): Observable<ResponseBody>

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/WatchInitiatorApi.kt

@@ -8,12 +8,12 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 /**
- * 获取呼叫记录列表api
+ * 获取指定用户呼叫记录列表api
  */
-interface WatchInitiatorApi {
+interface WatchNamedUserApi {
 
     @POST("/watch/getInteractionVOByDeviceIdAndCustomerId")
-    fun getInitiatorData(@Query("page_no") page_no: Int, @Query("page_size") page_size: Int
+    fun getNamedUserData(@Query("page_no") page_no: Int, @Query("page_size") page_size: Int
                          , @Query("device_id") device_id: Int
                          , @Query("customer_id") customer_id: Int
                          ): Observable<ResponseBody>

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApiProvides.kt

@@ -1,7 +1,6 @@
 package com.wdkl.ncs.android.middleware.di
 
 import com.wdkl.ncs.android.middleware.api.*
-import com.enation.javashop.net.engine.core.NetEngineFactory
 import dagger.Module
 import dagger.Provides
 
@@ -180,47 +179,55 @@ class ApiProvides {
         return  ApiManager.PASSPORT_API
     }
 
+
+    //======================================= 以下护士手表相关 =====================================
+    /**
+     * 测试api
+     */
     @Provides
     fun provideHelloApi():HelloApi{
         return ApiManager.API_HELLO
     }
 
+    /**
+     * @author LDD
+     * @From   ApplicationComponent
+     * @Date  获取设备信息和tcp通讯地址api
+     * @Note
+     */
     @Provides
-    fun provideDeviceApi():DeviceApi{
-        return ApiManager.API_DEVICE
+    fun provideWatchDeviceInfoAndTCPMailingAddressApi():WatchDeviceInfoAndTCPMailingAddressApi{
+        return  ApiManager.API_WatchDeviceInfoAndTCPMailingAddress
     }
 
     /**
-     * @author LDD
-     * @From   ApplicationComponent
-     * @Date
-     * @Note   通话记录api
+      用户列表api
      */
     @Provides
-    fun provideCallRecordsFragmentApi():WatchCallRecordsFragmentApi{
-        return  ApiManager.API_CallRecords
+    fun provideWatchManageDeviceApi():WatchManageDeviceApi{
+        return ApiManager.API_WatchManageDevice
     }
 
     /**
      * @author LDD
      * @From   ApplicationComponent
      * @Date
-     * @Note
+     * @Note   全部通话记录api
      */
     @Provides
-    fun provideRegisterDeviceApi():RegisterDeviceApi{
-        return  ApiManager.API_RegisterDevice
+    fun provideWatchCallRecordsApi():WatchCallRecordsApi{
+        return  ApiManager.API_WatchCallRecords
     }
 
     /**
      * @author LDD
      * @From   ApplicationComponent
-     * @Date
+     * @Date  获取指定用户api
      * @Note
      */
     @Provides
-    fun provideWatchInitiatorApi():WatchInitiatorApi{
-        return  ApiManager.Api_WatchInitiator
+    fun provideWatchNamedUserApi():WatchNamedUserApi{
+        return  ApiManager.Api_WatchNamedUser
     }
 
     /**

middleware/src/main/code/com/wdkl/ncs/android/middleware/di/ApplicationComponent.kt

@@ -1,7 +1,6 @@
 package com.wdkl.ncs.android.middleware.di
 
 import com.wdkl.ncs.android.middleware.api.*
-import com.umeng.socialize.media.Base
 import dagger.Component
 
 /**
@@ -137,9 +136,18 @@ interface ApplicationComponent {
      */
     fun providePassportApi():PassportApi
 
+
+
+    //======================================= 以下护士手表相关 ====================================
+    /**
+     * 测试api
+     */
     fun provideHelloApi(): HelloApi
 
-    fun provideDeviceApi() :DeviceApi
+    /**
+    用户列表api
+     */
+    fun provideWatchManageDeviceApi() :WatchManageDeviceApi
 
     /**
      * @author LDD
@@ -147,23 +155,23 @@ interface ApplicationComponent {
      * @Date
      * @Note   通话记录Api
      */
-    fun provideCallRecordsFragmentApi(): WatchCallRecordsFragmentApi
+    fun provideWatchCallRecordsApi(): WatchCallRecordsApi
 
     /**
      * @author LDD
      * @From   ApplicationComponent
-     * @Date
+     * @Date 获取设备信息和tcp通讯地址api
      * @Note
      */
-    fun provideRegisterDeviceApi(): RegisterDeviceApi
+    fun provideWatchDeviceInfoAndTCPMailingAddressApi(): WatchDeviceInfoAndTCPMailingAddressApi
 
     /**
      * @author LDD
      * @From   ApplicationComponent
-     * @Date
+     * @Date 获取指定用户api
      * @Note
      */
-    fun provideWatchInitiatorApi(): WatchInitiatorApi
+    fun provideWatchNamedUserApi(): WatchNamedUserApi
 
     /**
      * @author LDD

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/home/WatchDeviceContract.kt

@@ -13,8 +13,9 @@ interface WatchDeviceContract {
      * 显示当前设备数据
      */
     interface View: BaseContract.BaseView{
+        //显示设备信息
         fun showData(data : DeviceDO)
-
+        //显示tcp通讯地址
         fun setTcpServerHost(tcpSeverDTO: TcpSeverDTO)
     }
 
@@ -22,7 +23,8 @@ interface WatchDeviceContract {
      * 获取当前设备数据
      */
   interface Presenter:BaseContract.BasePresenter{
-        fun loadData(eth_mac:String)
+        //获取设备信息
+        fun loadData(ethMac:String)
         //获取tcp服务器地址
         fun loadTcpServerHost()
   }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchActivityPresenter.kt

@@ -10,7 +10,7 @@ import com.wdkl.ncs.android.lib.utils.ConnectionObserver
 import com.wdkl.ncs.android.lib.utils.arrayObjects
 import com.wdkl.ncs.android.lib.utils.toJsonObject
 import com.wdkl.ncs.android.lib.utils.valueJsonArray
-import com.wdkl.ncs.android.middleware.api.DeviceApi
+import com.wdkl.ncs.android.middleware.api.WatchManageDeviceApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchActivityContract
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
@@ -20,7 +20,7 @@ import javax.inject.Inject
 class WatchActivityPresenter @Inject constructor(): RxPresenter<WatchActivityContract.View>(),WatchActivityContract.Presenter{
 
     @Inject
-    protected lateinit var deviceApi: DeviceApi
+    protected lateinit var deviceApi: WatchManageDeviceApi
 
     override fun bindDagger() {
         MiddlewareDaggerComponent.component.inject(this)

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchCallRecordsFragmentPresenter.kt

@@ -10,8 +10,8 @@ import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
 import com.enation.javashop.net.engine.utils.ThreadFromUtils
 import com.google.gson.FieldNamingPolicy
 import com.google.gson.GsonBuilder
-import com.wdkl.ncs.android.middleware.api.WatchCallRecordsFragmentApi
-import com.wdkl.ncs.android.middleware.api.WatchInitiatorApi
+import com.wdkl.ncs.android.middleware.api.WatchCallRecordsApi
+import com.wdkl.ncs.android.middleware.api.WatchNamedUserApi
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchCallRecordsFragmentContract
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import io.reactivex.disposables.Disposable
@@ -32,10 +32,10 @@ class WatchCallRecordsFragmentPresenter @Inject constructor() :RxPresenter<Watch
      * @Note  通话记录Api
      */
     @Inject
-    protected lateinit var callRecordsFragmentApi: WatchCallRecordsFragmentApi
+    protected lateinit var callRecordsFragmentApi: WatchCallRecordsApi
 
     @Inject
-    protected lateinit var watchInitiatorApi: WatchInitiatorApi
+    protected lateinit var watchNamedUserApi: WatchNamedUserApi
 
     /**
      * @Name  observer
@@ -87,7 +87,6 @@ class WatchCallRecordsFragmentPresenter @Inject constructor() :RxPresenter<Watch
         Log.e("WatchCallRecordsFragmentPresenter","qqqqqqq")
         //获取全部通话记录数据
         if(ACTION .equals("ALL")){
-            //待处理
             callRecordsFragmentApi.getCallRecords(page_no,page_size,device_id,choice)
                     .map {
                         var shop = ArrayList<InteractionVO>()
@@ -103,7 +102,7 @@ class WatchCallRecordsFragmentPresenter @Inject constructor() :RxPresenter<Watch
                     .subscribe(observer)
         }else{
             //获取指定人的通话记录数据
-            watchInitiatorApi.getInitiatorData(page_no,page_size,device_id,customer_id)
+            watchNamedUserApi.getNamedUserData(page_no,page_size,device_id,customer_id)
                     .map {
                         var shop = ArrayList<InteractionVO>()
                         var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchDevicePresenter.kt

@@ -7,7 +7,7 @@ import com.google.gson.FieldNamingPolicy
 import com.google.gson.GsonBuilder
 import com.wdkl.ncs.android.lib.base.RxPresenter
 import com.wdkl.ncs.android.lib.utils.*
-import com.wdkl.ncs.android.middleware.api.RegisterDeviceApi
+import com.wdkl.ncs.android.middleware.api.WatchDeviceInfoAndTCPMailingAddressApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchDeviceContract
 import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
@@ -25,7 +25,7 @@ class WatchDevicePresenter@Inject constructor() :RxPresenter<WatchDeviceContract
      *获取当前设备数据api
      */
     @Inject
-    protected lateinit var registerDeviceApi: RegisterDeviceApi
+    protected lateinit var registerDeviceApi: WatchDeviceInfoAndTCPMailingAddressApi
 
     /**
      *依赖注入初始化
@@ -71,9 +71,9 @@ class WatchDevicePresenter@Inject constructor() :RxPresenter<WatchDeviceContract
     /**
      *获取当前设备数据
      */
-    override fun loadData(eth_mac:String) {
+    override fun loadData(ethMac:String) {
 
-        registerDeviceApi.getDeviceMessage(eth_mac).map {
+        registerDeviceApi.getDeviceMessage(ethMac).map {
             var deviceDO = DeviceDO()
 
             var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/home/WatchHomeActivityPresenter.kt

@@ -2,19 +2,10 @@ package com.wdkl.ncs.android.middleware.logic.presenter.home
 
 import com.enation.javashop.net.engine.plugin.connection.ConnectionQuality
 import com.enation.javashop.net.engine.plugin.exception.ExceptionHandle
-import com.enation.javashop.net.engine.utils.ThreadFromUtils
-import com.google.gson.FieldNamingPolicy
-import com.google.gson.GsonBuilder
 import com.wdkl.ncs.android.lib.base.RxPresenter
 import com.wdkl.ncs.android.lib.utils.ConnectionObserver
-import com.wdkl.ncs.android.lib.utils.arrayObjects
-import com.wdkl.ncs.android.lib.utils.toJsonObject
-import com.wdkl.ncs.android.lib.utils.valueJsonArray
-import com.wdkl.ncs.android.middleware.api.DeviceApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
-import com.wdkl.ncs.android.middleware.logic.contract.home.WatchActivityContract
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
-import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject