diff --git a/app/build.gradle b/app/build.gradle index 7315900..655208d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -114,7 +114,7 @@ android { applicationId "com.arpa.hndahesudintocctmsdriver" manifestPlaceholders = [CHANNEL_VALUE: "大河好运司机", app_icon : "@drawable/diver_logo", - GAODEKEY : "c68051b43e79e47a1556fc695371c902", + GAODEKEY : "9480fd96746922630e9bf6c75a101059", JPUSH_PKGNAME: applicationId, JPUSH_APPKEY : "fba6f55621c670d8c1fe9191", //JPush 上注册的包名对应的 Appkey. JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可. diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/AppInfoBean.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/AppInfoBean.java new file mode 100644 index 0000000..2359693 --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/bean/AppInfoBean.java @@ -0,0 +1,157 @@ +package com.arpa.hndahesudintocctmsdriver.bean; + +import android.os.Build; +import android.provider.Settings; + +import androidx.activity.result.contract.ActivityResultContracts; + +import com.arpa.hndahesudintocctmsdriver.App; +import com.dahe.mylibrary.utils.AppUtils; + +import java.util.Locale; + +/** + * @ClassName AppInfoBean + * @Author john + * @Date 2024/7/22 15:31 + * @Description TODO + */ +public class AppInfoBean { + private String userPhone; + private String macIpaddr = Settings.Secure.getString(App.getApp().getContentResolver(),Settings.Secure.ANDROID_ID); +// private String macIpaddr = android.os.Build.ID; + private String clientSource = "driver"; + private String status = "0"; + private String mobilePhoneManufacturerName = android.os.Build.BRAND; + private String mobilePhoneProductName = android.os.Build.MODEL; + private String mobilePhoneMotherboardName = android.os.Build.BOARD; + private String mobilePhoneHardwareName = android.os.Build.DEVICE; + private String mobilePhoneMachineSystemLanguage = Locale.getDefault().getLanguage(); + private String androidVersion=android.os.Build.VERSION.RELEASE; + private String androidSystemSdk = android.os.Build.VERSION.SDK_INT+""; + private String appVersionName = AppUtils.getAppVersionName(); + private String appVersionNumber = AppUtils.getAppVersionCode()+""; + + public String getUserPhone() { + return userPhone; + } + + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; + } + + public String getMacIpaddr() { + return macIpaddr; + } + + public void setMacIpaddr(String macIpaddr) { + this.macIpaddr = macIpaddr; + } + + public String getClientSource() { + return clientSource; + } + + public void setClientSource(String clientSource) { + this.clientSource = clientSource; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getMobilePhoneManufacturerName() { + return mobilePhoneManufacturerName; + } + + public void setMobilePhoneManufacturerName(String mobilePhoneManufacturerName) { + this.mobilePhoneManufacturerName = mobilePhoneManufacturerName; + } + + public String getMobilePhoneProductName() { + return mobilePhoneProductName; + } + + public void setMobilePhoneProductName(String mobilePhoneProductName) { + this.mobilePhoneProductName = mobilePhoneProductName; + } + + public String getMobilePhoneMotherboardName() { + return mobilePhoneMotherboardName; + } + + public void setMobilePhoneMotherboardName(String mobilePhoneMotherboardName) { + this.mobilePhoneMotherboardName = mobilePhoneMotherboardName; + } + + public String getMobilePhoneHardwareName() { + return mobilePhoneHardwareName; + } + + public void setMobilePhoneHardwareName(String mobilePhoneHardwareName) { + this.mobilePhoneHardwareName = mobilePhoneHardwareName; + } + + public String getMobilePhoneMachineSystemLanguage() { + return mobilePhoneMachineSystemLanguage; + } + + public void setMobilePhoneMachineSystemLanguage(String mobilePhoneMachineSystemLanguage) { + this.mobilePhoneMachineSystemLanguage = mobilePhoneMachineSystemLanguage; + } + + public String getAndroidVersion() { + return androidVersion; + } + + public void setAndroidVersion(String androidVersion) { + this.androidVersion = androidVersion; + } + + public String getAndroidSystemSdk() { + return androidSystemSdk; + } + + public void setAndroidSystemSdk(String androidSystemSdk) { + this.androidSystemSdk = androidSystemSdk; + } + + public String getAppVersionName() { + return appVersionName; + } + + public void setAppVersionName(String appVersionName) { + this.appVersionName = appVersionName; + } + + public String getAppVersionNumber() { + return appVersionNumber; + } + + public void setAppVersionNumber(String appVersionNumber) { + this.appVersionNumber = appVersionNumber; + } + + @Override + public String toString() { + return "AppInfoBean{" + + "userPhone='" + userPhone + '\'' + + ", macIpaddr='" + macIpaddr + '\'' + + ", clientSource='" + clientSource + '\'' + + ", status='" + status + '\'' + + ", mobilePhoneManufacturerName='" + mobilePhoneManufacturerName + '\'' + + ", mobilePhoneProductName='" + mobilePhoneProductName + '\'' + + ", mobilePhoneMotherboardName='" + mobilePhoneMotherboardName + '\'' + + ", mobilePhoneHardwareName='" + mobilePhoneHardwareName + '\'' + + ", mobilePhoneMachineSystemLanguage='" + mobilePhoneMachineSystemLanguage + '\'' + + ", androidVersion='" + androidVersion + '\'' + + ", androidSystemSdk='" + androidSystemSdk + '\'' + + ", appVersionName='" + appVersionName + '\'' + + ", appVersionNumber='" + appVersionNumber + '\'' + + '}'; + } +} diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java index 04ea849..41b4702 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/request/UserRequset.java @@ -10,6 +10,7 @@ import android.provider.Settings; import androidx.annotation.RequiresApi; +import com.arpa.hndahesudintocctmsdriver.bean.AppInfoBean; import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent; import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; import com.arpa.hndahesudintocctmsdriver.ui.business.Md5Util; @@ -232,4 +233,10 @@ public class UserRequset { Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", Md5Util.resNoUrl(map)),getToken(con)); RequestUtil.start(1, VehicleAuthActivity.CAR_AUDIO, re, con, hd); } + + public void putAppInfo(AppInfoBean appInfoBean){ +// Request re = OkHttpUtil.get(new OkDate(RequestConstant.getCarAudit(),"get", gson.toJson(appInfoBean)),getToken(con)); + Request re = OkHttpUtil.post(new OkDate(RequestConstant.getCarAudit(),"post", gson.toJson(appInfoBean)),con); + RequestUtil.start(1, VehicleAuthActivity.CAR_AUDIO, re, con, hd); + } }