1.修改版本号类型为Long

app/src/main/java/com/xhly/manageapp/bean/LoginBean.kt

@@ -5,4 +5,11 @@ class LoginBean {
     var loginname = ""
     var loginpwd = ""
     var sn = ""
+    //设备名
+    var device: String? = null
+    //设备型号
+    var deviceModel:String?=null
+    //客户端版本
+    var clientVersion: String? = null
+    var regionCode: String? = null
 }

app/src/main/java/com/xhly/manageapp/bean/log/LogAppStartBean.kt

@@ -24,7 +24,7 @@ class LogAppStartBean {
     /**
      * 版本号
      */
-    var versionNum: Int = 0
+    var versionNum: Long = 0
 
     /**
      * 类型1开始2结束

app/src/main/java/com/xhly/manageapp/utils/PadInfoUtils.kt

@@ -14,16 +14,13 @@ class PadInfoUtils {
 
     fun getPadInfo(context: Context,simIccID:String):PadInfoBean{
         val spUtils by lazy { SharedPreferencesUtils.getInstance(context) }
-        //val json= spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
-        val json=UserBean()
-        json.userid=1
-        json.schoolid=1
-        json.regionid=1
+       val json= spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
         val padInfoBean = PadInfoBean()
         json?.let {
             val userBean = it as UserBean
             padInfoBean.userid=userBean.userid
             padInfoBean.schoolid=userBean.schoolid
+            padInfoBean.regionid=userBean.regionid
             ManageApplication.getDeviceInfo()?.let {sn->
                 padInfoBean.sn=sn
             }

corelib/src/main/java/com/xhly/corelib/bean/AppInfo.java

@@ -17,7 +17,7 @@ public class AppInfo {
 
     private String versionName;
 
-    private int versionNum;
+    private long versionNum;
 
     public String getVersionName() {
         return versionName;
@@ -27,11 +27,11 @@ public class AppInfo {
         this.versionName = versionName;
     }
 
-    public int getVersionNum() {
+    public long getVersionNum() {
         return versionNum;
     }
 
-    public void setVersionNum(int versionNum) {
+    public void setVersionNum(long versionNum) {
         this.versionNum = versionNum;
     }
 

corelib/src/main/java/com/xhly/corelib/utils/AppUtils.java

@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 
 
 import com.xhly.corelib.bean.AppInfo;
@@ -35,7 +36,11 @@ public class AppUtils {
             try {
                 PackageInfo packageInfo = context.getPackageManager().getPackageInfo(packName, PackageManager.GET_META_DATA);
                  mInfo.setVersionName(packageInfo.versionName);
-                 mInfo.setVersionNum(packageInfo.versionCode);
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P){
+                    mInfo.setVersionNum(packageInfo.getLongVersionCode());
+                }else {
+                    mInfo.setVersionNum(packageInfo.versionCode);
+                }
             } catch (PackageManager.NameNotFoundException e) {
                 throw new RuntimeException(e);
             }

corelib/src/main/java/com/xhly/corelib/utils/SystemUtil.java

@@ -3,6 +3,7 @@ package com.xhly.corelib.utils;
 import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.location.Criteria;
 import android.location.Location;
@@ -13,7 +14,6 @@ import android.os.Build;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.core.app.ActivityCompat;
 
@@ -179,6 +179,30 @@ public class SystemUtil {
         return kernelVersion;
     }
 
+    public static String getAppVersionName(Context context, String pkg) {
+        try {
+            PackageInfo packageInfo = context.getPackageManager().getPackageInfo(pkg, PackageManager.GET_META_DATA);
+            return packageInfo.versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+
+        }
+        return "";
+    }
+
+    public static Long getAppVersionCode(Context context, String pkg) {
+        try {
+            PackageInfo packageInfo = context.getPackageManager().getPackageInfo(pkg, PackageManager.GET_META_DATA);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                return packageInfo.getLongVersionCode();
+            }else {
+                return (long) packageInfo.versionCode;
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+
+        }
+        return 0L;
+    }
+
     public static String getICCID(Context context) {
         String iccid = "";
         try {
@@ -236,7 +260,7 @@ public class SystemUtil {
     }
 
     public static Location getLocation(Context context) {
-        Location data=null;
+        Location data = null;
         try {
             String locationProvider = "";
             LocationManager systemService = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
@@ -248,7 +272,7 @@ public class SystemUtil {
             } else {
                 return data;
             }
-            Criteria criteria=new Criteria();
+            Criteria criteria = new Criteria();
             criteria.setAltitudeRequired(false);
             criteria.setBearingRequired(false);
             criteria.setAccuracy(Criteria.ACCURACY_FINE);
@@ -256,15 +280,15 @@ public class SystemUtil {
             String bestProvider = systemService.getBestProvider(criteria, true);
             if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED &&
                     ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                 data = systemService.getLastKnownLocation(bestProvider);
-                 if (data!=null){
-                     LogUtils.d("获得地理位置","经度"+data.getLongitude()+"|||维度=="+data.getLatitude());
-                 }else {
-                     LogUtils.d("获得地理位置","没有地址");
-                 }
+                data = systemService.getLastKnownLocation(bestProvider);
+                if (data != null) {
+                    LogUtils.d("获得地理位置", "经度" + data.getLongitude() + "|||维度==" + data.getLatitude());
+                } else {
+                    LogUtils.d("获得地理位置", "没有地址");
+                }
             }
         } catch (Exception e) {
-            LogUtils.d("获得地理位置","失败原因"+e.toString());
+            LogUtils.d("获得地理位置", "失败原因" + e.toString());
         }
         return data;
     }