1.升级一个版本

app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.phlx.anchorcollect"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 12
-        versionName "2.0.6"
+        versionCode 13
+        versionName "2.1.1"
 
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -50,7 +50,7 @@ android {
 }
 
 greendao {
-    schemaVersion 6 //数据库版本号
+    schemaVersion 7 //数据库版本号
     daoPackage 'com.phlx.anchorcollect.db.gen'
     targetGenDir 'src/main/java'
 }

app/src/main/java/com/phlx/anchorcollect/Configs.java

@@ -42,6 +42,10 @@ public class Configs {
      * 是否后缀端口
      */
     public static boolean isAddPort = true;
+    /**
+     * 是否https
+     */
+    public static boolean isHttps = true;
 
     //ip port
     public static final String SP_APP_IP = "sp_app_ip";

app/src/main/java/com/phlx/anchorcollect/db/gen/DaoMaster.java

@@ -14,10 +14,10 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /**
- * Master of DAO (schema version 6): knows all DAOs.
+ * Master of DAO (schema version 7): knows all DAOs.
  */
 public class DaoMaster extends AbstractDaoMaster {
-    public static final int SCHEMA_VERSION = 6;
+    public static final int SCHEMA_VERSION = 7;
 
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {

app/src/main/java/com/phlx/anchorcollect/net/RetrofitClient.java

@@ -50,8 +50,8 @@ public class RetrofitClient {
     private static final int CACHE_TIMEOUT = 10 * 1024 * 1024;
     //服务端根路径
     public static String baseUrl =
-        "serve.xlglmnmyzspt.org.cn"//正式old
-//        "serve.xlglzy.org.cn"//正式
+//        "serve.xlglmnmyzspt.org.cn"//正式old
+            "serve.xlglzy.org.cn"//正式
 //        "39.101.170.186"//阿里云测试
 //            "192.168.8.135"//董
 //            "192.168.43.154"//张敏
@@ -93,10 +93,12 @@ public class RetrofitClient {
 
         if (TextUtils.isEmpty(url)) {
             if (Configs.isAddPort) {
-                url = "http://" + SPUtils.getInstance().getString(Configs.SP_APP_IP, baseUrl) + ":" +
-                        SPUtils.getInstance().getString(Configs.SP_APP_PORT, port);
+                url = Configs.isHttps ? "https://" : "http://" ;
+                url+=  SPUtils.getInstance().getString(Configs.SP_APP_IP,
+                        baseUrl) + ":" + SPUtils.getInstance().getString(Configs.SP_APP_PORT, port);
             } else {
-                url = "http://" + SPUtils.getInstance().getString(Configs.SP_APP_IP, baseUrl);
+                url = Configs.isHttps ? "https://" : "http://" ;
+                url+=  SPUtils.getInstance().getString(Configs.SP_APP_IP, baseUrl);
             }
         }
 

app/src/main/java/com/phlx/anchorcollect/ui/login/LoginActivity.java

@@ -28,9 +28,9 @@ import me.tatarka.bindingcollectionadapter2.BR;
 
 public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginVM> {
 
-    private   String downloadUrl ;
+    private String downloadUrl;
 
-    private String path ;
+    private String path;
 
     private int loginType;//登录后是否跳转，0跳转main 1不跳转
 
@@ -63,8 +63,8 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginVM> {
 
         viewModel.loginType = loginType;
 
-        downloadUrl = "http://"
-                + SPUtils.getInstance().getString(Configs.SP_APP_IP, RetrofitClient.baseUrl)
+        downloadUrl = Configs.isHttps ? "https://" : "http://";
+        downloadUrl += SPUtils.getInstance().getString(Configs.SP_APP_IP, RetrofitClient.baseUrl)
                 + ":" +
                 SPUtils.getInstance().getString(Configs.SP_APP_PORT, RetrofitClient.port)
                 + Configs.downloadApk;
@@ -90,11 +90,11 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginVM> {
             exitApp();
         });
 
-        viewModel.appUpdateEvent.observe(this,new Observer<Integer>() {
+        viewModel.appUpdateEvent.observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer s) {
                 int versionCode = ApkUtil.getVersionCode(LoginActivity.this);
-                if (versionCode!=s){
+                if (versionCode != s) {
                     appUpdate(s);
                 }
             }
@@ -103,7 +103,8 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding, LoginVM> {
         viewModel.dateEvent.observe(this, new Observer<Integer>() {
             @Override
             public void onChanged(Integer integer) {
-                new MaterialDialog.Builder(LoginActivity.this).cancelable(false).canceledOnTouchOutside(false).title("系统提示").content("日期错误，请联网自动获取日期").positiveText("退出").onAny(new MaterialDialog.SingleButtonCallback() {
+                new MaterialDialog.Builder(LoginActivity.this).cancelable(false).canceledOnTouchOutside(false).title(
+                        "系统提示").content("日期错误，请联网自动获取日期").positiveText("退出").onAny(new MaterialDialog.SingleButtonCallback() {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                         if (which == DialogAction.POSITIVE) {

app/src/main/java/com/phlx/anchorcollect/ui/login/LoginVM.java

@@ -80,8 +80,8 @@ public class LoginVM extends BaseViewModel<Repository> {
         userName.set(model.getUserName());
         password.set(model.getPassword());
 
-        userName.set("15047917803");
-        password.set("Tpsq7803*");
+//        userName.set("15047917803");
+//        password.set("Tpsq7803*");
 //        userName.set("ewei");
 //        password.set("123456");
     }