From: TrillGates Date: Thu, 9 Dec 2021 12:39:46 +0000 (+0800) Subject: 为C49改UI X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=cd24cb572732121944656ee1c41ac8680f3ae5f1;p=ichardware.git 为C49改UI --- diff --git a/app/release/release/ICL02Sport_V40_202110281025_release.apk b/app/release/release/ICL02Sport_V43_202110291644_release.apk similarity index 54% rename from app/release/release/ICL02Sport_V40_202110281025_release.apk rename to app/release/release/ICL02Sport_V43_202110291644_release.apk index b9fb9fa..08c1217 100644 Binary files a/app/release/release/ICL02Sport_V40_202110281025_release.apk and b/app/release/release/ICL02Sport_V43_202110291644_release.apk differ diff --git a/app/release/release/output.json b/app/release/release/output.json index b28add2..7ab5586 100644 --- a/app/release/release/output.json +++ b/app/release/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":40,"versionName":"202110281025","enabled":true,"outputFile":"ICL02Sport_V40_202110281025_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Sport_V40_202110281025_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":43,"versionName":"202110291644","enabled":true,"outputFile":"ICL02Sport_V43_202110291644_release.apk","fullName":"release","baseName":"release"},"path":"ICL02Sport_V43_202110291644_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a5b7ebd..27d9ebe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ + package="com.ic.sport" + android:sharedUserId="android.uid.system"> diff --git a/app/src/main/java/com/ic/sport/model/PedometerModel.java b/app/src/main/java/com/ic/sport/model/PedometerModel.java index 854f9af..709cef9 100644 --- a/app/src/main/java/com/ic/sport/model/PedometerModel.java +++ b/app/src/main/java/com/ic/sport/model/PedometerModel.java @@ -15,6 +15,7 @@ import androidx.lifecycle.ViewModel; import androidx.lifecycle.ViewModelProvider; import com.ic.aidl.ped.RecordParcelable; +import com.ic.iclooger.ICLogger; import com.ic.sport.presenter.PedometerPresenter; import com.ic.sport.util.IcLog; @@ -89,6 +90,7 @@ public class PedometerModel extends AndroidViewModel { } public void onBindService() { + ICLogger.e("onBindService..."); pedometerPresenter.bindService(); } @@ -111,6 +113,7 @@ public class PedometerModel extends AndroidViewModel { public void syncPedWeightSetting(int weight) { pedometerPresenter.syncPedWeightSetting(weight); } + public static class Factory extends ViewModelProvider.NewInstanceFactory { @NonNull diff --git a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java index 086ffc2..1d27b21 100644 --- a/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java +++ b/app/src/main/java/com/ic/sport/presenter/PedometerPresenter.java @@ -2,6 +2,7 @@ package com.ic.sport.presenter; import android.content.ComponentName; import android.content.Context; +import android.content.Intent; import android.content.ServiceConnection; import android.os.IBinder; @@ -12,7 +13,6 @@ import com.ic.aidl.ped.IPedAidlInterface; import com.ic.aidl.ped.IPedRemoteService; import com.ic.aidl.ped.RecordParcelable; import com.ic.sport.util.IcLog; -import com.ic.sport.util.ServiceUtil; import java.util.Collections; import java.util.List; @@ -64,14 +64,16 @@ public class PedometerPresenter { }; public void bindService() { - ServiceUtil.bindServiceUtil(mContext, "com.ic.action.WORK_SERVICE", - connection, mContext.getPackageName(), 103); + Intent intent = new Intent("com.ic.action.WORK_SERVICE"); + intent.setPackage("com.ic.work"); + intent.putExtra("target", "sport"); + mContext.bindService(intent, connection, Context.BIND_AUTO_CREATE); } public void unbindService() { try { mService.unregisterCallback(pedInterface); - ServiceUtil.unBindServiceUtil(mContext, connection); + mContext.unbindService(connection); } catch (Exception e) { IcLog.e(TAG, "unbindService"); } finally { diff --git a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java index d8a6274..a3e84fa 100644 --- a/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java +++ b/app/src/main/java/com/ic/sport/widget/ring/RingProgress.java @@ -114,7 +114,7 @@ public class RingProgress extends View { TypedArray typedArray = getContext().obtainStyledAttributes(attrs, R.styleable.CircleProgress); neiYuanColor = typedArray.getColor(R.styleable.CircleProgress_neiYuanColor, getTransparentColor()); ringRadius = (int) typedArray.getDimension(R.styleable.CircleProgress_ringRadius, -1); - ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 22); + ringWidth = (int) typedArray.getDimension(R.styleable.CircleProgress_ringWidth, 34); ringColor = typedArray.getColor(R.styleable.CircleProgress_ringColor, ContextCompat.getColor(getContext(), R.color.top_color2)); ringProgressColor = typedArray.getColor(R.styleable.CircleProgress_ringProgressColor, diff --git a/app/src/main/res/layout/activity_pedometer.xml b/app/src/main/res/layout/activity_pedometer.xml index 2f3e1d9..27101d8 100644 --- a/app/src/main/res/layout/activity_pedometer.xml +++ b/app/src/main/res/layout/activity_pedometer.xml @@ -13,8 +13,7 @@ android:padding="5dp" android:text="@string/app_name" android:textColor="@color/green1" - android:textSize="30sp" - android:textStyle="bold" /> + android:textSize="22sp" /> + android:textSize="22sp" /> + @@ -25,6 +26,7 @@ android:id="@+id/ring_progress" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginTop="5dp" app:decimalPointLength="1" app:isClockwise="true" app:isDecimal="true" @@ -70,7 +72,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="60dp" + android:layout_marginBottom="50dp" android:drawableTop="@mipmap/icon_calorie_small" android:text="@{calorieValue}" android:textColor="@color/white" diff --git a/app/src/main/res/layout/item_ped_setup.xml b/app/src/main/res/layout/item_ped_setup.xml index 918495f..f9341f3 100644 --- a/app/src/main/res/layout/item_ped_setup.xml +++ b/app/src/main/res/layout/item_ped_setup.xml @@ -55,7 +55,7 @@ android:layout_toRightOf="@id/left_icon" android:text="@{setupItemTitle}" android:textColor="@color/white" - android:textSize="30sp" + android:textSize="22sp" android:textStyle="bold" /> diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 8a49b7a..31893d0 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -9,7 +9,7 @@ cm kg - steps + stp Records kcal diff --git a/app/version_code.properties b/app/version_code.properties index c99a06b..3a6edfd 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Thu Oct 28 10:25:00 CST 2021 -VERSION_CODE=40 +#Fri Oct 29 16:44:19 CST 2021 +VERSION_CODE=43