tt/FLYSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.0

Browse Source 
fix:修复获取个人信息失败
add:
This commit is contained in:
Godfather
2022-04-29 16:42:15 +08:00
parent 17b582507f
commit 688e48bd97
5 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/uiui/sn/network/NetInterfaceManager.java
View File

@@ -1580,11 +1580,19 @@ public class NetInterfaceManager {
softwareJson.addProperty("learning_version", ApkUtils.getAPPVersionName(mContext, "com.info.learning"));
softwareJson.addProperty("chat_version", ApkUtils.getAPPVersionName(mContext, "com.info.chat"));
softwareJson.addProperty("jpush_id", JPushInterface.getRegistrationID(mContext));
softwareJson.addProperty("notice_version", ApkUtils.getAPPVersionName(mContext, "com.uiui.info"));
softwareJson.addProperty("browser_version", ApkUtils.getAPPVersionName(mContext, "com.uiui.browser"));
softwareJson.addProperty("desktop_version", ApkUtils.getAPPVersionName(mContext, "com.uiui.os"));
String addr = jsonObject.toString();
String machine = Utils.getMachine(mContext);
String hardware = Utils.getHardware(mContext);
Log.e(TAG, "updateAdminInfo: getHardware = " + hardware);
String software = softwareJson.toString();
if (BuildConfig.DEBUG){
Log.e(TAG, "updateAdminInfo: machine = " + machine);
Log.e(TAG, "updateAdminInfo: getHardware = " + hardware);
Log.e(TAG, "updateAdminInfo: software = " + software);
}
getUpdateAdminSnControl().sendAdminSn(
Utils.getSerial(),
addr,

9
app/src/main/java/com/uiui/sn/utils/Utils.java
View File

@@ -1007,7 +1007,12 @@ public class Utils {
return 0;
}
public static void getBatterymAh(Context context) {
/**
* 获取电池容量
* @param context
* @return
*/
public static double getBatterymAh(Context context) {
Object mPowerProfile;
double batteryCapacity = 0; //电池的容量mAh
final String POWER_PROFILE_CLASS = "com.android.internal.os.PowerProfile";
@@ -1019,6 +1024,7 @@ public class Utils {
Log.e("getBattery", "get batteryCapacity mAh error:" + batteryCapacity);
e.printStackTrace();
}
return batteryCapacity;
}
synchronized private static int getBatteryLevel(Context mContext) {
@@ -1226,6 +1232,7 @@ public class Utils {
jsonObject.put("wifi_ssid", getWifiSSID(context));
jsonObject.put("wifi_time", wifi_time);
jsonObject.put("boot_time", SystemClock.elapsedRealtime());
jsonObject.put("battery_capacity", Utils.getBatterymAh(context));
Log.e(TAG, "getHardware: " + jsonObject.toJSONString());
return jsonObject.toJSONString();
}

2
app/src/main/res/layout-land/activity_main.xml
View File

@@ -102,6 +102,7 @@
<TextView
android:id="@+id/tv_bind"
android:visibility="gone"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@@ -133,6 +134,7 @@
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/applet_qrcode"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

2
app/src/main/res/layout-port/activity_main.xml
View File

@@ -108,6 +108,7 @@
android:text="@string/scan_tips"
android:textColor="@color/black"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
@@ -133,6 +134,7 @@
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/applet_qrcode"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />