|
@@ -15,7 +15,9 @@ import android.view.View;
|
|
|
import android.widget.Button;
|
|
|
import android.widget.SeekBar;
|
|
|
import android.widget.TextView;
|
|
|
+import android.widget.Toast;
|
|
|
|
|
|
+import com.google.common.base.Strings;
|
|
|
import com.hp.hpl.sparta.xpath.ThisNodeTest;
|
|
|
import com.wdkl.ncs.android.component.home.BuildConfig;
|
|
|
import com.wdkl.ncs.android.component.home.R;
|
|
@@ -23,6 +25,7 @@ import com.wdkl.ncs.android.component.home.service.TcpHandleService;
|
|
|
import com.wdkl.ncs.android.component.home.settingconfig.SettingConfig;
|
|
|
import com.wdkl.ncs.android.component.home.util.NetHelper;
|
|
|
import com.wdkl.ncs.android.component.nursehome.common.Constants;
|
|
|
+import com.wdkl.ncs.android.lib.base.BaseApplication;
|
|
|
import com.wdkl.ncs.android.lib.utils.ExtendMethodsKt;
|
|
|
import com.wdkl.ncs.android.middleware.tcp.TcpClient;
|
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.DeviceUtil;
|
|
@@ -74,10 +77,12 @@ public class WatchUserSettingActivity extends Activity {
|
|
|
tv_device_imei.setText("设备IMEI: " + Constants.Companion.getImei());
|
|
|
tvDeviceIp.setText("设备IP: " + NetHelper.getInstance().getLocalIP());
|
|
|
tvDeviceUser.setText("当前用户: " + Constants.Companion.getUser_name());
|
|
|
- if(Constants.Companion.getUser_role_name().contains("腕表")){
|
|
|
- tv_device_user_role_name.setText( "用户角色: " +Constants.Companion.getUser_role_name().substring(0,(Constants.Companion.getUser_role_name()).indexOf("腕表")));
|
|
|
- }else{
|
|
|
- tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name());
|
|
|
+ if (!Strings.isNullOrEmpty(Constants.Companion.getUser_role_name())) {
|
|
|
+ if (Constants.Companion.getUser_role_name().contains("腕表")) {
|
|
|
+ tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name().substring(0, (Constants.Companion.getUser_role_name()).indexOf("腕表")));
|
|
|
+ } else {
|
|
|
+ tv_device_user_role_name.setText("用户角色: " + Constants.Companion.getUser_role_name());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//设置呼叫转接时间
|
|
@@ -130,12 +135,14 @@ public class WatchUserSettingActivity extends Activity {
|
|
|
update_app_tv.setOnClickListener(new View.OnClickListener() {
|
|
|
@Override
|
|
|
public void onClick(View view) {
|
|
|
- if (!TcpHandleService.instance.isUpdating()) {
|
|
|
- Intent intent = new Intent();
|
|
|
- intent.setClass(_this, AppUpdateActivity.class);
|
|
|
- TcpHandleService.instance.setUpdating(true);
|
|
|
- startActivity(intent);
|
|
|
- }
|
|
|
+ if ((System.currentTimeMillis() / 1000) - TcpHandleService.instance.getUpdateLastTime() > 10) {
|
|
|
+ TcpHandleService.instance.setUpdateLastTime(System.currentTimeMillis() / 1000);
|
|
|
+ Intent intent = new Intent();
|
|
|
+ intent.setClass(_this, AppUpdateActivity.class);
|
|
|
+ startActivity(intent);
|
|
|
+ } else {
|
|
|
+ Toast.makeText(_this, "请10秒后再尝试", Toast.LENGTH_SHORT).show();
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
|