version:3.7

fix:
update:修改主页

app/src/main/java/com/uiuios/aios/activity/AddIconActivity.java

@@ -0,0 +1,76 @@
+package com.uiuios.aios.activity;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.uiuios.aios.R;
+import com.uiuios.aios.adapter.AddAppAdapter;
+import com.uiuios.aios.base.BaseActivity;
+import com.uiuios.aios.bean.DesktopIcon;
+import com.uiuios.aios.manager.AppManager;
+import com.uiuios.aios.view.RecyclerViewSpacesItemDecoration;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Set;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AddIconActivity extends BaseActivity {
+
+    @BindView(R.id.iv_back)
+    ImageView iv_back;
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R.id.tv_appsize)
+    TextView tv_appsize;
+
+    private AddAppAdapter mAddAppAdapter;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_add_icon;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        iv_back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        recyclerView.setLayoutManager(new GridLayoutManager(this, 6));
+        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
+        WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        DisplayMetrics dm = new DisplayMetrics();
+        wm.getDefaultDisplay().getRealMetrics(dm);
+        float density = dm.density;         // 屏幕密度（0.75 / 1.0 / 1.5）
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, (int) (density * 1));//top间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, (int) (density * 1));//底部间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, (int) (density * 20));//左间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, (int) (density * 20));//右间距
+        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+        mAddAppAdapter = new AddAppAdapter();
+        recyclerView.setAdapter(mAddAppAdapter);
+    }
+
+    @Override
+    public void initData() {
+        ArrayList<DesktopIcon> desktopIcons = AppManager.getInstance().getAllAppList();
+        mAddAppAdapter.setDesktopIcons(desktopIcons);
+        Set<String> appList = AppManager.getInstance().getAddPackages();
+        mAddAppAdapter.setPackageSet(appList);
+        tv_appsize.setText(String.format(getString(R.string.app_size), desktopIcons.size()));
+    }
+}

app/src/main/java/com/uiuios/aios/activity/main/MainActivity.java

@@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Color;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.provider.Settings;
@@ -38,7 +39,9 @@ import com.uiuios.aios.bean.DesktopIcon;
 import com.uiuios.aios.config.CommonConfig;
 import com.uiuios.aios.fragment.AppListFragment;
 import com.uiuios.aios.base.BaseFragmentPagerAdapter;
+import com.uiuios.aios.fragment.ControlFragment;
 import com.uiuios.aios.fragment.custom.CustomFragment;
+import com.uiuios.aios.fragment.home.HomeFragment;
 import com.uiuios.aios.fragment.second.SecondFragment;
 import com.uiuios.aios.manager.RemoteManager;
 import com.uiuios.aios.service.NotificationService;
@@ -74,12 +77,14 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
     private BaseFragmentPagerAdapter mBaseFragmentPagerAdapter;
 
     private List<Fragment> mFragments;
-    private CustomFragment mCustomFragment;
-    private SecondFragment mSecondFragment;
+    private ControlFragment mControlFragment;
+    private HomeFragment mHomeFragment;
+//    private CustomFragment mCustomFragment;
+//    private SecondFragment mSecondFragment;
 
     private boolean is_twoscreen = false;
-    private int appListIndex = 1;
-    private int defaultCurrent = 0;
+    private int appListIndex = 2;
+    private int defaultCurrent = 1;
 
     @Override
     public int getLayoutId() {
@@ -113,8 +118,12 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
 //            mSecondFragment = new SecondFragment();
 //            mFragments.add(mSecondFragment);
 //        }
-        mCustomFragment = new CustomFragment();
-        mFragments.add(mCustomFragment);
+//        mCustomFragment = new CustomFragment();
+//        mFragments.add(mCustomFragment);
+        mControlFragment =new ControlFragment();
+        mFragments.add(mControlFragment);
+        mHomeFragment =new HomeFragment();
+        mFragments.add(mHomeFragment);
 
         mMainPresenter.getSystemSettings();
 //        mMainPresenter.getAdminSnSetting();
@@ -216,13 +225,13 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
             String json = mIAlarmAidlInterface.getAlarm();
             Log.e(TAG, "onServiceConnected: " + json);
             if ("暂无闹钟".equalsIgnoreCase(json) || TextUtils.isEmpty(json)) {
-                mCustomFragment.setAlarmItem(null);
+//                mCustomFragment.setAlarmItem(null);
                 return;
             }
             Type type = new TypeToken<List<AlarmItem>>() {
             }.getType();
             List<AlarmItem> alarmItem = new Gson().fromJson(json, type);
-            mCustomFragment.setAlarmItem(alarmItem);
+//            mCustomFragment.setAlarmItem(alarmItem);
         } catch (RemoteException e) {
             e.printStackTrace();
         }
@@ -458,6 +467,16 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
         }
     }
 
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+//        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+//        super.onRestoreInstanceState(savedInstanceState);
+    }
+
     private void registmNewAppReceiver() {
         mNewAppReceiver = new NewAppReceiver();
         IntentFilter filter = new IntentFilter();
@@ -503,7 +522,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView {
             Log.e(TAG, "onReceive: " + intent.getAction());
             String setting_sos = intent.getStringExtra("setting_sos");
             if (TextUtils.isEmpty(setting_sos)) return;
-            mCustomFragment.setSosNumber();
+//            mCustomFragment.setSosNumber();
         }
     }