|
@@ -31,10 +31,8 @@ import com.wdkl.ncs.android.component.home.service.WdKeepAliveService
|
|
import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig
|
|
import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig
|
|
import com.wdkl.ncs.android.component.home.util.*
|
|
import com.wdkl.ncs.android.component.home.util.*
|
|
import com.wdkl.ncs.android.lib.base.BaseApplication
|
|
import com.wdkl.ncs.android.lib.base.BaseApplication
|
|
|
|
+import com.wdkl.ncs.android.lib.utils.*
|
|
import com.wdkl.ncs.android.lib.utils.Util
|
|
import com.wdkl.ncs.android.lib.utils.Util
|
|
-import com.wdkl.ncs.android.lib.utils.joinManager
|
|
|
|
-import com.wdkl.ncs.android.lib.utils.push
|
|
|
|
-import com.wdkl.ncs.android.lib.utils.showMessage
|
|
|
|
import com.wdkl.ncs.android.lib.vo.MessageEvent
|
|
import com.wdkl.ncs.android.lib.vo.MessageEvent
|
|
import com.wdkl.ncs.android.middleware.common.Constants
|
|
import com.wdkl.ncs.android.middleware.common.Constants
|
|
import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
|
|
import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
|
|
@@ -59,6 +57,8 @@ import kotlinx.android.synthetic.main.watch_activity_home2.*
|
|
import kotlinx.android.synthetic.main.watch_activity_register.*
|
|
import kotlinx.android.synthetic.main.watch_activity_register.*
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
|
|
+import java.util.*
|
|
|
|
+import kotlin.collections.ArrayList
|
|
|
|
|
|
//@Router(path = "/watch/home")
|
|
//@Router(path = "/watch/home")
|
|
class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivityHome2Binding>(), WatchHomeActivityContract.View, View.OnClickListener {
|
|
class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivityHome2Binding>(), WatchHomeActivityContract.View, View.OnClickListener {
|
|
@@ -78,6 +78,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
|
|
|
private var clickTime: Long = 0
|
|
private var clickTime: Long = 0
|
|
|
|
|
|
|
|
+ private var language = "zh"
|
|
|
|
+
|
|
private lateinit var netWorkChangeReceiver: NetWorkChangeReceiver
|
|
private lateinit var netWorkChangeReceiver: NetWorkChangeReceiver
|
|
|
|
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
override fun onCreate(savedInstanceState: Bundle?) {
|
|
@@ -125,7 +127,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
-100 to -109 dBm, then it's generally considered poor signal (1 to 2 bars).
|
|
-100 to -109 dBm, then it's generally considered poor signal (1 to 2 bars).
|
|
-110 to -120 dBm, then it's generally considered very poor signal (0 to 1 bar)
|
|
-110 to -120 dBm, then it's generally considered very poor signal (0 to 1 bar)
|
|
*/
|
|
*/
|
|
- if (netType == NetHelper.NETWORK_4G) {
|
|
|
|
|
|
+ /*if (netType == NetHelper.NETWORK_4G) {
|
|
if (teleManager != null) {
|
|
if (teleManager != null) {
|
|
teleManager.listen(object : PhoneStateListener() {
|
|
teleManager.listen(object : PhoneStateListener() {
|
|
override fun onSignalStrengthsChanged(signalStrength: SignalStrength) {
|
|
override fun onSignalStrengthsChanged(signalStrength: SignalStrength) {
|
|
@@ -153,10 +155,11 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
}
|
|
}
|
|
}, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
|
|
}, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
requestPermissions()
|
|
requestPermissions()
|
|
|
|
|
|
|
|
+ language = LocaleMangerUtils.getApplicationLocale().language
|
|
}
|
|
}
|
|
|
|
|
|
private fun permissionGranted() {
|
|
private fun permissionGranted() {
|
|
@@ -276,6 +279,37 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
|
|
|
presenter.getDeviceVO(Constants.imei)
|
|
presenter.getDeviceVO(Constants.imei)
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //通过服务端设置语言
|
|
|
|
+ if (SettingConfig.getLanguageMode(activity) == 0) {
|
|
|
|
+ var needReboot = false
|
|
|
|
+ if ("cn".equals(serverIpInfo.lang)) {
|
|
|
|
+ //中文
|
|
|
|
+ if (SettingConfig.getLanguageId(activity) != 2) {
|
|
|
|
+ needReboot = true
|
|
|
|
+ }
|
|
|
|
+ SettingConfig.setLanguageId(activity, 2)
|
|
|
|
+ } else if ("en".equals(serverIpInfo.lang)) {
|
|
|
|
+ //英文
|
|
|
|
+ if (SettingConfig.getLanguageId(activity) != 1) {
|
|
|
|
+ needReboot = true
|
|
|
|
+ }
|
|
|
|
+ SettingConfig.setLanguageId(activity, 1)
|
|
|
|
+ } else if ("es".equals(serverIpInfo.lang)) {
|
|
|
|
+ //西班牙语
|
|
|
|
+ if (SettingConfig.getLanguageId(activity) != 3) {
|
|
|
|
+ needReboot = true
|
|
|
|
+ }
|
|
|
|
+ SettingConfig.setLanguageId(activity, 3)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (needReboot) {
|
|
|
|
+ AppTool.Time.delay(5000) {
|
|
|
|
+ AppUtils.restartApp()
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
private fun requestPermissions() {
|
|
private fun requestPermissions() {
|
|
@@ -301,7 +335,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
)
|
|
)
|
|
.subscribe {
|
|
.subscribe {
|
|
if (!it) {
|
|
if (!it) {
|
|
- showMessage("请重新授权,进入App")
|
|
|
|
|
|
+ showMessage(R.string.permission_tips)
|
|
requestPermissions()
|
|
requestPermissions()
|
|
} else {
|
|
} else {
|
|
permissionGranted()
|
|
permissionGranted()
|
|
@@ -328,7 +362,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
)
|
|
)
|
|
.subscribe {
|
|
.subscribe {
|
|
if (!it) {
|
|
if (!it) {
|
|
- showMessage("请重新授权,进入App")
|
|
|
|
|
|
+ showMessage(R.string.permission_tips)
|
|
requestPermissions()
|
|
requestPermissions()
|
|
} else {
|
|
} else {
|
|
permissionGranted()
|
|
permissionGranted()
|
|
@@ -339,7 +373,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
|
|
|
override fun handleAppVersion(appInfo: AppVersionDO) {
|
|
override fun handleAppVersion(appInfo: AppVersionDO) {
|
|
if (BuildConfig.VERSION_CODE < appInfo.versionNo && !AppUpdateActivity.opened) {
|
|
if (BuildConfig.VERSION_CODE < appInfo.versionNo && !AppUpdateActivity.opened) {
|
|
- showMessage("有新版本")
|
|
|
|
|
|
+ showMessage(R.string.new_version_tips)
|
|
val intent = Intent()
|
|
val intent = Intent()
|
|
intent.setClass(this, AppUpdateActivity::class.java)
|
|
intent.setClass(this, AppUpdateActivity::class.java)
|
|
startActivity(intent)
|
|
startActivity(intent)
|
|
@@ -352,8 +386,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
override fun setDeviceDo(data: DeviceVO) {
|
|
override fun setDeviceDo(data: DeviceVO) {
|
|
if (data.id == null || data.id <= 0) {
|
|
if (data.id == null || data.id <= 0) {
|
|
loadingDialog.dismiss()
|
|
loadingDialog.dismiss()
|
|
- showMessage("本机未注册,请将识别码发给管理员")
|
|
|
|
- tv_register_status.text = "本机未注册,请将识别码发给管理员。管理员注册本机后请点击注册完成进入"
|
|
|
|
|
|
+ showMessage(R.string.device_not_register)
|
|
|
|
+ tv_register_status.setText(R.string.device_not_register_tips)
|
|
if (DaemonEnv.app != null) {
|
|
if (DaemonEnv.app != null) {
|
|
SpManager.getInstance().putBoolean(Constants.SYSTEM_REGISTERED, false)
|
|
SpManager.getInstance().putBoolean(Constants.SYSTEM_REGISTERED, false)
|
|
}
|
|
}
|
|
@@ -372,7 +406,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
watch_activity_home_linyout.visibility = View.VISIBLE
|
|
watch_activity_home_linyout.visibility = View.VISIBLE
|
|
tv_register_ok.visibility = View.GONE
|
|
tv_register_ok.visibility = View.GONE
|
|
|
|
|
|
- tv_register_status.text = "本机已注册,进入系统中"
|
|
|
|
|
|
+ tv_register_status.text = "Loading..."
|
|
tv_register_status.setTextColor(Color.GREEN)
|
|
tv_register_status.setTextColor(Color.GREEN)
|
|
|
|
|
|
isUnRegister = false
|
|
isUnRegister = false
|
|
@@ -388,12 +422,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
presenter.getWatchContacts(Constants.deviceId)
|
|
presenter.getWatchContacts(Constants.deviceId)
|
|
|
|
|
|
if (Constants.deviceId <= 0 || TextUtils.isEmpty(Constants.sipId)) {
|
|
if (Constants.deviceId <= 0 || TextUtils.isEmpty(Constants.sipId)) {
|
|
- showMessage("初始化数据时服务器返回数据不全,请联系管理员")
|
|
|
|
- tv_feedback_device_info.text = "初始化数据时服务器返回数据不全,请联系管理员"
|
|
|
|
|
|
+ showMessage(R.string.init_data_error)
|
|
|
|
+ tv_feedback_device_info.setText(R.string.init_data_error)
|
|
return
|
|
return
|
|
} else if (TextUtils.isEmpty(Constants.tcpServer)) {
|
|
} else if (TextUtils.isEmpty(Constants.tcpServer)) {
|
|
- showMessage("初始化tcp连接数据为null")
|
|
|
|
- tv_feedback_device_info.text = "初始化tcp连接数据为null"
|
|
|
|
|
|
+ showMessage(R.string.init_server_data_error)
|
|
|
|
+ tv_feedback_device_info.setText(R.string.init_server_data_error)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -406,7 +440,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
//onTcpConnectSuccess()
|
|
//onTcpConnectSuccess()
|
|
|
|
|
|
if (Strings.isNullOrEmpty(Constants.userName)) {
|
|
if (Strings.isNullOrEmpty(Constants.userName)) {
|
|
- watch_name_tv.text = "重载"
|
|
|
|
|
|
+ watch_name_tv.setText(R.string.str_reload)
|
|
watch_name_tv.setTextColor(Color.BLACK)
|
|
watch_name_tv.setTextColor(Color.BLACK)
|
|
watch_name_tv.textSize = 13f
|
|
watch_name_tv.textSize = 13f
|
|
watch_name_tv.setBackgroundResource(R.drawable.javashop_btn_balck_line_bg)
|
|
watch_name_tv.setBackgroundResource(R.drawable.javashop_btn_balck_line_bg)
|
|
@@ -416,7 +450,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
return@setOnClickListener
|
|
return@setOnClickListener
|
|
}
|
|
}
|
|
|
|
|
|
- watch_role_name_tv.text = "请使用PC设置使用人"
|
|
|
|
|
|
+ watch_role_name_tv.setText(R.string.device_user_empty)
|
|
watch_role_name_tv.textSize = 12f
|
|
watch_role_name_tv.textSize = 12f
|
|
} else {
|
|
} else {
|
|
watch_name_tv.text = Constants.userName
|
|
watch_name_tv.text = Constants.userName
|
|
@@ -428,6 +462,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
}
|
|
}
|
|
watch_user_phone_tv.text = data.phoneNumber
|
|
watch_user_phone_tv.text = data.phoneNumber
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (Locale.CHINESE.getLanguage().equals(language)) {
|
|
|
|
+ watch_role_name_tv.visibility = View.VISIBLE
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
//获取频道列表
|
|
//获取频道列表
|
|
@@ -446,7 +484,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
//加载电话号码白名单
|
|
//加载电话号码白名单
|
|
presenter.getPhoneNumberWhiteList(Constants.deviceId)
|
|
presenter.getPhoneNumberWhiteList(Constants.deviceId)
|
|
|
|
|
|
- showMessage("载入完成")
|
|
|
|
|
|
+ showMessage("Load complete")
|
|
}
|
|
}
|
|
|
|
|
|
override fun setDeviceVoiceChannel(channelList: ArrayList<ChannelDO>) {
|
|
override fun setDeviceVoiceChannel(channelList: ArrayList<ChannelDO>) {
|
|
@@ -515,7 +553,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
runOnUiThread(Runnable {
|
|
runOnUiThread(Runnable {
|
|
Log.i(TAG, "连接成功设置UI")
|
|
Log.i(TAG, "连接成功设置UI")
|
|
tv_net_reconnect_text.visibility = View.GONE
|
|
tv_net_reconnect_text.visibility = View.GONE
|
|
- tv_signal_strength.text = "网络正常"
|
|
|
|
|
|
+ tv_signal_strength.setText(R.string.tcp_connect_success)
|
|
netOffLoadingDialog.dismiss()
|
|
netOffLoadingDialog.dismiss()
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
|
|
})
|
|
})
|
|
@@ -525,7 +563,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
Log.w(TAG, "网络断开")
|
|
Log.w(TAG, "网络断开")
|
|
|
|
|
|
runOnUiThread(Runnable {
|
|
runOnUiThread(Runnable {
|
|
- tv_signal_strength.text = "网络断开"
|
|
|
|
|
|
+ tv_signal_strength.setText(R.string.tcp_connect_failed)
|
|
tv_net_reconnect_text.visibility = View.VISIBLE
|
|
tv_net_reconnect_text.visibility = View.VISIBLE
|
|
netOffLoadingDialog.show()
|
|
netOffLoadingDialog.show()
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
|
|
@@ -571,6 +609,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
tv_config_server.setOnClickListener {
|
|
tv_config_server.setOnClickListener {
|
|
ServerConfigDialogHelper.showPasswordDialog(activity)
|
|
ServerConfigDialogHelper.showPasswordDialog(activity)
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ tv_language_settings.setOnClickListener {
|
|
|
|
+ LanguageSetDialogHelper.showDialog(activity)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
override fun enableHeadsetVoiceMsg(): Boolean {
|
|
override fun enableHeadsetVoiceMsg(): Boolean {
|
|
@@ -601,7 +643,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
|
|
|
if (NetHelper.getInstance().getNetworkState(this) == NetHelper.NETWORK_NONE) {
|
|
if (NetHelper.getInstance().getNetworkState(this) == NetHelper.NETWORK_NONE) {
|
|
runOnUiThread(Runnable {
|
|
runOnUiThread(Runnable {
|
|
- showMessage("未能正确连接,请重试")
|
|
|
|
|
|
+ showMessage(R.string.net_disconnect)
|
|
})
|
|
})
|
|
}
|
|
}
|
|
}).start()
|
|
}).start()
|
|
@@ -688,9 +730,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
R.id.channel_im_layout -> {
|
|
R.id.channel_im_layout -> {
|
|
//群留言
|
|
//群留言
|
|
if (Constants.channelId == -1) {
|
|
if (Constants.channelId == -1) {
|
|
- showMessage("请先建立频道")
|
|
|
|
|
|
+ showMessage(R.string.str_im_no_channel)
|
|
} else if (TextUtils.isEmpty(Constants.userName)) {
|
|
} else if (TextUtils.isEmpty(Constants.userName)) {
|
|
- showMessage("设备未绑定")
|
|
|
|
|
|
+ showMessage(R.string.device_user_not_register)
|
|
} else {
|
|
} else {
|
|
var intent = Intent(this, ChannelImActivity::class.java)
|
|
var intent = Intent(this, ChannelImActivity::class.java)
|
|
startActivity(intent)
|
|
startActivity(intent)
|
|
@@ -704,7 +746,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
}
|
|
}
|
|
R.id.other_linyout -> {
|
|
R.id.other_linyout -> {
|
|
if (System.currentTimeMillis() - clickTime > 2000) {
|
|
if (System.currentTimeMillis() - clickTime > 2000) {
|
|
- showMessage("再点一次进入设置")
|
|
|
|
|
|
+ showMessage(R.string.click_twice_start_settings)
|
|
} else {
|
|
} else {
|
|
val intent = Intent(this, WatchUserSettingActivity::class.java)
|
|
val intent = Intent(this, WatchUserSettingActivity::class.java)
|
|
startActivity(intent)
|
|
startActivity(intent)
|
|
@@ -714,20 +756,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- /*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)
|
|
|
|
- //继续执行父类其他点击事件
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
|
|
|
|
- Log.i(TAG, "keydown keyCode " + keyCode)
|
|
|
|
- return super.onKeyDown(keyCode, event)
|
|
|
|
- }*/
|
|
|
|
-
|
|
|
|
|
|
|
|
override fun onBackPressed() {
|
|
override fun onBackPressed() {
|
|
//禁用返回
|
|
//禁用返回
|
|
@@ -755,12 +783,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
electric_quantity_tv.text = "" + message
|
|
electric_quantity_tv.text = "" + message
|
|
battery_warning_tv.setTextColor(Color.parseColor("#FF3030"))
|
|
battery_warning_tv.setTextColor(Color.parseColor("#FF3030"))
|
|
battery_warning_tv.visibility = View.VISIBLE
|
|
battery_warning_tv.visibility = View.VISIBLE
|
|
- battery_warning_tv.text = "低电量,请注意充电"
|
|
|
|
|
|
+ battery_warning_tv.setText(R.string.low_power)
|
|
} else if (10 > message) {
|
|
} else if (10 > message) {
|
|
electric_quantity_tv.text = "" + message
|
|
electric_quantity_tv.text = "" + message
|
|
battery_warning_tv.setTextColor(Color.parseColor("#8B2323"))
|
|
battery_warning_tv.setTextColor(Color.parseColor("#8B2323"))
|
|
battery_warning_tv.visibility = View.VISIBLE
|
|
battery_warning_tv.visibility = View.VISIBLE
|
|
- battery_warning_tv.text = "电量过低,请充电"
|
|
|
|
|
|
+ battery_warning_tv.setText(R.string.low_power)
|
|
} else {
|
|
} else {
|
|
battery_warning_tv.visibility = View.GONE
|
|
battery_warning_tv.visibility = View.GONE
|
|
electric_quantity_tv.text = "" + message
|
|
electric_quantity_tv.text = "" + message
|