刘振兴 3 years ago
parent
commit
1450d374f2

+ 1 - 1
.idea/misc.xml

@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="../../../../../layout/custom_preview.xml" value="0.10431654676258993" />
         <entry key="app/src/main/res/drawable-xxhdpi/all_apps_button_icon.xml" value="0.1" />
         <entry key="app/src/main/res/drawable-xxhdpi/all_apps_divider.xml" value="0.1" />
         <entry key="app/src/main/res/drawable-xxhdpi/all_apps_search_divider.xml" value="0.1" />
@@ -41,7 +42,6 @@
         <entry key="app/src/main/res/layout/activity_select_face.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_app.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_app_title.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/item_recent.xml" value="0.1897644927536232" />
         <entry key="app/src/main/res/layout/layout_appitem.xml" value="0.11018518518518519" />
         <entry key="app/src/main/res/layout/layout_appitem_title.xml" value="0.1" />
         <entry key="app/src/main/res/layout/view_face_0.xml" value="0.1" />

+ 1 - 1
app/src/main/java/com/xplora/xplauncher/activity/FaceSelectActivity.java

@@ -55,7 +55,7 @@ public class FaceSelectActivity extends BaseActivity {
         viewPager.setOnSideListener(new SideViewPager.onSideListener() {
             @Override
             public void onLeftSide() {
-                finish();
+                //finish();
             }
 
             @Override

+ 25 - 0
app/src/main/java/com/xplora/xplauncher/activity/MainActivity.java

@@ -1,11 +1,14 @@
 package com.xplora.xplauncher.activity;
 
+import androidx.annotation.RequiresApi;
 import androidx.viewpager.widget.ViewPager;
 
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 import android.provider.ContactsContract;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -78,6 +81,27 @@ public class MainActivity extends BaseActivity {
         mViewPagerAdapter = new ViewPagerAdapter(mPagesDatas);//创建适配器对象
         mViewPager.setAdapter(mViewPagerAdapter);//设置适配器
         mViewPager.setCurrentItem(Constant.HOME_INDEX);
+
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 1) {
+                    HomePager homeView = (HomePager)mPagerViews.get(1);
+                    homeView.refreshTime();
+                }else {
+                    HomePager homeView = (HomePager)mPagerViews.get(1);
+                    homeView.pauseSecondAnim();
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+            }
+        });
     }
 
     private void initContactsPager() {
@@ -244,6 +268,7 @@ public class MainActivity extends BaseActivity {
 
         mPagesDatas.set(1, homeView.mBaseView);
         mViewPagerAdapter.notifyDataSetChanged();
+        homeView.refreshTime();
     }
 
     public void addQuickApps(int viewIndex, int appIndex, String packageName) {

+ 1 - 1
app/src/main/java/com/xplora/xplauncher/data/DataManager.java

@@ -54,7 +54,7 @@ public class DataManager {
     }
 
     public void loadFaceIndex() {
-        mFaceIndex = 0;
+        mFaceIndex = 2;
     }
 
     public int getFaceIndex() {

+ 8 - 1
app/src/main/java/com/xplora/xplauncher/view/HomePager.java

@@ -97,11 +97,18 @@ public class HomePager extends BasePager {
             mTemperatureTV.setText("34");
     }
 
+    public void pauseSecondAnim() {
+        if (mClockSecondAnim != null) {
+            mClockSecondAnim.cancel();
+            mClockSecondAnim = null;
+        }
+    }
+
     public void destroyView() {
         //停止秒针动画
         if (mClockSecondIV != null) {
             mClockSecondIV.clearAnimation();
-            mClockSecondAnim = null;
+            mClockSecondAnim.cancel();
         }
     }