From: TrillGates Date: Fri, 11 Jun 2021 12:13:22 +0000 (+0800) Subject: add top status bar. X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3b39cb7f1854a6e1746abd7e6f802b91eecea1e6;p=iclooplauncher.git add top status bar. --- diff --git a/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java b/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java index 2343415..8fba273 100644 --- a/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java +++ b/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java @@ -48,7 +48,6 @@ public class LauncherActivity extends AppCompatActivity { //处理点击事件 mainPageAdapter.setOnItemClickListener(item -> { //打开应用 - }); looperPage.registerOnPageChangeCallback(onPageChangeCallback); } diff --git a/app/src/main/java/com/ic/launcher/loop/view/MarqueeView.java b/app/src/main/java/com/ic/launcher/loop/view/MarqueeView.java new file mode 100644 index 0000000..c921be4 --- /dev/null +++ b/app/src/main/java/com/ic/launcher/loop/view/MarqueeView.java @@ -0,0 +1,115 @@ +package com.ic.launcher.loop.view; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; + +import com.ic.iclooger.ICLogger; + +public class MarqueeView extends ViewGroup { + + public MarqueeView(Context context) { + this(context, null); + } + + public MarqueeView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public MarqueeView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } + + public void setMargin(int margin) { + this.margin = margin; + } + + static class Position { + public Position(int left, int top, int right, int bottom) { + this.left = left; + this.top = top; + this.right = right; + this.bottom = bottom; + } + + public int left = 0; + public int top = 0; + public int right = 0; + public int bottom = 0; + } + + private int margin = 0; + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + //测量孩子 + int childCount = getChildCount(); + int totalWidth = 0; + 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); + item.measure(widthSpec, heightMeasureSpec); + //ICLogger.d("item.getMeasuredWidth() == > " + item.getMeasuredWidth()); + //设置孩子的位置,从0开始 + item.setTag(new Position(totalWidth, 0, totalWidth + item.getMeasuredWidth(), item.getMeasuredHeight())); + totalWidth += item.getMeasuredWidth() + margin * 2; + } + int parentWidth = MeasureSpec.makeMeasureSpec(totalWidth, MeasureSpec.EXACTLY); + setMeasuredDimension(parentWidth, heightMeasureSpec); + //测量完以后,判断宽度是否够用 + int defaultWidth = MeasureSpec.getSize(widthMeasureSpec); + //如果不够用则滚动,如果够用则不滚动 + ICLogger.d("default width == > " + totalWidth + " real width == > " + defaultWidth); + removeCallbacks(scrollTask); + if (totalWidth > defaultWidth) { + postDelayed(scrollTask, 1000); + } + } + + + //从这个地方开始摆放 + private final int stepDx = 1; + + private final Runnable scrollTask = new Runnable() { + @Override + public void run() { + updateLayout(); + postDelayed(this, 100); + } + }; + + + @Override + protected void onLayout(boolean changed, int l, int t, int r, int b) { + updateLayout(); + } + + private void updateLayout() { + //摆放孩子 + int childCount = getChildCount(); + //从0开始, + for (int i = 0; i < childCount; i++) { + View item = getChildAt(i); + if (item.getVisibility() == GONE) { + continue; + } + //拿到它的位置 + Position position = (Position) item.getTag(); + position.left -= stepDx; + position.right = position.left + item.getMeasuredWidth(); + //检查位置是否超了 + if (position.right <= 0) { + //归位到最后面去 + position.right = getMeasuredWidth() - margin; + position.left = position.right - item.getMeasuredWidth(); + } + item.setTag(position); + //布局 + item.layout(position.left, position.top, position.right, position.bottom); + } + } +} diff --git a/app/src/main/java/com/ic/launcher/loop/view/StatusBarView.java b/app/src/main/java/com/ic/launcher/loop/view/StatusBarView.java index b7185ce..41fa128 100644 --- a/app/src/main/java/com/ic/launcher/loop/view/StatusBarView.java +++ b/app/src/main/java/com/ic/launcher/loop/view/StatusBarView.java @@ -4,6 +4,7 @@ import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; import android.widget.FrameLayout; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -15,6 +16,9 @@ import com.ic.launcher.loop.presenter.StatusBarPresenter; public class StatusBarView extends FrameLayout { private StatusBarPresenter statusBarPresenter; + private SignalView signalView; + private BatteryView batteryView; + private TextView batteryValueTv; public StatusBarView(@NonNull Context context) { this(context, null); @@ -28,6 +32,17 @@ public class StatusBarView extends FrameLayout { super(context, attrs, defStyleAttr); //加载布局 LayoutInflater.from(context).inflate(R.layout.item_status_bar, this); + initView(); + } + + private void initView() { + signalView = findViewById(R.id.signal_view); + signalView.noNetwork(); + batteryView = findViewById(R.id.right_battery_view); + batteryView.updateCurrentLev(30); + batteryValueTv = findViewById(R.id.battery_value); + batteryValueTv.setText(30 + "%"); + MarqueeView marqueeView = findViewById(R.id.mar_queue_view); } public void initPresenter(LifecycleOwner lifecycleOwner) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index eaa0804..11f1c42 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,7 +20,6 @@ android:id="@+id/status_bar" android:layout_width="match_parent" android:layout_height="34dp" - android:background="#00ffaa" android:visibility="gone" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_status_bar.xml b/app/src/main/res/layout/item_status_bar.xml index ac048c8..f319374 100644 --- a/app/src/main/res/layout/item_status_bar.xml +++ b/app/src/main/res/layout/item_status_bar.xml @@ -6,24 +6,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-mdpi/top_alarm_open.png b/app/src/main/res/mipmap-mdpi/top_alarm_open.png new file mode 100644 index 0000000..44d87d5 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_alarm_open.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_bt.png b/app/src/main/res/mipmap-mdpi/top_icon_bt.png new file mode 100644 index 0000000..c9655e0 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_bt.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_connected.png b/app/src/main/res/mipmap-mdpi/top_icon_connected.png new file mode 100644 index 0000000..b5e30cf Binary files /dev/null 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 new file mode 100644 index 0000000..2079168 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_location.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_miss_phone.png b/app/src/main/res/mipmap-mdpi/top_icon_miss_phone.png new file mode 100644 index 0000000..04af0e2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_miss_phone.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_new_msg.png b/app/src/main/res/mipmap-mdpi/top_icon_new_msg.png new file mode 100644 index 0000000..07612a7 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_new_msg.png differ diff --git a/app/src/main/res/mipmap-mdpi/top_icon_warning_msg_un_read.png b/app/src/main/res/mipmap-mdpi/top_icon_warning_msg_un_read.png new file mode 100644 index 0000000..2a4fb6b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_warning_msg_un_read.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 new file mode 100644 index 0000000..9f09b01 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/top_icon_wifi.png differ