completed ui part.

diff --git a/app/release/ICLoopPageLauncher_V2_202106121959_release.apk b/app/release/ICLoopPageLauncher_V2_202106121959_release.apk
new file mode 100644 (file)
index 0000000..e96e78f
Binary files /dev/null and b/app/release/ICLoopPageLauncher_V2_202106121959_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644 (file)
index 0000000..e38593f
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.ic.launcher.loop",
+  "variantName": "processReleaseResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "ICLoopPageLauncher_V2_202106121959_release.apk"
+    }
+  ]
+}
\ No newline at end of file

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 8fba273..0eabca3 100644 (file)
--- a/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java
+++ b/app/src/main/java/com/ic/launcher/loop/LauncherActivity.java
@@ -1,7 +1,10 @@
 package com.ic.launcher.loop;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.viewpager2.widget.ViewPager2;
@@ -48,6 +51,18 @@ public class LauncherActivity extends AppCompatActivity {
         //处理点击事件
         mainPageAdapter.setOnItemClickListener(item -> {
             //打开应用
+            int packageNameResId = item.getPackageNameResId();
+            String packageName = getString(packageNameResId);
+            if (!TextUtils.isEmpty(packageName)) {
+                Intent launchIntentForPackage = getPackageManager().getLaunchIntentForPackage(packageName);
+                if (launchIntentForPackage != null) {
+                    launchIntentForPackage.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(launchIntentForPackage);
+                } else {
+                    Toast.makeText(this, getString(R.string.no_application_tips_text),
+                            Toast.LENGTH_SHORT).show();
+                }
+            }
         });
         looperPage.registerOnPageChangeCallback(onPageChangeCallback);
     }

diff --git a/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java b/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java
index 43922b1..f6949bc 100644 (file)
--- a/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java
+++ b/app/src/main/java/com/ic/launcher/loop/adapter/MainPageAdapter.java
@@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.ic.launcher.loop.R;
 import com.ic.launcher.loop.data.AppItem;
 
-import java.io.PipedOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -70,6 +69,11 @@ public class MainPageAdapter extends RecyclerView.Adapter<MainPageAdapter.InnerH
             itemTitle.setText(appItem.getTitleResId());
             ImageView iconView = itemView.findViewById(R.id.app_icon_iv);
             iconView.setImageResource(appItem.getIconResId());
+            itemView.setOnClickListener(v -> {
+                if (mItemClickListener != null) {
+                    mItemClickListener.onItemClick(appItem);
+                }
+            });
         }
     }
 

diff --git a/app/src/main/java/com/ic/launcher/loop/data/AppItem.java b/app/src/main/java/com/ic/launcher/loop/data/AppItem.java
index 5823be0..f0dcd94 100644 (file)
--- a/app/src/main/java/com/ic/launcher/loop/data/AppItem.java
+++ b/app/src/main/java/com/ic/launcher/loop/data/AppItem.java
@@ -7,6 +7,7 @@ public class AppItem {
         this.iconResId = iconResId;
         this.packageNameResId = packageNameResId;
         this.enable = enable;
+
     }
 
     private int titleResId;
