#CHANGE 修改设置参数上传

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

@@ -2,9 +2,7 @@ package com.wdkl.ncs.android.middleware.api
 
 import io.reactivex.Observable
 import okhttp3.ResponseBody
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Path
+import retrofit2.http.*
 
 /**
  * 科室设置api
@@ -13,24 +11,26 @@ interface SettingApi {
     /**
      * 上传科室设置数据
      */
-    @POST("/deviceNurse")
-//  @GET("goods/categories/{parent_id}/children")
-    fun setPartSetting(@Path("createTime") createTime: Int, @Path("updateTime") updateTime: Int,
-                       @Path("partId") partId: Int, @Path("dayStart") dayStart: String,
-                       @Path("dayLight") dayLight: Int, @Path("dayVol") dayVol: Int,
-                       @Path("dayRingVol") dayRingVol: Int, @Path("dayRingTimes") dayRingTimes: Int,
-                       @Path("dayNurseLed") dayNurseLed: Int, @Path("dayDoorVol") dayDoorVol: Int,
-                       @Path("dayBedVol") dayBedVol: Int, @Path("dayTransferBoxVol") dayTransferBoxVol: Int,
-                       @Path("dayTransferBoxSystemVol") dayTransferBoxSystemVol: Int,
-                       @Path("nightStart") nightStart: String, @Path("nightLight") nightLight: Int,
-                       @Path("nightVol") nightVol: Int,@Path("nightRingVol") nightRingVol: Int,
-                       @Path("nightRingTimes") nightRingTimes: Int,@Path("nightNurseLed") nightNurseLed: Int,
-                       @Path("nightDoorVol") nightDoorVol: Int,@Path("nightBedVol") nightBedVol: Int,
-                       @Path("nightTransferBoxVol") nightTransferBoxVol: Int,
-                       @Path("nightTransferBoxSystemVol") nightTransferBoxSystemVol: Int,
-                       @Path("sleepSecondsNurse") sleepSecondsNurse: Int,
-                       @Path("sleepSecondsDoor") sleepSecondsDoor: Int, @Path("sleepSecondsBed") sleepSecondsBed: Int,
-                       @Path("sipOvertime") sipOvertime: Int): Observable<ResponseBody>
+    @PUT("/deviceNurse/{id}")
+    fun setPartSetting(@Path("id") id: Int,
+                       @Query("unionId") unionId: String,
+                       @Query("createTime") createTime: Int, @Query("updateTime") updateTime: Int,
+                       @Query("partId") partId: Int, @Query("dayStart") dayStart: String,
+                       @Query("dayLight") dayLight: Int, @Query("dayVol") dayVol: Int,
+                       @Query("dayRingVol") dayRingVol: Int, @Query("dayRingTimes") dayRingTimes: Int,
+                       @Query("dayNurseLed") dayNurseLed: Int, @Query("dayDoorVol") dayDoorVol: Int,
+                       @Query("dayBedVol") dayBedVol: Int, @Query("dayTransferBoxVol") dayTransferBoxVol: Int,
+                       @Query("dayTransferBoxSystemVol") dayTransferBoxSystemVol: Int,
+                       @Query("nightStart") nightStart: String, @Query("nightLight") nightLight: Int,
+                       @Query("nightVol") nightVol: Int, @Query("nightRingVol") nightRingVol: Int,
+                       @Query("nightRingTimes") nightRingTimes: Int, @Query("nightNurseLed") nightNurseLed: Int,
+                       @Query("nightDoorVol") nightDoorVol: Int, @Query("nightBedVol") nightBedVol: Int,
+                       @Query("nightTransferBoxVol") nightTransferBoxVol: Int,
+                       @Query("nightTransferBoxSystemVol") nightTransferBoxSystemVol: Int,
+                       @Query("sleepSecondsNurse") sleepSecondsNurse: Int,
+                       @Query("sleepSecondsDoor") sleepSecondsDoor: Int, @Query("sleepSecondsBed") sleepSecondsBed: Int,
+                       @Query("sipOvertime") sipOvertime: Int, @Query("transferDuration") transferDuration: Int,
+                       @Query("transferDurationLeader") transferDurationLeader: Int): Observable<ResponseBody>
 
     /**
      * 获取科室设置

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/contract/nursehome/SystemSettingsContract.kt

@@ -1,22 +1,28 @@
 package com.wdkl.ncs.android.middleware.logic.contract.nursehome
 
 import com.wdkl.ncs.android.lib.base.BaseContract
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 
 /**
  * 获取系统设置初始数据接口
  */
 interface SystemSettingsContract {
     /**
-     * 显示数据
+     * 返回结果
      */
     interface View:BaseContract.BaseView{
-        fun showData()
+        fun showData(data: PartSettingDO)
     }
 
     /**
-     * 获取数据
+     * 上传设置参数
      */
     interface Presenter:BaseContract.BasePresenter{
-        fun loadData()
+
+        fun setSettingData(id: Int,unionId: String,createTime: Int,updateTime: Int,partId: Int,dayStart: String,dayLight: Int,dayVol: Int,dayRingVol: Int,
+                           dayRingTimes: Int,dayNurseLed: Int,dayDoorVol: Int,dayBedVol: Int,dayTransferBoxVol: Int,dayTransferBoxSystemVol: Int,
+                           nightStart: String,nightLight: Int,nightVol: Int,nightRingVol: Int,nightRingTimes: Int,nightNurseLed: Int,
+                           nightDoorVol: Int,nightBedVol: Int,nightTransferBoxVol: Int,nightTransferBoxSystemVol: Int,sleepSecondsNurse: Int,
+                           sleepSecondsDoor: Int,sleepSecondsBed: Int, sipOvertime: Int,transferDuration: Int, transferDurationLeader: Int)
     }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/logic/presenter/nursehome/SystemSettingsPresenter.kt

@@ -2,10 +2,16 @@ package com.wdkl.ncs.android.middleware.logic.presenter.nursehome
 
 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.getJsonString
+import com.wdkl.ncs.android.middleware.api.SettingApi
 import com.wdkl.ncs.android.middleware.di.MiddlewareDaggerComponent
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.SystemSettingsContract
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import io.reactivex.disposables.Disposable
 import javax.inject.Inject
 
@@ -13,6 +19,8 @@ import javax.inject.Inject
  * SystemSettingsFragment逻辑控制
  */
 class SystemSettingsPresenter@Inject constructor():RxPresenter<SystemSettingsContract.View>(),SystemSettingsContract.Presenter {
+    @Inject
+    protected lateinit var settingApi: SettingApi
 
     /**
      *依赖注入初始化
@@ -31,7 +39,7 @@ class SystemSettingsPresenter@Inject constructor():RxPresenter<SystemSettingsCon
 
         override fun onNextWithConnection(result: Any, connectionQuality: ConnectionQuality) {
             providerView().complete()
-            providerView().showData()
+            providerView().showData(result as PartSettingDO)
         }
 
         override fun onErrorWithConnection(error: ExceptionHandle.ResponeThrowable, connectionQuality: ConnectionQuality) {
@@ -44,12 +52,50 @@ class SystemSettingsPresenter@Inject constructor():RxPresenter<SystemSettingsCon
 
     }
 
-    /**
-     *获取系统设置初始值  待处理
-     */
-    override fun loadData() {
-
-
+    override fun setSettingData(
+        id: Int,
+        unionId: String,
+        createTime: Int,
+        updateTime: Int,
+        partId: Int,
+        dayStart: String,
+        dayLight: Int,
+        dayVol: Int,
+        dayRingVol: Int,
+        dayRingTimes: Int,
+        dayNurseLed: Int,
+        dayDoorVol: Int,
+        dayBedVol: Int,
+        dayTransferBoxVol: Int,
+        dayTransferBoxSystemVol: Int,
+        nightStart: String,
+        nightLight: Int,
+        nightVol: Int,
+        nightRingVol: Int,
+        nightRingTimes: Int,
+        nightNurseLed: Int,
+        nightDoorVol: Int,
+        nightBedVol: Int,
+        nightTransferBoxVol: Int,
+        nightTransferBoxSystemVol: Int,
+        sleepSecondsNurse: Int,
+        sleepSecondsDoor: Int,
+        sleepSecondsBed: Int,
+        sipOvertime: Int,
+        transferDuration: Int,
+        transferDurationLeader: Int
+    ) {
+        settingApi.setPartSetting(id,unionId,createTime, updateTime, partId, dayStart, dayLight, dayVol, dayRingVol, dayRingTimes, dayNurseLed,
+            dayDoorVol, dayBedVol, dayTransferBoxVol, dayTransferBoxSystemVol, nightStart, nightLight, nightVol, nightRingVol,
+            nightRingTimes, nightNurseLed, nightDoorVol, nightBedVol, nightTransferBoxVol, nightTransferBoxSystemVol,
+            sleepSecondsNurse, sleepSecondsDoor, sleepSecondsBed, sipOvertime,transferDuration,transferDurationLeader)
+            .map {
+                var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                var partSettingDO = gson.fromJson(it.getJsonString(), PartSettingDO::class.java)
+                return@map partSettingDO
+            }
+            .compose(ThreadFromUtils.defaultSchedulers())
+            .subscribe(observable)
     }
 
 

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/bean/SettingConfiguration.java

@@ -2,6 +2,8 @@ package com.wdkl.ncs.android.middleware.model.bean;
 
 public class SettingConfiguration {
 
+    public int id;
+    public String unionId;
     public long createTime;
     public long updateTime;
     public int partId;
@@ -29,6 +31,8 @@ public class SettingConfiguration {
     public int sleepSecondsDoor;
     public int sleepSecondsBed;
     public int sipOvertime;
+    public int transferDuration;
+    public int transferDurationLeader;
 
 
     private static SettingConfiguration instance;
@@ -44,7 +48,4 @@ public class SettingConfiguration {
 
         return instance;
     }
-
-
-
 }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -16,6 +16,7 @@ import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentTransaction
 import android.text.TextUtils
 import android.util.Log
+import android.view.KeyEvent
 import android.view.View
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
@@ -257,7 +258,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
      *处理错误信息
      */
     override fun onError(message: String, type: Int) {
-
+        showMessage(message)
     }
     /**
      *耗时加载完成
@@ -344,41 +345,62 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         Log.e(TAG,"收到返回的设置配置信息 ")
         Log.e(TAG,"partId "+data.partId)
 
-        SettingConfiguration.getInstance().createTime  = data.createTime
-        if (data.updateTime != null) {
-            SettingConfiguration.getInstance().updateTime = data.updateTime
-        } else {
-            SettingConfiguration.getInstance().updateTime = data.createTime
+        try {
+            SettingConfiguration.getInstance().id  = data.id
+            SettingConfiguration.getInstance().unionId = data.unionId
+            SettingConfiguration.getInstance().createTime  = data.createTime
+            if (data.updateTime != null) {
+                SettingConfiguration.getInstance().updateTime = data.updateTime
+            } else {
+                SettingConfiguration.getInstance().updateTime = data.createTime
+            }
+            SettingConfiguration.getInstance().partId  = data.partId
+            SettingConfiguration.getInstance().dayStart  = data.dayStart
+            SettingConfiguration.getInstance().dayLight  = data.dayLight
+            SettingConfiguration.getInstance().dayVol  = data.dayVol
+            SettingConfiguration.getInstance().dayRingVol  = data.dayRingVol
+            SettingConfiguration.getInstance().dayRingTimes  = data.dayRingTimes
+            SettingConfiguration.getInstance().dayNurseLed  = data.dayNurseLed
+            SettingConfiguration.getInstance().dayDoorVol  = data.dayDoorVol
+            SettingConfiguration.getInstance().dayBedVol  = data.dayBedVol
+            SettingConfiguration.getInstance().dayTransferBoxVol  = data.dayTransferBoxVol
+            SettingConfiguration.getInstance().dayTransferBoxSystemVol  = data.dayTransferBoxSystemVol
+            SettingConfiguration.getInstance().nightStart  = data.nightStart
+            SettingConfiguration.getInstance().nightLight  = data.nightLight
+            SettingConfiguration.getInstance().nightVol  = data.nightVol
+            SettingConfiguration.getInstance().nightRingVol  = data.nightRingVol
+            SettingConfiguration.getInstance().nightRingTimes  = data.nightRingTimes
+            SettingConfiguration.getInstance().nightNurseLed  = data.nightNurseLed
+            SettingConfiguration.getInstance().nightDoorVol  = data.nightDoorVol
+            SettingConfiguration.getInstance().nightBedVol  = data.nightBedVol
+            SettingConfiguration.getInstance().nightTransferBoxVol  = data.nightTransferBoxVol
+            SettingConfiguration.getInstance().nightTransferBoxSystemVol  = data.nightTransferBoxSystemVol
+            SettingConfiguration.getInstance().sleepSecondsNurse  = data.sleepSecondsNurse
+            SettingConfiguration.getInstance().sleepSecondsDoor  = data.sleepSecondsDoor
+            SettingConfiguration.getInstance().sleepSecondsBed  = data.sleepSecondsBed
+            SettingConfiguration.getInstance().sipOvertime  = data.sipOvertime
+            if (data.transferDuration != null) {
+                SettingConfiguration.getInstance().transferDuration = data.transferDuration
+            }
+            if (data.transferDurationLeader != null) {
+                SettingConfiguration.getInstance().transferDurationLeader = data.transferDurationLeader
+            }
+
+            setSettingConfiguration()
+            initCountDownTimer()
+        } catch (e: Exception) {
+            showMessage("获取设置配置信息异常"+e.message)
+            Log.i(TAG,"获取设置配置信息异常"+e.message)
+        }
+    }
+
+    fun showHome() {
+        if (select_id != 0) {
+            select_id = 0
+            home_radio_bt.isChecked = true
+            //showMiddleFragment(FramePartFragment())
+            removeRightFragment()
         }
-        SettingConfiguration.getInstance().partId  = data.partId
-        SettingConfiguration.getInstance().dayStart  = data.dayStart
-        SettingConfiguration.getInstance().dayLight  = data.dayLight
-        SettingConfiguration.getInstance().dayVol  = data.dayVol
-        SettingConfiguration.getInstance().dayRingVol  = data.dayRingVol
-        SettingConfiguration.getInstance().dayRingTimes  = data.dayRingTimes
-        SettingConfiguration.getInstance().dayNurseLed  = data.dayNurseLed
-        SettingConfiguration.getInstance().dayDoorVol  = data.dayDoorVol
-        SettingConfiguration.getInstance().dayBedVol  = data.dayBedVol
-        SettingConfiguration.getInstance().dayTransferBoxVol  = data.dayTransferBoxVol
-        SettingConfiguration.getInstance().dayTransferBoxSystemVol  = data.dayTransferBoxSystemVol
-        SettingConfiguration.getInstance().nightStart  = data.nightStart
-        SettingConfiguration.getInstance().nightLight  = data.nightLight
-        SettingConfiguration.getInstance().nightVol  = data.nightVol
-        SettingConfiguration.getInstance().nightRingVol  = data.nightRingVol
-        SettingConfiguration.getInstance().nightRingTimes  = data.nightRingTimes
-        SettingConfiguration.getInstance().nightNurseLed  = data.nightNurseLed
-        SettingConfiguration.getInstance().nightDoorVol  = data.nightDoorVol
-        SettingConfiguration.getInstance().nightBedVol  = data.nightBedVol
-        SettingConfiguration.getInstance().nightTransferBoxVol  = data.nightTransferBoxVol
-        SettingConfiguration.getInstance().nightTransferBoxSystemVol  = data.nightTransferBoxSystemVol
-        SettingConfiguration.getInstance().sleepSecondsNurse  = data.sleepSecondsNurse
-        SettingConfiguration.getInstance().sleepSecondsDoor  = data.sleepSecondsDoor
-        SettingConfiguration.getInstance().sleepSecondsBed  = data.sleepSecondsBed
-        SettingConfiguration.getInstance().sipOvertime  = data.sipOvertime
-
-        //设置设置配置
-        setSettingConfiguration()
-        initCountDownTimer()
     }
 
 
@@ -387,7 +409,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
            R.id.home_radio_bt ->{
                if (select_id != 0) {
                    select_id = 0
-                   showLeftFragment(CallRecordsFragment())
+                   //showLeftFragment(CallRecordsFragment())
                    showMiddleFragment(FramePartFragment())
                }
            }
@@ -474,6 +496,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             currentFragment = fragment
             if(currentFragmentTwo != null){
                 remove(currentFragmentTwo)
+                currentFragmentTwo = null
             }
             add(R.id.middle_fralyout, fragment)
         }
@@ -488,6 +511,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             add(R.id.right_fralyout, fragment)
         }
     }
+
     fun showLeftFragment(fragment: Fragment){
         supportFragmentManager.inTransaction {
             if(currentFragmentThree != null){
@@ -498,6 +522,15 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         }
     }
 
+    fun removeRightFragment() {
+        if (currentFragmentTwo != null) {
+            supportFragmentManager.inTransaction {
+                remove(currentFragmentTwo)
+            }
+            currentFragmentTwo = null
+        }
+    }
+
 
     inline fun FragmentManager.inTransaction(func: FragmentTransaction.() -> FragmentTransaction) {
         beginTransaction().func().commit()
@@ -668,6 +701,15 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         }
     }
 
+    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+        Log.i(TAG, "keyup keyCode " + keyCode)
+        return if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
+            //不执行父类点击事件
+            true
+        } else super.onKeyUp(keyCode, event)
+        //继续执行父类其他点击事件
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
         when (messageEvent.getType()) {

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -164,6 +164,17 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         Constants.sip_id = data.sipId
         Constants.eth_ip = data.ethIp
 
+        Constants.DEVICE_CODE = data.code
+        Constants.DEVICE_MODEL =  data.model
+        Constants.DEVICE_HARD_VER =  data.hardVer
+        Constants.DEVICE_SOFT_VER = data.softVer
+        if (data.deviceType != null) {
+            Constants.DEVICE_TYPE = data.deviceType
+        }
+        if (data.name != null) {
+            Constants.DEVICE_NAME = data.name
+        }
+
         if(TextUtils.isEmpty(data.partId.toString())|| TextUtils.isEmpty(data.id.toString())
                 || TextUtils.isEmpty(data.sipId)){
             feedback_device_info_tv.text = "服务器返回初始化数据不全，请联系管理员"

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -22,6 +22,8 @@ import com.wdkl.ncs.android.lib.base.BaseFragment
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.SystemSettingsContract
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.SystemSettingsPresenter
+import com.wdkl.ncs.android.middleware.model.bean.SettingConfiguration
+import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.fragment_system_settings.*
@@ -33,7 +35,7 @@ import org.greenrobot.eventbus.ThreadMode
  */
 class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystemSettingsBinding>(),SystemSettingsContract.View, View.OnClickListener, SeekBar.OnSeekBarChangeListener {
     var TAG = SystemSettingsFragment::class.java.getSimpleName()
-
+    var partSettingDO = PartSettingDO()
 
 
     /**
@@ -168,12 +170,46 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
         door_phone_volume_tv.text = SettingConfig.getDoorPhoneVolume(this.activity).toString()
         door_phone_volume_seekb.setProgress(SettingConfig.getDoorPhoneVolume(this.activity))
         //todo 根据白天晚上设置门口通话音量
+        partSettingDO.id = SettingConfiguration.getInstance().id
+        partSettingDO.unionId = SettingConfiguration.getInstance().unionId
+        partSettingDO.createTime = SettingConfiguration.getInstance().createTime
+        partSettingDO.partId = Constants.part_id
+        partSettingDO.dayStart = SettingConfig. getInitialDayTime(this.activity)+":00"
+        partSettingDO.dayLight = SettingConfig.getMainEngineDaytimeBrightness(this.activity)
+        //partSettingDO.dayVol = SettingConfig.getHostDaytimeVolume(this.activity)
+        partSettingDO.dayVol = SettingConfiguration.getInstance().dayVol
+        partSettingDO.dayRingVol = SettingConfig.getHostDaytimeVolume(this.activity)
+        partSettingDO.dayRingTimes = SettingConfig.getCallNumber(this.activity)
+        partSettingDO.dayNurseLed = SettingConfig.getExtensionDaytimeLEDBrightness(this.activity)
+        partSettingDO.dayDoorVol = SettingConfig.getDoorPhoneVolume(this.activity)
+        partSettingDO.dayBedVol = SettingConfig.getExtensionDaytimeSystemVolume(this.activity)
+        partSettingDO.dayTransferBoxVol = SettingConfiguration.getInstance().dayTransferBoxVol
+        partSettingDO.dayTransferBoxSystemVol = SettingConfiguration.getInstance().dayTransferBoxSystemVol
+        partSettingDO.nightStart = SettingConfig.getEndOfDay(this.activity)+":00"
+        partSettingDO.nightLight = SettingConfig.getHostNightBrightness(this.activity)
+        //partSettingDO.nightVol = SettingConfig.getHostNightVolume(this.activity)
+        partSettingDO.nightVol = SettingConfiguration.getInstance().nightVol
+        partSettingDO.nightRingVol = SettingConfig.getHostNightVolume(this.activity)
+        partSettingDO.nightRingTimes = SettingConfig.getCallNumber(this.activity)
+        partSettingDO.nightNurseLed = SettingConfiguration.getInstance().nightNurseLed
+        partSettingDO.nightDoorVol = SettingConfiguration.getInstance().nightDoorVol
+        partSettingDO.nightBedVol = SettingConfig.getExtensionNightSystemVolume(this.activity)
+        partSettingDO.nightTransferBoxVol = SettingConfiguration.getInstance().nightTransferBoxVol
+        partSettingDO.nightTransferBoxSystemVol = SettingConfiguration.getInstance().nightTransferBoxSystemVol
+        partSettingDO.sleepSecondsNurse = SettingConfiguration.getInstance().sleepSecondsNurse
+        partSettingDO.sleepSecondsDoor = SettingConfiguration.getInstance().sleepSecondsDoor
+        partSettingDO.sleepSecondsBed = SettingConfiguration.getInstance().sleepSecondsBed
+        partSettingDO.sipOvertime = SettingConfiguration.getInstance().sipOvertime
+        partSettingDO.transferDuration = SettingConfiguration.getInstance().transferDuration
+        partSettingDO.transferDurationLeader = SettingConfiguration.getInstance().transferDurationLeader
 
 
         software_and_information_tv.setText("软件版本: V" + BuildConfig.VERSION_NAME)
         software_and_information_tv.setOnClickListener {
             (activity as NurseHomeActivity).checkApp()
         }
+
+        save_settings_tv.setOnClickListener(this)
     }
     /**
      *绑定事件
@@ -186,6 +222,8 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             SettingConfig.setEndOfDayLocation(this.activity, String.format("%.0f", big))
             SettingConfig.setEndOfDay(this.activity,bigTime)
 
+            partSettingDO.dayStart = lowTime+":00"
+            partSettingDO.nightStart = bigTime+":00"
         }
 
         group_tts_set.setOnCheckedChangeListener { group, checkedId ->
@@ -256,11 +294,17 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
         when (p0.id) {
             R.id.call_number_decrease_tv -> {
                 call_number_seekb.setProgress(call_number_seekb.progress - 1)
+                partSettingDO.dayRingTimes = call_number_seekb.progress
+                partSettingDO.nightRingTimes = call_number_seekb.progress
             }
             R.id.call_number_add_tv -> {
                 call_number_seekb.setProgress(call_number_seekb.progress + 1)
+                partSettingDO.dayRingTimes = call_number_seekb.progress
+                partSettingDO.nightRingTimes = call_number_seekb.progress
+            }
+            R.id.save_settings_tv -> {
+                uploadingData(partSettingDO)
             }
-
         }
     }
 
@@ -360,18 +404,26 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
         when (p0.id) {
             R.id.call_number_seekb -> { //播报次数
                 SettingConfig.setCallNumber(this.activity,p0.progress)
+                partSettingDO.dayRingTimes = p0.progress
+                partSettingDO.nightRingTimes = p0.progress
             }
             R.id.main_engine_daytime_brightness_seekb -> { //主机白天亮度
                 SettingConfig.setMainEngineDaytimeBrightness(this.activity,p0.progress)
+                partSettingDO.dayLight = p0.progress
             }
             R.id.host_night_brightness_tv_seekb -> { //主机夜晚亮度
                 SettingConfig.setHostNightBrightness(this.activity,p0.progress)
+                partSettingDO.nightLight = p0.progress
             }
             R.id.host_daytime_volume_seekb -> { //主机白天系统音量
                 SettingConfig.setHostDaytimeVolume(this.activity,p0.progress)
+                //partSettingDO.dayVol = p0.progress
+                partSettingDO.dayRingVol = p0.progress
             }
             R.id.host_night_volume_seekb -> { //主机夜晚系统音量
                 SettingConfig.setHostNightVolume(this.activity,p0.progress)
+                //partSettingDO.nightVol = p0.progress
+                partSettingDO.nightRingVol = p0.progress
             }
 
             R.id.hands_free_input_volume_of_host_machine_seekb -> { //主机免提录入音量
@@ -394,15 +446,19 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             }
             R.id.extension_daytime_led_brightness_seekb -> { //分机LED白天亮度设置
                 SettingConfig.setExtensionDaytimeLEDBrightness(this.activity,p0.progress)
+                partSettingDO.dayNurseLed = p0.progress
             }
             R.id.extension_night_led_brightness_seekb -> { //分机LED晚上亮度设置
                 SettingConfig.setExtensionNightLEDBrightness(this.activity,p0.progress)
+                partSettingDO.nightNurseLed = p0.progress
             }
             R.id.extension_daytime_system_volume_seekb -> { //分机白天系统音量
                 SettingConfig.setExtensionDaytimeSystemVolume(this.activity,p0.progress)
+                partSettingDO.dayBedVol = p0.progress
             }
             R.id.extension_night_system_volume_seekb -> { //分机晚上系统音量
                 SettingConfig.setExtensionNightSystemVolume(this.activity,p0.progress)
+                partSettingDO.nightBedVol = p0.progress
             }
             R.id.the_extension_handle_records_the_volume_seekb -> { //分机手柄录入音量
                 SettingConfig.setTheExtensionHandleRecordsTheVolume(this.activity,p0.progress)
@@ -412,6 +468,10 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             }
             R.id.change_box_system_volume_seekb -> { //传统转换盒系统音量
                 SettingConfig.setChangeBoxSystemVolume(this.activity,p0.progress)
+                partSettingDO.dayTransferBoxSystemVol = p0.progress
+                partSettingDO.dayTransferBoxVol = p0.progress
+                partSettingDO.nightTransferBoxSystemVol = p0.progress
+                partSettingDO.nightTransferBoxVol = p0.progress
             }
             R.id.door_machine_daytime_brightness_seekb -> { //门口机白天亮度
                 SettingConfig.setDoorMachineDaytimeBrightness(this.activity,p0.progress)
@@ -421,6 +481,8 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
             }
             R.id.door_phone_volume_seekb -> { //门口机通话音量
                 SettingConfig.setDoorPhoneVolume(this.activity,p0.progress)
+                partSettingDO.dayDoorVol = p0.progress
+                partSettingDO.nightDoorVol = p0.progress
             }
         }
     }
@@ -449,17 +511,65 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
 
     }
 
+   fun uploadingData(partSettingDO:PartSettingDO){
+//       createTime: Int, updateTime: Int, partId: Int, dayStart: String, dayLight: Int,
+//       dayVol: Int, dayRingVol: Int, dayRingTimes: Int, dayNurseLed: Int, dayDoorVol: Int,
+//       dayBedVol: Int, dayTransferBoxVol: Int, dayTransferBoxSystemVol: Int, nightStart: String,
+//       nightLight: Int, nightVol: Int, nightRingVol: Int, nightRingTimes: Int, nightNurseLed: Int,
+//       nightDoorVol: Int, nightBedVol: Int, nightTransferBoxVol: Int, nightTransferBoxSystemVol: Int,
+//       sleepSecondsNurse: Int, sleepSecondsDoor: Int, sleepSecondsBed: Int, sipOvertime: Int) {
+       if(SettingConfiguration.getInstance().id != null) {
+           partSettingDO.updateTime = System.currentTimeMillis()/1000
+           presenter.setSettingData(
+               partSettingDO.id,
+               partSettingDO.unionId,
+               partSettingDO.createTime.toInt(),
+               partSettingDO.updateTime.toInt(),
+               partSettingDO.partId,
+               partSettingDO.dayStart,
+               partSettingDO.dayLight,
+               partSettingDO.dayVol,
+               partSettingDO.dayRingVol,
+               partSettingDO.dayRingTimes,
+               partSettingDO.dayNurseLed,
+               partSettingDO.dayDoorVol,
+               partSettingDO.dayBedVol,
+               partSettingDO.dayTransferBoxVol,
+               partSettingDO.dayTransferBoxSystemVol,
+               partSettingDO.nightStart,
+               partSettingDO.nightLight,
+               partSettingDO.nightVol,
+               partSettingDO.nightRingVol,
+               partSettingDO.nightRingTimes,
+               partSettingDO.nightNurseLed,
+               partSettingDO.nightDoorVol,
+               partSettingDO.nightBedVol,
+               partSettingDO.nightTransferBoxVol,
+               partSettingDO.nightTransferBoxSystemVol,
+               partSettingDO.sleepSecondsNurse,
+               partSettingDO.sleepSecondsDoor,
+               partSettingDO.sleepSecondsBed,
+               partSettingDO.sipOvertime,
+               partSettingDO.transferDuration,
+               partSettingDO.transferDurationLeader
+           )
+       }else{
+           showMessage("参数设置失败")
+       }
+
+   }
 
     /**
      *面销毁回调
      */
     override fun destory() {
     }
-    /**
-     *显示数据
-     */
-    override fun showData() {
+
+    override fun showData(data: PartSettingDO) {
+        showMessage("参数设置成功")
+        (activity as NurseHomeActivity).showHome()
     }
+
     /**
      *处理错误信息
      */

nursehome/src/main/res/layout/activity_nurse_home.xml

@@ -95,19 +95,6 @@
                             android:layout_marginRight="20px"
                             android:src="@drawable/ic_tcp_fail"/>
 
-                        <!--                        &lt;!&ndash; 托管 &ndash;&gt;-->
-                        <!--                        <ImageView-->
-                        <!--                            android:layout_width="10dp"-->
-                        <!--                            android:layout_height="10dp"-->
-                        <!--                            android:layout_marginLeft="10dp"-->
-                        <!--                            android:src="@drawable/lan_ya_lan_jie_icon"/>-->
-
-                        <!--                        <TextView-->
-                        <!--                            android:layout_width="wrap_content"-->
-                        <!--                            android:layout_height="match_parent"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:text="未托管"-->
-                        <!--                            android:textSize="8dp" />-->
                         <!--白昼状态-->
                         <ImageView
                             android:id="@+id/day_night_state_imagev"
@@ -115,36 +102,10 @@
                             android:layout_height="wrap_content"
                             android:layout_marginRight="15px" />
 
-                        <!-- 测试图标是否正常-->
-
-                        <!--                        <ImageView-->
-                        <!--                            android:layout_width="wrap_content"-->
-                        <!--                            android:layout_height="wrap_content"-->
-                        <!--                            android:layout_marginRight="15px"-->
-                        <!--                            android:src="@drawable/shan_chu" />-->
-                        <!--                        <ImageView-->
-                        <!--                            android:layout_width="wrap_content"-->
-                        <!--                            android:layout_height="wrap_content"-->
-                        <!--                            android:layout_marginRight="15px"-->
-                        <!--                            android:src="@drawable/guang_bo_yi_chu" />-->
-                        <!--                        <ImageView-->
-                        <!--                            android:layout_width="wrap_content"-->
-                        <!--                            android:layout_height="wrap_content"-->
-                        <!--                            android:layout_marginRight="15px"-->
-                        <!--                            android:src="@drawable/jian_xiao" />-->
                     </LinearLayout>
                 </RelativeLayout>
             </RelativeLayout>
 
-<!--            <FrameLayout-->
-<!--                android:id="@+id/sum_fralyout"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_below="@+id/title_relayout"-->
-<!--                android:layout_above="@+id/bottom_linlyout"-->
-<!--                >-->
-
-<!--            </FrameLayout>-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -155,7 +116,7 @@
                     android:id="@+id/left_framlyout"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.23"></FrameLayout>
+                    android:layout_weight="0.23"/>
 
 
                 <FrameLayout
@@ -163,25 +124,8 @@
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_toRightOf="@+id/left_framlyout"
-                    android:layout_weight="0.77"></FrameLayout>
-
-<!--            <RelativeLayout-->
-<!--                android:layout_width="0dp"-->
-<!--                android:layout_height="match_parent"-->
-<!--                android:layout_weight="0.2"-->
-<!--                android:layout_alignParentRight="true">-->
-
-<!--                <TextView-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="match_parent"-->
-<!--                    android:textSize="20dp"-->
-<!--                    android:text="这是最右边列表"-->
-<!--                    />-->
-<!--           <include-->
-<!--             android:id="@+id/right_relyout"-->
-<!--             layout="@layout/right_list"/>-->
-
-<!--            </RelativeLayout>-->
+                    android:layout_weight="0.77"/>
+
             </LinearLayout>
             <FrameLayout
                 android:id="@+id/right_fralyout"
@@ -189,7 +133,7 @@
                 android:layout_height="match_parent"
                 android:layout_above="@+id/bottom_linlyout"
                 android:layout_below="@+id/title_relayout"
-                android:layout_alignParentRight="true"></FrameLayout>
+                android:layout_alignParentRight="true"/>
 
             <LinearLayout
                 android:id="@+id/bottom_linlyout"
@@ -209,33 +153,6 @@
                         android:layout_height="match_parent"
                         android:orientation="horizontal">
 
-                        <!--                        <RelativeLayout-->
-                        <!--                            android:id="@+id/home_radio_bt"-->
-                        <!--                            android:layout_width="104px"-->
-                        <!--                            android:layout_height="38px"-->
-                        <!--                            android:layout_gravity="center"-->
-                        <!--                            android:background="@drawable/sp_home_bg"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:orientation="horizontal">-->
-
-                        <!--                            <ImageView-->
-                        <!--                                android:layout_width="wrap_content"-->
-                        <!--                                android:layout_height="wrap_content"-->
-                        <!--                                android:layout_marginRight="6px"-->
-                        <!--                                android:layout_toLeftOf="@+id/home_radio_bts"-->
-                        <!--                                android:src="@drawable/shou_ye"-->
-                        <!--                                android:visibility="gone"-->
-                        <!--                                />-->
-
-                        <!--                            <TextView-->
-                        <!--                                android:id="@+id/home_radio_bts"-->
-                        <!--                                android:layout_width="wrap_content"-->
-                        <!--                                android:layout_height="wrap_content"-->
-                        <!--                                android:text="首页"-->
-                        <!--                                android:textColor="#F78B8F"-->
-                        <!--                                android:textSize="16px" />-->
-                        <!--                        </RelativeLayout>-->
-
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/home_radio_bt"
                             android:layout_width="0dp"
@@ -247,7 +164,7 @@
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="首页"
-                            android:textSize="16px" />
+                            android:textSize="16sp" />
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/broadcast_radio_bt"
@@ -260,22 +177,9 @@
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
                             android:text="广播"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
-                        <!--                        <com.wdkl.ncs.android.lib.widget.CustomRadioButton-->
-                        <!--                            android:id="@+id/broadcast_radio_bt"-->
-                        <!--                            android:layout_width="0dp"-->
-                        <!--                            android:layout_height="match_parent"-->
-                        <!--                            android:layout_weight="1"-->
-                        <!--                            android:background="#aabbcc"-->
-                        <!--                            android:button="@null"-->
-                        <!--                            android:checked="false"-->
-                        <!--                            android:drawableStart="@drawable/selt_home_icon"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:text="2asdf"-->
-                        <!--                            android:textColor="#000000" />-->
-
 
                         <com.wdkl.ncs.android.lib.widget.CustomRadioButton
                             android:id="@+id/visit_an_extension_radio_bt"
@@ -287,7 +191,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="探视管理"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -301,7 +205,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="医生机"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -316,7 +220,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="病区"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -330,7 +234,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="病床"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -344,7 +248,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="护士移动"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -358,7 +262,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="其它主机"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -372,7 +276,7 @@
                             android:gravity="center"
                             android:textColor="#FFFFFF"
                             android:text="托管"
-                            android:textSize="16px"
+                            android:textSize="16sp"
                             android:visibility="invisible"
                              />
 
@@ -386,12 +290,8 @@
                             android:drawablePadding="10px"
                             android:gravity="center"
                             android:textColor="@drawable/selector_bottom_btn_text_color"
-                            android:text="系统设置"
-                            android:textSize="16px" />
-<!--                        <TextView-->
-<!--                            android:layout_width="0dp"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_weight="5"/>-->
+                            android:text="设置"
+                            android:textSize="16sp" />
 
                     </RadioGroup>
                 </LinearLayout>

nursehome/src/main/res/layout/fragment_system_settings.xml

@@ -1266,16 +1266,31 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
                     android:layout_marginBottom="10dp"
-                    android:gravity="center">
+                    android:gravity="center"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/save_settings_tv"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dp"
+                        android:gravity="center"
+                        android:background="@color/white"
+                        android:text="保存设置"
+                        android:textColor="#000000"
+                        android:textSize="18sp" />
 
                     <TextView
                         android:id="@+id/software_and_information_tv"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="4dp"
-                        android:text=""
+                        android:layout_marginTop="8dp"
+                        android:padding="8dp"
+                        android:gravity="center"
+                        android:background="@color/white"
+                        android:text="v1.0"
                         android:textColor="#000000"
-                        android:textSize="14px" />
+                        android:textSize="18sp" />
 
                 </LinearLayout>
             </LinearLayout>