|
@@ -76,13 +76,9 @@ import java.util.concurrent.TimeUnit
|
|
*/
|
|
*/
|
|
@Router(path = "/nursehome/main")
|
|
@Router(path = "/nursehome/main")
|
|
class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurseHomeBinding>(), NurseHomeActivityContract.View,
|
|
class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurseHomeBinding>(), NurseHomeActivityContract.View,
|
|
- CallRecordsFragment.OnItemListener, View.OnClickListener, FramePartFragment.OnItemListener, IUserState {
|
|
|
|
|
|
+ View.OnClickListener, IUserState {
|
|
var TAG = NurseHomeActivity::class.java.getSimpleName()
|
|
var TAG = NurseHomeActivity::class.java.getSimpleName()
|
|
|
|
|
|
-
|
|
|
|
- var fragment:FramePartFragment? = null
|
|
|
|
- var callRecordsFragment:CallRecordsFragment? = null
|
|
|
|
-
|
|
|
|
var currentFragment:Fragment? = null
|
|
var currentFragment:Fragment? = null
|
|
var currentFragmentTwo:Fragment? = null
|
|
var currentFragmentTwo:Fragment? = null
|
|
var currentFragmentThree:Fragment? = null
|
|
var currentFragmentThree:Fragment? = null
|
|
@@ -134,13 +130,11 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
AppTool.SystemUI.showNavigationBar(this,false)
|
|
AppTool.SystemUI.showNavigationBar(this,false)
|
|
AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
|
|
AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
|
|
|
|
|
|
- fragment = FramePartFragment()
|
|
|
|
- currentFragment = fragment
|
|
|
|
- supportFragmentManager.beginTransaction().add(R.id.middle_fralyout, fragment, "").commit()
|
|
|
|
|
|
+ currentFragment = FramePartFragment()
|
|
|
|
+ supportFragmentManager.beginTransaction().add(R.id.middle_fralyout, currentFragment, "").commit()
|
|
|
|
|
|
- callRecordsFragment = CallRecordsFragment()
|
|
|
|
- currentFragmentThree = callRecordsFragment
|
|
|
|
- supportFragmentManager.beginTransaction().add(R.id.left_framlyout, callRecordsFragment, "").commit()
|
|
|
|
|
|
+ currentFragmentThree = CallRecordsFragment()
|
|
|
|
+ supportFragmentManager.beginTransaction().add(R.id.left_framlyout, currentFragmentThree, "").commit()
|
|
|
|
|
|
if (Build.VERSION.SDK_INT >= 23) {
|
|
if (Build.VERSION.SDK_INT >= 23) {
|
|
if (!Settings.canDrawOverlays(this)) {
|
|
if (!Settings.canDrawOverlays(this)) {
|
|
@@ -316,10 +310,6 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
other_host_radio_bt.setOnClickListener(this)
|
|
other_host_radio_bt.setOnClickListener(this)
|
|
collocation_radio_bt.setOnClickListener(this)
|
|
collocation_radio_bt.setOnClickListener(this)
|
|
system_settings_radio_bt.setOnClickListener(this)
|
|
system_settings_radio_bt.setOnClickListener(this)
|
|
-
|
|
|
|
-
|
|
|
|
- fragment?.setOnItemListener(this)
|
|
|
|
- callRecordsFragment?.setOnItemListener(this)
|
|
|
|
}
|
|
}
|
|
/**
|
|
/**
|
|
*页面销毁回调
|
|
*页面销毁回调
|
|
@@ -355,18 +345,6 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
override fun networkMonitor(state: NetState) {
|
|
override fun networkMonitor(state: NetState) {
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * callRecordsFragment的数据回调
|
|
|
|
- */
|
|
|
|
- override fun displayPersondalInformation(data: CallingHistoryVO) {
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- /**
|
|
|
|
- * FrameBedVosAdapter的数据回调
|
|
|
|
- */
|
|
|
|
- override fun theBedInformation(data: FrameBedVO) {
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
override fun showAppVersion(appInfo: AppVersionDO) {
|
|
override fun showAppVersion(appInfo: AppVersionDO) {
|
|
Log.d("AppUpdate", "loadAppVersion111 =====>> versionNo: " + appInfo.versionNo + ", path: " + appInfo.appPath)
|
|
Log.d("AppUpdate", "loadAppVersion111 =====>> versionNo: " + appInfo.versionNo + ", path: " + appInfo.appPath)
|
|
showMessage("获取版本成功,当前版本号: " + BuildConfig.VERSION_CODE + ", 服务器版本号: " + appInfo.versionNo)
|
|
showMessage("获取版本成功,当前版本号: " + BuildConfig.VERSION_CODE + ", 服务器版本号: " + appInfo.versionNo)
|
|
@@ -468,7 +446,6 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
if (select_id != 0) {
|
|
if (select_id != 0) {
|
|
select_id = 0
|
|
select_id = 0
|
|
home_radio_bt.isChecked = true
|
|
home_radio_bt.isChecked = true
|
|
- //showMiddleFragment(FramePartFragment())
|
|
|
|
removeRightFragment()
|
|
removeRightFragment()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -478,21 +455,14 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
when(p0.id){
|
|
when(p0.id){
|
|
R.id.home_radio_bt ->{
|
|
R.id.home_radio_bt ->{
|
|
if (select_id != 0) {
|
|
if (select_id != 0) {
|
|
- if (select_id == 9) {
|
|
|
|
- val fragment = currentFragmentTwo
|
|
|
|
- if(fragment != null){
|
|
|
|
- removeFragment(fragment)
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- showMiddleFragment(FramePartFragment())
|
|
|
|
- }
|
|
|
|
|
|
+ showMiddleFragment(FramePartFragment())
|
|
select_id = 0
|
|
select_id = 0
|
|
}
|
|
}
|
|
}
|
|
}
|
|
R.id.broadcast_radio_bt ->{
|
|
R.id.broadcast_radio_bt ->{
|
|
if (select_id != 1) {
|
|
if (select_id != 1) {
|
|
select_id = 1
|
|
select_id = 1
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showRightFragment(BroadcastFragment())
|
|
showRightFragment(BroadcastFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -500,13 +470,13 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
if (select_id != 2) {
|
|
if (select_id != 2) {
|
|
select_id = 2
|
|
select_id = 2
|
|
}
|
|
}
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(VisitManagementFragment())
|
|
showMiddleFragment(VisitManagementFragment())
|
|
}
|
|
}
|
|
R.id.doctor_host_radio_bt ->{
|
|
R.id.doctor_host_radio_bt ->{
|
|
if (select_id != 3) {
|
|
if (select_id != 3) {
|
|
select_id = 3
|
|
select_id = 3
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(DoctorHostFragment())
|
|
showMiddleFragment(DoctorHostFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -520,28 +490,28 @@ class NurseHomeActivity : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
|
|
R.id.sickbed_radio_bt ->{
|
|
R.id.sickbed_radio_bt ->{
|
|
if (select_id != 5) {
|
|
if (select_id != 5) {
|
|
select_id = 5
|
|
select_id = 5
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(SickbedFragment())
|
|
showMiddleFragment(SickbedFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
R.id.nurse_move_radio_bt ->{
|
|
R.id.nurse_move_radio_bt ->{
|
|
if (select_id != 6) {
|
|
if (select_id != 6) {
|
|
select_id = 6
|
|
select_id = 6
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(NurseMoveFragment())
|
|
showMiddleFragment(NurseMoveFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
R.id.other_host_radio_bt ->{
|
|
R.id.other_host_radio_bt ->{
|
|
if (select_id != 7) {
|
|
if (select_id != 7) {
|
|
select_id = 7
|
|
select_id = 7
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(OtherHostFragment())
|
|
showMiddleFragment(OtherHostFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
R.id.collocation_radio_bt ->{
|
|
R.id.collocation_radio_bt ->{
|
|
if (select_id != 8) {
|
|
if (select_id != 8) {
|
|
select_id = 8
|
|
select_id = 8
|
|
- showLeftFragment(CallRecordsFragment())
|
|
|
|
|
|
+ //showLeftFragment(CallRecordsFragment())
|
|
showMiddleFragment(TrustManagementFragment())
|
|
showMiddleFragment(TrustManagementFragment())
|
|
}
|
|
}
|
|
}
|
|
}
|