Browse Source

版本升级到1.3.47

weizhengliang 3 years ago
parent
commit
d6d60f4e89

+ 2 - 2
build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 128
+    ext.app_version_code = 129
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.3.46"
+    ext.app_version = "1.3.47"
 
     /**
      * 项目依赖库

+ 8 - 3
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchUserSettingActivity.java

@@ -14,6 +14,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.common.base.Strings;
 import com.wdkl.ncs.android.component.home.BuildConfig;
 import com.wdkl.ncs.android.component.home.R;
 import com.wdkl.ncs.android.component.home.service.WdKeepAliveService;
@@ -62,7 +63,7 @@ public class WatchUserSettingActivity extends Activity {
         callYes = findViewById(R.id.rb_call_yes);
         callNo = findViewById(R.id.rb_call_no);
 
-        tvAppVersion.setText(BuildConfig.VERSION_NAME + BuildConfig.BUILD_TIME);
+        tvAppVersion.setText(BuildConfig.VERSION_NAME + "_" + BuildConfig.BUILD_TIME);
         tvDeviceId.setText("" + Constants.Companion.getDeviceId());
         tvDeviceImei.setText(Constants.Companion.getImei());
         tvDeviceIp.setText(NetHelper.getInstance().getLocalIP());
@@ -139,8 +140,12 @@ public class WatchUserSettingActivity extends Activity {
         update.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(getApplicationContext(), ContactUpdateActivity.class);
-                startActivity(intent);
+                if (Strings.isNullOrEmpty(Constants.Companion.getUserName())) {
+                    Toast.makeText(_this, "设备未绑定", Toast.LENGTH_SHORT).show();
+                } else {
+                    Intent intent = new Intent(getApplicationContext(), ContactUpdateActivity.class);
+                    startActivity(intent);
+                }
             }
         });
     }