From: TrillGates Date: Fri, 16 Jul 2021 11:36:10 +0000 (+0800) Subject: update iconss X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=dab46f35bb70923a64ec5e93785e5c0950f2d755;p=iclooplauncher.git update iconss --- diff --git a/app/release/ICLoopPageLauncher_V19_202107091744_release.apk b/app/release/ICLoopPageLauncher_V21_202107161442_release.apk similarity index 50% rename from app/release/ICLoopPageLauncher_V19_202107091744_release.apk rename to app/release/ICLoopPageLauncher_V21_202107161442_release.apk index dea3650..e763a4b 100644 Binary files a/app/release/ICLoopPageLauncher_V19_202107091744_release.apk and b/app/release/ICLoopPageLauncher_V21_202107161442_release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 3193165..032f273 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "versionCode": 1, "versionName": "1.0", - "outputFile": "ICLoopPageLauncher_V19_202107091744_release.apk" + "outputFile": "ICLoopPageLauncher_V21_202107161442_release.apk" } ] } \ No newline at end of file diff --git a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java index ccfc448..345b1cd 100644 --- a/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/MainPagePresenter.java @@ -70,7 +70,7 @@ public class MainPagePresenter extends BasePresenter { observerContent(context); updateTemperature(); updateOxygen(); - updateBlood(); + updateEnvTemp(); updateHeartRate(); } @@ -180,12 +180,12 @@ public class MainPagePresenter extends BasePresenter { updateHeartRate(); } }); - context.getContentResolver().registerContentObserver(Uri.parse(SETTINGS + ".blood_high"), + context.getContentResolver().registerContentObserver(Uri.parse(SETTINGS + ".env_temperature"), true, new ContentObserver(null) { @Override public void onChange(boolean selfChange) { //更新血压 - updateBlood(); + updateEnvTemp(); } }); } @@ -240,7 +240,7 @@ public class MainPagePresenter extends BasePresenter { getValueByKey(KEY_OXYGEN); } - private void updateBlood() { + private void updateEnvTemp() { getValueByKey(KEY_ENV_TEMP); } diff --git a/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java b/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java index 04ceed4..abd8f81 100644 --- a/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java +++ b/app/src/main/java/com/ic/launcher/presenter/StatusBarPresenter.java @@ -17,6 +17,7 @@ import android.provider.Settings; import androidx.lifecycle.MutableLiveData; import com.ic.iclooger.ICLogger; +import com.ic.launcher.utils.Constants; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -71,10 +72,21 @@ public class StatusBarPresenter extends StatusBarBasePresenter { checkHasMissCall(); getShakeState(); getPlaneMode(); + checkAlarmState(); observerContentChange(); } private void observerContentChange() { + //监听闹钟状态 + contentResolver.registerContentObserver(Uri.parse(Constants.ALARMS), true, + new ContentObserver(null) { + @Override + public void onChange(boolean selfChange) { + //闹钟变化 + //查询是不是有闹钟是开启的 + checkAlarmState(); + } + }); //观察飞行模式 contentResolver.registerContentObserver(Uri.parse(SETTINGS + ".is_air_mode_enable"), true, new ContentObserver(null) { @@ -101,6 +113,26 @@ public class StatusBarPresenter extends StatusBarBasePresenter { }); } + private void checkAlarmState() { + executorService.execute(() -> { + Cursor query = contentResolver.query(Uri.parse(Constants.ALARMS), + new String[]{"status"}, null, null, null); + if (query != null) { + Boolean hasOpe = Boolean.FALSE; + while (query.moveToNext()) { + String status = query.getString(0); + ICLogger.d("status =...= > " + status); + if ("ON".equals(status)) { + hasOpe = Boolean.TRUE; + break; + } + } + alarmState.postValue(hasOpe); + query.close(); + } + }); + } + private void getPlaneMode() { String isPlaneMode = getContent("is_air_mode_enable"); if ("1".equals(isPlaneMode)) { diff --git a/app/src/main/java/com/ic/launcher/utils/Constants.java b/app/src/main/java/com/ic/launcher/utils/Constants.java index 81fc027..e4c35be 100644 --- a/app/src/main/java/com/ic/launcher/utils/Constants.java +++ b/app/src/main/java/com/ic/launcher/utils/Constants.java @@ -6,4 +6,10 @@ public class Constants { public static final String SETTINGS = "content://" + AUTHORITY + "/" + PATH; public static final String LAUNCHER_APP_LIST_STYLE = "launcher_app_list_style"; public static final String BRIGHTNESS_VALUE = "brightness_value"; + + + public static final String PATH_ALARM = "alarm"; + public static final String AUTHORITY_ALARM = "com.ic.provider.alarm"; + public static final String ALARMS = "content://" + AUTHORITY_ALARM + "/" + PATH_ALARM; + } diff --git a/app/src/main/java/com/ic/launcher/view/MarqueeView.java b/app/src/main/java/com/ic/launcher/view/MarqueeView.java index 3145be3..a239566 100644 --- a/app/src/main/java/com/ic/launcher/view/MarqueeView.java +++ b/app/src/main/java/com/ic/launcher/view/MarqueeView.java @@ -48,23 +48,28 @@ public class MarqueeView extends ViewGroup { //测量孩子 int childCount = getChildCount(); int totalWidth = 0; + int heightSize = MeasureSpec.getSize(heightMeasureSpec); for (int i = 0; i < childCount; i++) { View item = getChildAt(i); if (item.getVisibility() == GONE) { continue; } - int widthSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), MeasureSpec.AT_MOST); + int widthSpec = MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec), + MeasureSpec.AT_MOST); item.measure(widthSpec, heightMeasureSpec); //ICLogger.d("item.getMeasuredWidth() == > " + item.getMeasuredWidth()); //设置孩子的位置,从0开始 + int measuredHeight = item.getMeasuredHeight(); + int top = heightSize / 2 - measuredHeight / 2; + ICLogger.d("measuredHeight == > " + measuredHeight); item.setTag(new Position(totalWidth, - 0, + top, totalWidth + item.getMeasuredWidth(), item.getMeasuredHeight())); totalWidth += item.getMeasuredWidth() + margin * 2; } - int parentWidth = MeasureSpec.makeMeasureSpec(totalWidth, MeasureSpec.EXACTLY); - setMeasuredDimension(parentWidth, heightMeasureSpec); + //int parentWidth = MeasureSpec.makeMeasureSpec(totalWidth, MeasureSpec.EXACTLY); + setMeasuredDimension(totalWidth, heightSize); //测量完以后,判断宽度是否够用 if (defaultWidth == 0) { defaultWidth = MeasureSpec.getSize(widthMeasureSpec); diff --git a/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java b/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java index e94deda..515fa93 100644 --- a/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java +++ b/app/src/main/java/com/ic/launcher/view/SimpleStatusBarView.java @@ -47,15 +47,6 @@ public class SimpleStatusBarView extends FrameLayout { statusBarPresenter.networkTypeValue.observe(lifecycleOwner, type -> { signalView.updateNetworkType(type); }); - statusBarPresenter.signalLev.observe(lifecycleOwner, lev -> { - ICLogger.d("lev == > " + lev); - //信号强度 - if (lev == null) { - signalView.updateLev(0); - } else { - signalView.updateLev(lev); - } - }); statusBarPresenter.hasSimCardValue.observe(lifecycleOwner, hasSimCard -> { ICLogger.d("hasSimCard == > " + hasSimCard); signalView.updateSimCardState(hasSimCard); diff --git a/app/src/main/res/layout/item_status_bar.xml b/app/src/main/res/layout/item_status_bar.xml index 4c00407..9b84d99 100644 --- a/app/src/main/res/layout/item_status_bar.xml +++ b/app/src/main/res/layout/item_status_bar.xml @@ -67,7 +67,6 @@ android:id="@+id/top_icon_wear" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingTop="10dp" android:src="@mipmap/top_icon_wear" android:visibility="gone" /> diff --git a/app/src/main/res/mipmap-mdpi/top_icon_connected.png b/app/src/main/res/mipmap-mdpi/top_icon_connected.png index f33be47..fed5938 100644 Binary files a/app/src/main/res/mipmap-mdpi/top_icon_connected.png and b/app/src/main/res/mipmap-mdpi/top_icon_connected.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_location.png b/app/src/main/res/mipmap-mdpi/top_icon_location.png index fe4fbe1..f9f5ecf 100644 Binary files a/app/src/main/res/mipmap-mdpi/top_icon_location.png and b/app/src/main/res/mipmap-mdpi/top_icon_location.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_wear.png b/app/src/main/res/mipmap-mdpi/top_icon_wear.png index f9f94c5..86f7730 100644 Binary files a/app/src/main/res/mipmap-mdpi/top_icon_wear.png and b/app/src/main/res/mipmap-mdpi/top_icon_wear.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_wifi.png b/app/src/main/res/mipmap-mdpi/top_icon_wifi.png index 445b65e..6bc8985 100644 Binary files a/app/src/main/res/mipmap-mdpi/top_icon_wifi.png and b/app/src/main/res/mipmap-mdpi/top_icon_wifi.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dcd3ef7..dfa4238 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,11 +20,11 @@ com.ic.sport com.ic.weather com.ic.dial - com.ic.icwetalk - com.ic.iccontact + com.ic.wetalk + com.ic.contact com.ic.camera com.eqc.gallery - com.ic.icmms + com.ic.mms com.ic.record com.ic.signin com.ic.setting diff --git a/app/version_code.properties b/app/version_code.properties index 6d25bdc..aeb3a28 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Fri Jul 09 17:44:12 CST 2021 -VERSION_CODE=19 +#Fri Jul 16 14:42:45 CST 2021 +VERSION_CODE=21