@@ -17,6 +18,7 @@ public class AppItem {
 
     private int packageNameResId;
 
+
     public int getPackageNameResId() {
         return packageNameResId;
     }

diff --git a/app/src/main/java/com/ic/launcher/loop/presenter/StatusBarBasePresenter.java b/app/src/main/java/com/ic/launcher/loop/presenter/StatusBarBasePresenter.java
index 4e56fa6..cb301d8 100644 (file)
--- a/app/src/main/java/com/ic/launcher/loop/presenter/StatusBarBasePresenter.java
+++ b/app/src/main/java/com/ic/launcher/loop/presenter/StatusBarBasePresenter.java
@@ -39,12 +39,11 @@ public class StatusBarBasePresenter extends BasePresenter {
     public StatusBarBasePresenter(Context context) {
         this.mContext = context;
         //获取电量和充电状态
-        getBatteryLev();
+        getBatteryLevAndChargeState();
         getSignalLev();
-        checkCharging();
     }
 
-    private void checkCharging() {
+    private void getBatteryLevAndChargeState() {
         //充电状态
         IntentFilter batteryFilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
         mContext.registerReceiver(batteryLevReceiver, batteryFilter);
@@ -122,9 +121,4 @@ public class StatusBarBasePresenter extends BasePresenter {
         isServerConnected.postValue(connected);
     }
 
-
-    private void getBatteryLev() {
-
-    }
-
 }

diff --git a/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java b/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java
index 30da8af..e86bfc8 100644 (file)
--- a/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java
+++ b/app/src/main/java/com/ic/launcher/loop/view/MainPageView.java
@@ -2,12 +2,12 @@ package com.ic.launcher.loop.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-public class MainPageView extends FrameLayout {
+public class MainPageView extends LinearLayout {
 
     public MainPageView(@NonNull Context context) {
         super(context);

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11f1c42..03fdd58 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,7 @@
         android:id="@+id/main_looper_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginTop="34dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"

diff --git a/app/src/main/res/layout/item_main_page.xml b/app/src/main/res/layout/item_main_page.xml
index 3d7e14d..c8a02ca 100644 (file)
--- a/app/src/main/res/layout/item_main_page.xml
+++ b/app/src/main/res/layout/item_main_page.xml
@@ -1,15 +1,149 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.ic.launcher.loop.view.MainPageView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
 
     <TextView
+        android:id="@+id/time_tv"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:text="首页"
-        android:textColor="@color/white" />
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:includeFontPadding="false"
+        android:text="00:00"
+        android:textColor="@color/white"
+        android:textSize="120sp" />
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="22dp"
+        android:layout_marginRight="22dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left"
+            android:includeFontPadding="false"
+            android:text="02-30"
+            android:textColor="@color/white"
+            android:textSize="40sp" />
+
+        <TextView
+            android:id="@+id/week_date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:includeFontPadding="false"
+            android:text="星期天"
+            android:textColor="@color/white"
+            android:textSize="40sp" />
+
+    </FrameLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@mipmap/out_temp" />
+
+            <TextView
+                android:id="@+id/out_temp_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="24.0"
+                android:textColor="@color/white"
+                android:textSize="24sp" />
+
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@mipmap/heart_rate" />
+
+            <TextView
+                android:id="@+id/heart_rate_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="98"
+                android:textColor="@color/white"
+                android:textSize="24sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@mipmap/spo2" />
+
+            <TextView
+                android:id="@+id/blood_oxygen_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="120"
+                android:textColor="@color/white"
+                android:textSize="24sp" />
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@mipmap/body_temp" />
+
+            <TextView
+                android:id="@+id/body_temp_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="36.5"
+                android:textColor="@color/white"
+                android:textSize="24sp" />
+
+
+        </LinearLayout>
+    </LinearLayout>
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</com.ic.launcher.loop.view.MainPageView>
\ No newline at end of file

diff --git a/app/src/main/res/mipmap-mdpi/body_temp.png b/app/src/main/res/mipmap-mdpi/body_temp.png
new file mode 100644 (file)
index 0000000..f5ed350
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/body_temp.png differ

diff --git a/app/src/main/res/mipmap-mdpi/heart_rate.png b/app/src/main/res/mipmap-mdpi/heart_rate.png
new file mode 100644 (file)
index 0000000..b5252f9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/heart_rate.png differ

diff --git a/app/src/main/res/mipmap-mdpi/out_temp.png b/app/src/main/res/mipmap-mdpi/out_temp.png
new file mode 100644 (file)
index 0000000..ea16ca8
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/out_temp.png differ

diff --git a/app/src/main/res/mipmap-mdpi/spo2.png b/app/src/main/res/mipmap-mdpi/spo2.png
new file mode 100644 (file)
index 0000000..566bf26
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/spo2.png differ

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f76ab0..337ce84 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,17 +18,18 @@
     <string name="app_title_settings">设定</string>
 
     <!--Package name-->
-    <string name="app_package_name_temperature">体温</string>
-    <string name="app_package_name_health">健康</string>
-    <string name="app_package_name_sport">运动</string>
-    <string name="app_package_name_weather">天气</string>
-    <string name="app_package_name_phone">电话</string>
-    <string name="app_package_name_ic_talk">微聊</string>
-    <string name="app_package_name_contact">联系人</string>
-    <string name="app_package_name_camera">拍照</string>
-    <string name="app_package_name_photo">相册</string>
-    <string name="app_package_name_sms">短信</string>
-    <string name="app_package_name_record">记录</string>
-    <string name="app_package_name_sign">签到</string>
-    <string name="app_package_name_settings">设定</string>
+    <string name="app_package_name_temperature">com.ic.temperature</string>
+    <string name="app_package_name_health">com.ic.blood</string>
+    <string name="app_package_name_sport">com.ic.sport</string>
+    <string name="app_package_name_weather">com.ic.weather</string>
+    <string name="app_package_name_phone">com.ic.dial</string>
+    <string name="app_package_name_ic_talk">com.ic.icwetalk</string>
+    <string name="app_package_name_contact">com.ic.iccontact</string>
+    <string name="app_package_name_camera">com.eqc.camera</string>
+    <string name="app_package_name_photo">com.eqc.gallery</string>
+    <string name="app_package_name_sms">com.ic.sms</string>
+    <string name="app_package_name_record">com.ic.record</string>
+    <string name="app_package_name_sign">com.ic.sign</string>
+    <string name="app_package_name_settings">com.eqc.setting</string>
+    <string name="no_application_tips_text">未找到相关应用.</string>
 </resources>
\ No newline at end of file

diff --git a/app/version_code.properties b/app/version_code.properties
index 84c599e..13c6595 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 09 16:08:52 CST 2021
-VERSION_CODE=1
+#Sat Jun 12 19:59:47 CST 2021
+VERSION_CODE=2