version:1.1

fix:
update:优化

app/build.gradle

@@ -16,12 +16,9 @@ android {
         applicationId "com.uiui.zyos"
         minSdkVersion 24
         targetSdkVersion 29
-        /*TeclastMTK12*/
-        versionCode 7
-        versionName "1.6"
-//        /*展锐*/
-//        versionCode 1
-//        versionName "1.0"
+
+        versionCode 2
+        versionName "1.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -73,7 +73,7 @@
             android:resumeWhilePausing="true"
             android:screenOrientation="userLandscape"
             android:stateNotNeeded="true"
-            android:taskAffinity="com.example.taskaffinity.newtask"
+            android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -90,9 +90,12 @@
             android:excludeFromRecents="true"
             android:screenOrientation="portrait"
             android:theme="@style/activity_styles" />
-        <activity android:name=".activity.PolicyActivity"
-            android:launchMode="singleTask"/>
-
+        <activity
+            android:name=".activity.PolicyActivity"
+            android:launchMode="singleTask" />
+        <activity
+            android:name=".activity.more.MoreAppActivity"
+            android:launchMode="singleTask" />
 
         <receiver
             android:name=".receiver.BootReceiver"
@@ -159,9 +162,7 @@
 
                 <data android:scheme="package" />
             </intent-filter>
-        </receiver>
-
-        <!-- &lt;!&ndash; 声明service组件 &ndash;&gt; -->
+        </receiver> <!-- &lt;!&ndash; 声明service组件 &ndash;&gt; -->
         <!-- <service -->
         <!-- android:name="com.baidu.location.f" -->
         <!-- android:enabled="true" -->
@@ -170,7 +171,6 @@
         <!-- <uses-library -->
         <!-- android:name="org.apache.http.legacy" -->
         <!-- android:required="false" /> -->
-
         <activity
             android:name="com.tencent.android.tpush.TpnsActivity"
             android:exported="true"
@@ -218,8 +218,7 @@
             <intent-filter>
                 <action android:name="android.intent.action" />
             </intent-filter>
-        </activity>
-        <!-- 【必须】 信鸽receiver广播接收 -->
+        </activity> <!-- 【必须】 信鸽receiver广播接收 -->
         <receiver
             android:name="com.tencent.android.tpush.XGPushReceiver"
             android:exported="false"

app/src/main/aidl/com/uiui/zy/IGetInfoInterface.aidl

@@ -1,5 +1,5 @@
 // IGetInfoInterface.aidl
-package com.uiui.zysn;
+package com.uiui.zy;
 
 // Declare any non-default types here with import statements
 
@@ -21,4 +21,6 @@ interface IGetInfoInterface {
     boolean SnIsActivation();
     //设置为默认桌面
     void setDefaultLauncher(String pkg);
+    //获取应用使用时长
+    String getAppUsedStatistics();
 }

app/src/main/java/com/uiui/zyos/activity/main/MainAPresenter.java

@@ -22,8 +22,9 @@ import io.reactivex.rxjava3.subjects.BehaviorSubject;
 
 public class MainAPresenter implements MainContact.Presenter {
     private static final String TAG = MainAPresenter.class.getSimpleName();
-    private MainContact.MainView mView;
+
     private Context mContext;
+    private MainContact.MainView mView;
 
     private BehaviorSubject<ActivityEvent> lifecycle;
 
@@ -111,7 +112,9 @@ public class MainAPresenter implements MainContact.Presenter {
         AppUsedTimeUtils.getInstance().sendRunningApp(new AppUsedTimeUtils.RunningAppCallback() {
             @Override
             public void onComplete() {
-                mView.sendRunningInfoFinish();
+                if (mView != null) {
+                    mView.sendRunningInfoFinish();
+                }
             }
         });
     }

app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java

@@ -108,6 +108,8 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
 
     @Override
     public void initView() {
+        Log.e(TAG, "initView: ");
+
         ButterKnife.bind(this);
 //        toggleNotificationListenerService(this);
         mPresenter = new MainAPresenter(this);
@@ -146,26 +148,26 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
         mSubjectFragment.setPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                Log.e("mSubjectFragment", "onPageScrolled: position = " + position + " positionOffset = " + positionOffset + " positionOffsetPixels = " + positionOffsetPixels);
+//                Log.e("mSubjectFragment", "onPageScrolled: position = " + position + " positionOffset = " + positionOffset + " positionOffsetPixels = " + positionOffsetPixels);
                 mMagicIndicator.onPageScrolled(position + 1, positionOffset, positionOffsetPixels);
             }
 
             @Override
             public void onPageSelected(int position) {
-                Log.e("mSubjectFragment", "onPageSelected: position = " + position);
+//                Log.e("mSubjectFragment", "onPageSelected: position = " + position);
                 mMagicIndicator.onPageSelected(position + 1);
             }
 
             @Override
             public void onPageScrollStateChanged(int state) {
-                Log.e("mSubjectFragment", "onPageSelected: state = " + state);
+//                Log.e("mSubjectFragment", "onPageSelected: state = " + state);
                 mMagicIndicator.onPageScrollStateChanged(state);
             }
         });
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                Log.e("mViewPager", "onPageScrolled: position = " + position + " positionOffset = " + positionOffset + " positionOffsetPixels = " + positionOffsetPixels);
+//                Log.e("mViewPager", "onPageScrolled: position = " + position + " positionOffset = " + positionOffset + " positionOffsetPixels = " + positionOffsetPixels);
                 if (!(position == 1 && positionOffsetPixels == 0)) {
                     if (position <= 1) {
                         mMagicIndicator.onPageScrolled(position, positionOffset, positionOffsetPixels);
@@ -175,7 +177,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
 
             @Override
             public void onPageSelected(int position) {
-                Log.e("mViewPager", "onPageSelected: position = " + position);
+//                Log.e("mViewPager", "onPageSelected: position = " + position);
                 if (position <= 1) {
                     mMagicIndicator.onPageSelected(position);
                 }
@@ -183,7 +185,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
 
             @Override
             public void onPageScrollStateChanged(int state) {
-                Log.e("mViewPager", "onPageSelected: state = " + state);
+//                Log.e("mViewPager", "onPageSelected: state = " + state);
                 mMagicIndicator.onPageScrollStateChanged(state);
             }
         });

app/src/main/java/com/uiui/zyos/activity/more/MoreAppActivity.java

@@ -0,0 +1,82 @@
+package com.uiui.zyos.activity.more;
+
+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.uiui.zyos.R;
+import com.uiui.zyos.adapter.AppAdapter;
+import com.uiui.zyos.base.BaseActivity;
+import com.uiui.zyos.bean.DesktopIcon;
+import com.uiui.zyos.view.RecyclerViewSpacesItemDecoration;
+
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class MoreAppActivity extends BaseActivity implements MoreContact.MoreView {
+
+    @BindView(R.id.iv_back)
+    ImageView iv_back;
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    @BindView(R.id.tv_appsize)
+    TextView tv_appsize;
+
+    private MorePresenter mPresenter;
+    private AppAdapter mAppAdapter;
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_moreapp;
+    }
+
+    @Override
+    public void initView() {
+        ButterKnife.bind(this);
+        mPresenter = new MorePresenter(this);
+        mPresenter.attachView(this);
+        mPresenter.setLifecycle(lifecycleSubject);
+
+        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));
+        mAppAdapter = new AppAdapter();
+        recyclerView.setAdapter(mAppAdapter);
+
+    }
+
+    @Override
+    public void initData() {
+        mPresenter.getInstalledApp();
+    }
+
+    @Override
+    public void setDesktopIcons(List<DesktopIcon> desktopIcons) {
+        mAppAdapter.setDesktopIcons(desktopIcons);
+        tv_appsize.setText(String.format(getString(R.string.app_size),desktopIcons.size()));
+    }
+}

app/src/main/java/com/uiui/zyos/activity/more/MoreContact.java

@@ -0,0 +1,17 @@
+package com.uiui.zyos.activity.more;
+
+import com.uiui.zyos.base.BasePresenter;
+import com.uiui.zyos.base.BaseView;
+import com.uiui.zyos.bean.DesktopIcon;
+
+import java.util.List;
+
+public class MoreContact {
+    public interface Presenter extends BasePresenter<MoreView> {
+        void getInstalledApp();
+    }
+
+    public interface MoreView extends BaseView {
+        void setDesktopIcons(List<DesktopIcon> desktopIcons);
+    }
+}

app/src/main/java/com/uiui/zyos/activity/more/MorePresenter.java

@@ -0,0 +1,52 @@
+package com.uiui.zyos.activity.more;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.uiui.zyos.bean.DesktopIcon;
+import com.uiui.zyos.utils.ApkUtils;
+
+import java.util.ArrayList;
+
+import io.reactivex.rxjava3.subjects.BehaviorSubject;
+
+public class MorePresenter implements MoreContact.Presenter {
+    private static final String TAG = MorePresenter.class.getSimpleName();
+
+    private Context mContext;
+    private MoreContact.MoreView mView;
+
+    private BehaviorSubject<ActivityEvent> lifecycle;
+
+    void setLifecycle(BehaviorSubject<ActivityEvent> lifecycle) {
+        this.lifecycle = lifecycle;
+    }
+
+    public BehaviorSubject<ActivityEvent> getLifecycle() {
+        return lifecycle;
+    }
+
+    MorePresenter(Context context) {
+        this.mContext = context;
+        Log.e(TAG, "MainAPresenter: " + context.getClass());
+    }
+
+    @Override
+    public void attachView(@NonNull MoreContact.MoreView view) {
+        this.mView = view;
+    }
+
+    @Override
+    public void detachView() {
+        this.mView = null;
+    }
+
+    @Override
+    public void getInstalledApp() {
+        ArrayList<DesktopIcon> desktopIcons = ApkUtils.queryFilterAppInfo(mContext);
+        mView.setDesktopIcons(desktopIcons);
+    }
+}

app/src/main/java/com/uiui/zyos/bean/AppUsed.java

@@ -0,0 +1,45 @@
+package com.uiui.zyos.bean;
+
+import androidx.annotation.NonNull;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonParser;
+
+import java.io.Serializable;
+
+public class AppUsed implements Serializable {
+    private static final long serialVersionUID = -317163343719361595L;
+    String packages;
+    long useTime;
+    String app_name;
+
+    public String getPackages() {
+        return packages;
+    }
+
+    public void setPackages(String packages) {
+        this.packages = packages;
+    }
+
+    public long getUseTime() {
+        return useTime;
+    }
+
+    public void setUseTime(long useTime) {
+        this.useTime = useTime;
+    }
+
+    public String getApp_name() {
+        return app_name;
+    }
+
+    public void setApp_name(String app_name) {
+        this.app_name = app_name;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return JsonParser.parseString(new Gson().toJson(this)).getAsJsonObject().toString();
+    }
+}

app/src/main/java/com/uiui/zyos/fragment/user/UserContact.java

@@ -16,12 +16,13 @@ public class UserContact {
         void getSnInfo();
         void getQrCode();
         void getInstalledApp();
-
+        void getAppUsedStatistics();
     }
 
     public interface UserView extends BaseView {
         void setSnInfo(BaseResponse<SnInfo> response);
         void setQrCode(Bitmap bitmap);
         void setInstalledApp( ArrayList<DesktopIcon> desktopIcons);
+        void setAppUsedStatistics(long time);
     }
 }

app/src/main/java/com/uiui/zyos/fragment/user/UserFragment.java

@@ -27,12 +27,14 @@ import com.bumptech.glide.Glide;
 import com.shehuan.niv.NiceImageView;
 import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.R;
+import com.uiui.zyos.activity.more.MoreAppActivity;
 import com.uiui.zyos.adapter.AppAdapter;
 import com.uiui.zyos.base.BaseFragment;
 import com.uiui.zyos.bean.BaseResponse;
 import com.uiui.zyos.bean.DesktopIcon;
 import com.uiui.zyos.bean.SnInfo;
 import com.uiui.zyos.config.CommonConfig;
+import com.uiui.zyos.manager.RemoteManager;
 import com.uiui.zyos.utils.ApkUtils;
 import com.uiui.zyos.utils.TimeUtils;
 import com.uiui.zyos.utils.ToastUtil;
@@ -93,6 +95,7 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
     @BindView(R.id.tv_activation)
     TextView tv_activation;
 
+
     private AppAdapter mAppAdapter;
 
     private UserPresenter mPresenter;
@@ -145,7 +148,8 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
     @Override
     public void fetchData() {
         Log.e(TAG, "fetchData: ");
-        mPresenter.getSnInfo();
+//        mPresenter.getInstalledApp();
+//        mPresenter.getSnInfo();
     }
 
     @Override
@@ -178,6 +182,9 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
 
     private void initView() {
         Log.e(TAG, "initView: ");
+        tv_notification.requestFocus();
+        tv_activated.setOnClickListener(view -> ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME));
+        iv_avatar.setOnClickListener(view -> ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME));
         registerOwnReceiver();
         String name = mMMKV.decodeString("USERINFO_NAME", "");
         if (TextUtils.isEmpty(name)) {
@@ -207,15 +214,21 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
         tv_activation.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ApkUtils.openPackage(mContext, "com.uiui.zysn");
+                ApkUtils.openPackage(mContext, RemoteManager.SN_PACKAGE_NAME);
             }
         });
         String avatar = mMMKV.decodeString("USERINFO_AVATAR", "");
         Glide.with(iv_avatar).load(avatar).error(R.drawable.default_avatar).into(iv_avatar);
         tv_date1.setText(TimeUtils.getDateAndWeek(System.currentTimeMillis()));
         tv_date2.setText(TimeUtils.getDateAndWeek(System.currentTimeMillis()));
-        rv_app.setLayoutManager(new GridLayoutManager(mContext, 4));
+        cl_more.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startActivity(new Intent(mContext, MoreAppActivity.class));
+            }
+        });
 
+        rv_app.setLayoutManager(new GridLayoutManager(mContext, 4));
         HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
         WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
         DisplayMetrics dm = new DisplayMetrics();
@@ -226,7 +239,6 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
         stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, (int) (density * 20));//左间距
         stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, (int) (density * 20));//右间距
         rv_app.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
-
         mAppAdapter = new AppAdapter();
         rv_app.setAdapter(mAppAdapter);
     }
@@ -321,6 +333,14 @@ public class UserFragment extends BaseFragment implements UserContact.UserView {
             rv_app.setVisibility(View.VISIBLE);
             mAppAdapter.setDesktopIcons(desktopIcons);
         }
+        mPresenter.getAppUsedStatistics();
+    }
+
+    @Override
+    public void setAppUsedStatistics(long time) {
+        Log.e(TAG, "setAppUsedStatistics: " + time);
+        String useTime = TimeUtils.formatTime(time);
+        tv_duration.setText(String.format(getString(R.string.today_study_time), useTime));
     }
 
     private void registerOwnReceiver() {

app/src/main/java/com/uiui/zyos/fragment/user/UserPresenter.java

@@ -2,11 +2,14 @@ package com.uiui.zyos.fragment.user;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.trello.rxlifecycle4.android.FragmentEvent;
+import com.uiui.zyos.BuildConfig;
+import com.uiui.zyos.bean.AppUsed;
 import com.uiui.zyos.bean.BaseResponse;
 import com.uiui.zyos.bean.DesktopIcon;
 import com.uiui.zyos.bean.SnInfo;
@@ -21,6 +24,11 @@ import com.uiui.zyos.utils.Utils;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.ToLongFunction;
+import java.util.stream.Collectors;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -102,4 +110,32 @@ public class UserPresenter implements UserContact.Presenter {
         ArrayList<DesktopIcon> desktopIcons = ApkUtils.queryFilterAppInfo(mContext);
         mView.setInstalledApp(desktopIcons);
     }
+
+    @Override
+    public void getAppUsedStatistics() {
+        String jsonString = RemoteManager.getInstance().getAppUsedStatistics();
+        if (TextUtils.isEmpty(jsonString)) {
+            mView.setAppUsedStatistics(0);
+        } else {
+            Gson gson = new Gson();
+            Type listType = new TypeToken<List<AppUsed>>() {
+            }.getType();
+            try {
+                List<AppUsed> appUseds = gson.fromJson(jsonString, listType);
+                Log.e(TAG, "getAppUsedStatistics: " + appUseds);
+                List<AppUsed> appUseTime = appUseds.stream().filter(new Predicate<AppUsed>() {
+                    @Override
+                    public boolean test(AppUsed appUsed) {
+                        return !BuildConfig.APPLICATION_ID.equals(appUsed.getPackages())
+                                && !"com.safe.uiui".equals(appUsed.getPackages());
+                    }
+                }).collect(Collectors.toList());
+                long time = appUseTime.stream().mapToLong(AppUsed::getUseTime).sum();
+                mView.setAppUsedStatistics(time);
+            } catch (Exception e) {
+                Log.e(TAG, "getAppUsedStatistics: " + e.getMessage());
+                mView.setAppUsedStatistics(0);
+            }
+        }
+    }
 }

app/src/main/java/com/uiui/zyos/manager/RemoteManager.java

@@ -22,7 +22,7 @@ import com.tencent.mmkv.MMKV;
 import com.uiui.zyos.BuildConfig;
 import com.uiui.zyos.bean.MapBean;
 import com.uiui.zyos.config.CommonConfig;
-import com.uiui.zysn.IGetInfoInterface;
+import com.uiui.zy.IGetInfoInterface;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -42,9 +42,9 @@ public class RemoteManager {
     private IGetInfoInterface mGetInfoInterface;
     private ServiceConnection mServiceConnection;
 
-    private static final String SN_AIDL_NAME = "com.uiui.zysn.IGetInfoInterface";
-    private static final String SN_PACKAGE_NAME = "com.uiui.zysn";
-    private static final String SN_SERVICE_NAME = "com.uiui.zysn.service.RemoteService";
+    private static final String SN_AIDL_NAME = "com.uiui.zy.IGetInfoInterface";
+    public static final String SN_PACKAGE_NAME = "com.uiui.zy";
+    private static final String SN_SERVICE_NAME = "com.uiui.zy.service.RemoteService";
 
     private RemoteManager(Context context) {
         if (context == null) {
@@ -206,6 +206,20 @@ public class RemoteManager {
         }
     }
 
+    public String getAppUsedStatistics() {
+        if (mGetInfoInterface != null) {
+            try {
+                String jsonString = mGetInfoInterface.getAppUsedStatistics();
+                return jsonString;
+            } catch (Exception e) {
+                Log.e(TAG, "getAppUsedStatistics: " + e.getMessage());
+            }
+        } else {
+            bindInfoService();
+        }
+        return null;
+    }
+
     public MapBean getMapBean() {
         String jsonString = mMMKV.decodeString(CommonConfig.MAP_LOCATION_JSON_KEY);
         if (TextUtils.isEmpty(jsonString)) {

app/src/main/java/com/uiui/zyos/utils/ApkUtils.java

@@ -45,7 +45,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 public class ApkUtils {
     private static HashSet<String> excludePackageName = new HashSet<String>() {{
         this.add(BuildConfig.APPLICATION_ID);
-        this.add("com.uiui.zysn");
+        this.add("com.uiui.zy");
         this.add("com.uiui.zyos");
         this.add("com.uiui.zybrowser");
         this.add("com.uiui.zyappstore");
@@ -151,7 +151,7 @@ public class ApkUtils {
         this.add("com.android.gallery3d");
         this.add("com.android.camera2");
         this.add("com.android.settings");
-        this.add("com.uiui.zysn");
+        this.add("com.uiui.zy");
         this.add("com.uiui.appstore");
     }};
 
@@ -207,7 +207,7 @@ public class ApkUtils {
         }
         if (Settings.Global.getInt(context.getContentResolver(), "is_activity", 0) == 0) {
             resolveInfos.removeIf(resolveInfo -> "com.uiui.city".equals(resolveInfo.activityInfo.packageName));
-//            resolveInfos.removeIf(applicationInfo -> "com.uiui.zysn".equals(applicationInfo.packageName));
+//            resolveInfos.removeIf(applicationInfo -> "com.uiui.zy".equals(applicationInfo.packageName));
         }
         resolveInfos.sort(new Comparator<ResolveInfo>() {
             @Override
@@ -227,8 +227,8 @@ public class ApkUtils {
                     }
                 } catch (PackageManager.NameNotFoundException e) {
                     e.printStackTrace();
+                    return 0;
                 }
-                return -1;
             }
         });
         ArrayList<DesktopIcon> desktopIcons = new ArrayList<>();

app/src/main/java/com/uiui/zyos/utils/OpenApkUtils.java

@@ -55,7 +55,7 @@ public class OpenApkUtils {
     private boolean checkActivation() {
         int is_activation = Settings.Global.getInt(mContext.getContentResolver(), CommonConfig.UIUI_ACTIVATION_KEY, 0);
         if (is_activation != 1) {
-            ApkUtils.openPackage(mContext, "com.uiui.zysn");
+            ApkUtils.openPackage(mContext, "com.uiui.zy");
             ToastUtil.show("请激活设备后使用");
         }
         return is_activation == 1;
@@ -103,7 +103,7 @@ public class OpenApkUtils {
      * @return true为能打开
      */
     public boolean isCloudLessonMod(String pkg) {
-        if (mLessonJson==null)
+        if (mLessonJson == null)
             return true;
         if (mLessonJson.getIs_lesson() == 1) {
             if (mContralTime == null) {

app/src/main/java/com/uiui/zyos/utils/TimeUtils.java

@@ -49,6 +49,41 @@ public class TimeUtils {
         return dateString + "\t" + getWeek();
     }
 
+    public static String formatTime(Long s) {
+        if (s == 0) {
+            return "0分钟";
+        }
+        Integer ss = 1;
+        Integer mi = ss * 60;
+        Integer hh = mi * 60;
+        Integer dd = hh * 24;
+
+        Long day = s / dd;
+        Long hour = (s - day * dd) / hh;
+        Long minute = (s - day * dd - hour * hh) / mi;
+        Long second = (s - day * dd - hour * hh - minute * mi) / ss;
+        Long milliSecond = s - day * dd - hour * hh - minute * mi - second * ss;
+
+        StringBuffer sb = new StringBuffer();
+        if (day > 0) {
+            sb.append(day + "天");
+        }
+        if (hour > 0) {
+            sb.append(hour + "小时");
+        }
+        if (minute > 0) {
+            sb.append(minute + "分");
+        }
+        if (second > 0) {
+            sb.append(second + "秒");
+        }
+//        if (milliSecond > 0) {
+//            sb.append(milliSecond + "毫秒");
+//        }
+        return sb.toString();
+    }
+
+
     /**
      * 是否在管控时间内
      *

app/src/main/res/layout-land/fragment_user.xml

@@ -79,7 +79,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_4"
                 android:layout_marginEnd="@dimen/dp_32"
-                android:maxLines="1"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
                 android:text="@string/tips"
                 android:textColor="@color/lightGray"
                 android:textSize="@dimen/sp_8"
@@ -229,7 +233,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_8"
                             android:maxLines="1"
-                            android:text="今日学习时间"
+                            android:text="@string/today_study_time"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_8"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -356,7 +360,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/dp_16"
                                 android:gravity="center_horizontal"
-                                android:text="第二步\n通过小程序扫码绑定设备"
+                                android:text="第二步\n扫码绑定设备"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/sp_8"
                                 app:layout_constraintEnd_toEndOf="@+id/iv_device_qrcode"
@@ -421,6 +425,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_margin="@dimen/dp_8"
+                            android:scrollbars="vertical"
+                            android:fadeScrollbars="false"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_date2" />
 

app/src/main/res/layout-port/dialog_chinese.xml

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/dp_240"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_dialog"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:text="语文基础"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_20"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginStart="@dimen/dp_8"
-        android:layout_marginEnd="@dimen/dp_8"
-        android:layout_marginBottom="@dimen/dp_20"
-        android:orientation="horizontal"
-        app:layout_constraintTop_toBottomOf="@+id/textView4">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_pinyin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView1"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_reading_improvement"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="阅读提高"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView1"
-                    app:layout_constraintStart_toStartOf="@+id/imageView1"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView1" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_stroke"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView2"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_writing"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="语文写作"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView2"
-                    app:layout_constraintStart_toStartOf="@+id/imageView2"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-port/dialog_english_basics.xml

@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_dialog"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:text="英语基础"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_20"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_8"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_8"
-        android:orientation="horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView4">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_pinyin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView1"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_jcxx_yych"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="英语词汇"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView1"
-                    app:layout_constraintStart_toStartOf="@+id/imageView1"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView1" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_stroke"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView2"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/endlish_jcxx_ywzm"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="英文字母"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView2"
-                    app:layout_constraintStart_toStartOf="@+id/imageView2"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_radicals"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_jcyy_jcyy"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="基础语音"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView3"
-                    app:layout_constraintStart_toStartOf="@+id/imageView3"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView3" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_grammar"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_ice_grammar"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="薄冰语法"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView4"
-                    app:layout_constraintStart_toStartOf="@+id/imageView4"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView4" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout41"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_8"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="@dimen/dp_8"
-        android:layout_marginBottom="@dimen/dp_16"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearLayout4">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_alphabet"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView11"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_phonetic_alphabet"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="国际音标"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView11"
-                    app:layout_constraintStart_toStartOf="@+id/imageView11"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView11" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_sentence"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView21"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_into_sentence"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="连词成句"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView21"
-                    app:layout_constraintStart_toStartOf="@+id/imageView21"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView21" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_patterns"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView31"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_sentence_patterns"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="英语句型"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView31"
-                    app:layout_constraintStart_toStartOf="@+id/imageView31"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView31" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_writing"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView41"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/english_writing"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="英语写作"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView41"
-                    app:layout_constraintStart_toStartOf="@+id/imageView41"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView41" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-port/dialog_foundation.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_dialog"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_20"
-        android:text="语文基础"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_20"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/linearLayout4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginStart="@dimen/dp_8"
-        android:layout_marginEnd="@dimen/dp_8"
-        android:layout_marginBottom="@dimen/dp_20"
-        android:orientation="horizontal"
-        app:layout_constraintTop_toBottomOf="@+id/textView4">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_pinyin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView1"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_pinyin_learning"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="拼音学习"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView1"
-                    app:layout_constraintStart_toStartOf="@+id/imageView1"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView1" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_stroke"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView2"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_stroke_name"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="笔画名称"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView2"
-                    app:layout_constraintStart_toStartOf="@+id/imageView2"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView2" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_radicals"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_radicals"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="偏旁部首"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView3"
-                    app:layout_constraintStart_toStartOf="@+id/imageView3"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView3" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_order"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_64"
-                    android:layout_height="@dimen/dp_64"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/chinese_order_rules"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_4"
-                    android:text="笔顺规则"
-                    android:textColor="@color/colorAccent"
-                    android:textSize="@dimen/sp_13"
-                    app:layout_constraintEnd_toEndOf="@+id/imageView4"
-                    app:layout_constraintStart_toStartOf="@+id/imageView4"
-                    app:layout_constraintTop_toBottomOf="@+id/imageView4" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-port/fragment_biology.xml

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.biology.BiologyFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/biology_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/biology_synchronous_explanation"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/biology_unit_testing"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/biology_laboratory"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/biological_fine_volume"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-port/fragment_chemical.xml

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".fragment.chemical.ChemicalFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/chemical_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/chemical_synchronous_explanation"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/chemical_synchronous_tutoring"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/chemical_lab"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/chemical_fine_volume"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-port/fragment_chinese.xml

@@ -1,557 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.uiui.zyos.base.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.chinese.ChineseFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/chinese_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:text="人教版"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_8"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView2"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/textView2" />
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/iv_sync_video"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/chinese_synchronous_explanation"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
-                            android:background="@drawable/chinese_card_bg"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <TextView
-                                android:id="@+id/tv_more_app"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_4"
-                                android:text="查看更多…"
-                                android:visibility="gone"
-                                android:textColor="@color/black"
-                                android:textSize="@dimen/sp_7"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_marginBottom="@dimen/dp_8"
-                                android:layout_marginTop="@dimen/dp_8"
-                                android:orientation="vertical"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toBottomOf="@+id/tv_more_app"
-                                tools:layout_editor_absoluteX="6dp">
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_tutoring"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_synchronous_tutoring"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_near_antonyms"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_near_antonyms"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="近反义词"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_composition"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_read_composition"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="阅读写作"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_read"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_featured_reading"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="精选阅读"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_character"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_character"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="汉字学习"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_classical"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-
-                                            <ImageView
-                                                android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_classical"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="文言文"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_rhetoric"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_rhetoric"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="修辞手法"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_treasure"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_treasure"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="中华宝典"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_punctuation"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-
-                                            <ImageView
-                                                android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/chinese_punctuation"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="标点符号"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </LinearLayout>
-
-                            </LinearLayout>
-
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <ImageView
-                    android:id="@+id/iv_dictation"
-                    android:layout_width="@dimen/dp_142"
-                    android:layout_height="@dimen/dp_96"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/chinese_precision_science"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/iv_character"
-                    android:layout_width="@dimen/dp_67"
-                    android:layout_height="@dimen/dp_105"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/chinese_excellent_volume"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-                <ImageView
-                    android:id="@+id/iv_foundation"
-                    android:layout_width="@dimen/dp_67"
-                    android:layout_height="@dimen/dp_105"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/chinese_poetry_world"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.uiui.zyos.base.CustomContent>

app/src/main/res/layout-port/fragment_complex.xml

@@ -1,517 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.uiui.zyos.base.CustomContent xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.complex.ComplexFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout6"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/complex_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <TextView
-                    android:id="@+id/textView7"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_8"
-                    android:text="综合学习"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView7">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginStart="@dimen/dp_16"
-                        android:layout_marginBottom="@dimen/dp_16"
-                        android:layout_marginEnd="@dimen/dp_16"
-                        android:orientation="horizontal">
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"
-                                android:orientation="horizontal">
-
-                                <androidx.constraintlayout.widget.ConstraintLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
-                                        android:background="@drawable/complex_politics_box"
-                                        app:layout_constraintBottom_toBottomOf="parent"
-                                        app:layout_constraintEnd_toEndOf="parent"
-                                        app:layout_constraintStart_toStartOf="parent"
-                                        app:layout_constraintTop_toTopOf="parent">
-
-                                        <LinearLayout
-                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
-                                            android:orientation="horizontal"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_politics_video"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent"
-                                                    tools:layout_editor_absoluteX="0dp">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView14"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView14" />
-
-
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_politics_coach"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView15"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_book"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView15" />
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-                                        </LinearLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </androidx.constraintlayout.widget.ConstraintLayout>
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"
-                                android:orientation="horizontal">
-
-                                <androidx.constraintlayout.widget.ConstraintLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
-                                        android:background="@drawable/complex_geography_box"
-                                        app:layout_constraintBottom_toBottomOf="parent"
-                                        app:layout_constraintEnd_toEndOf="parent"
-                                        app:layout_constraintStart_toStartOf="parent"
-                                        app:layout_constraintTop_toTopOf="parent">
-
-                                        <LinearLayout
-                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
-                                            android:orientation="horizontal"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_geography_video"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView16"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView16" />
-
-
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_geography_coach"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView17"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_book"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView17" />
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-                                        </LinearLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                </androidx.constraintlayout.widget.ConstraintLayout>
-                            </LinearLayout>
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="0dp"
-                            android:layout_height="match_parent"
-                            android:layout_weight="1"
-                            android:orientation="vertical">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"
-                                android:orientation="horizontal">
-
-                                <androidx.constraintlayout.widget.ConstraintLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
-                                        android:background="@drawable/complex_history_box"
-                                        app:layout_constraintBottom_toBottomOf="parent"
-                                        app:layout_constraintEnd_toEndOf="parent"
-                                        app:layout_constraintStart_toStartOf="parent"
-                                        app:layout_constraintTop_toTopOf="parent">
-
-                                        <LinearLayout
-                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
-                                            android:orientation="horizontal"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_history_video"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView18"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView18" />
-
-
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_history_coach"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView19"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_book"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView19" />
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-                                        </LinearLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                </androidx.constraintlayout.widget.ConstraintLayout>
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_weight="1"
-                                android:orientation="horizontal">
-
-                                <androidx.constraintlayout.widget.ConstraintLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
-                                        android:background="@drawable/complex_science_box"
-                                        app:layout_constraintBottom_toBottomOf="parent"
-                                        app:layout_constraintEnd_toEndOf="parent"
-                                        app:layout_constraintStart_toStartOf="parent"
-                                        app:layout_constraintTop_toTopOf="parent">
-
-                                        <LinearLayout
-                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
-                                            android:orientation="horizontal"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_science_video"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView20"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_video"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步视频"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView20" />
-
-
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                            <androidx.constraintlayout.widget.ConstraintLayout
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"
-                                                android:layout_weight="1">
-
-                                                <androidx.constraintlayout.widget.ConstraintLayout
-                                                    android:id="@+id/cl_science_coach"
-                                                    android:layout_width="match_parent"
-                                                    android:layout_height="match_parent"
-                                                    app:layout_constraintTop_toTopOf="parent">
-
-                                                    <ImageView
-                                                        android:id="@+id/imageView21"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
-                                                        android:src="@drawable/complex_book"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toTopOf="parent" />
-
-                                                    <TextView
-                                                        android:layout_width="wrap_content"
-                                                        android:layout_height="wrap_content"
-                                                        android:text="同步辅导"
-                                                        android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
-                                                        app:layout_constraintBottom_toBottomOf="parent"
-                                                        app:layout_constraintEnd_toEndOf="parent"
-                                                        app:layout_constraintStart_toStartOf="parent"
-                                                        app:layout_constraintTop_toBottomOf="@+id/imageView21" />
-                                                </androidx.constraintlayout.widget.ConstraintLayout>
-                                            </androidx.constraintlayout.widget.ConstraintLayout>
-                                        </LinearLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </androidx.constraintlayout.widget.ConstraintLayout>
-                            </LinearLayout>
-                        </LinearLayout>
-                    </LinearLayout>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_210"
-                android:layout_marginStart="@dimen/dp_10"
-                app:layout_constraintBottom_toBottomOf="@id/constraintLayout6"
-                app:layout_constraintStart_toEndOf="@id/constraintLayout6"
-                app:layout_constraintTop_toTopOf="@id/constraintLayout6">
-
-                <ImageView
-                    android:id="@+id/iv_video"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/complex_knowledge_video"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/iv_famous_teacher"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/complex_famous_teacher"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.uiui.zyos.base.CustomContent>

app/src/main/res/layout-port/fragment_english.xml

@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.english.EnglishFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/english_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/imageView5"
-                        android:layout_width="@dimen/dp_214"
-                        android:layout_height="@dimen/dp_163"
-                        android:layout_marginStart="@dimen/dp_14"
-                        android:layout_marginBottom="@dimen/dp_14"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_explanation"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/imageView6"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
-                        android:layout_marginStart="@dimen/dp_9"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_synchronous_vocabulary"
-                        app:layout_constraintStart_toEndOf="@+id/imageView5"
-                        app:layout_constraintTop_toTopOf="@+id/imageView5" />
-
-                    <ImageView
-                        android:id="@+id/imageView7"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
-                        android:layout_marginStart="@dimen/dp_9"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_listen_read"
-                        app:layout_constraintBottom_toTopOf="@+id/imageView8"
-                        app:layout_constraintStart_toEndOf="@+id/imageView5"
-                        app:layout_constraintTop_toBottomOf="@+id/imageView6" />
-
-                    <ImageView
-                        android:id="@+id/imageView8"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
-                        android:layout_marginStart="@dimen/dp_9"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_unit_practice"
-                        app:layout_constraintBottom_toBottomOf="@+id/imageView5"
-                        app:layout_constraintStart_toEndOf="@+id/imageView5" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="@dimen/dp_142"
-                    android:layout_height="@dimen/dp_209"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/math_excellent_volume"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <ImageView
-                        android:id="@+id/imageView9"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_remember_words"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/imageView10"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_listen_and_speak_special"
-                        app:layout_constraintBottom_toTopOf="@+id/imageView11"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/imageView9" />
-
-                    <ImageView
-                        android:id="@+id/imageView11"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/english_precision_learning"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout-port/fragment_main.xml

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.main.MainFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/magicIndicator"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_16"
-            android:layout_centerHorizontal="true"
-            android:visibility="visible"
-            app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_2"
-            android:background="@drawable/custom_bg_ai"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_2"
-                android:layout_marginEnd="@dimen/dp_4"
-                android:layout_marginStart="@dimen/dp_4"
-                android:layout_marginBottom="@dimen/dp_2"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon0"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_8"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_appstore"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="应用市场"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon0"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon0"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon0" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon1"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_browser"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="浏览器"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon1"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon1"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon1" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon2"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_clean"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="平板管家"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon2"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon2"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon2" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon3"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_camera"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="相机"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon3"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon3"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon3" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon4"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_settings"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="设置"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon4"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon4"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon4" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_5"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon5"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_gallery3d_app"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="图库"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon5"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon5"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon5" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_6"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon6"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_video"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="视频百科"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon6"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon6"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon6" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_7"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon7"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_8"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_dict"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="字典"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon7"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon7"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon7" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-port/fragment_math.xml

@@ -1,510 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.math.MathFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/math_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/iv_sync_video"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/math_synchronous_explanation"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
-                            android:background="@drawable/chinese_card_bg"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent">
-
-                            <LinearLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="0dp"
-                                android:layout_marginTop="@dimen/dp_8"
-                                android:layout_marginBottom="@dimen/dp_8"
-                                android:orientation="vertical"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintTop_toTopOf="parent"
-                              >
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_tutoring"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_synchronous_tutoring"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="同步辅导"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView4" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_near_antonyms"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_problem_training"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="应用题训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_composition"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_olympiad_training"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="奥数训练"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView6" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_read"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_equation_solution"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="方程精解"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView7" />
-
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_character"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/mathematical_basis"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学基础"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView8" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_classical"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-
-                                            <ImageView
-                                                android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_arithmetic"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="四则运算"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView9" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </LinearLayout>
-
-                                <LinearLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="0dp"
-                                    android:layout_weight="1"
-                                    android:orientation="horizontal"
-                                    app:layout_constraintBottom_toBottomOf="parent"
-                                    app:layout_constraintTop_toTopOf="parent">
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_encyclopedia"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_encyclopedia"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="公式大全"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView10" />
-
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_number"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-                                            <ImageView
-                                                android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_number"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="认识数字"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView11" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                                    <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:id="@+id/cl_formula"
-                                        android:layout_width="0dp"
-                                        android:layout_height="match_parent"
-                                        android:layout_weight="1">
-
-                                        <androidx.constraintlayout.widget.ConstraintLayout
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            app:layout_constraintBottom_toBottomOf="parent"
-                                            app:layout_constraintEnd_toEndOf="parent"
-                                            app:layout_constraintStart_toStartOf="parent"
-                                            app:layout_constraintTop_toTopOf="parent">
-
-
-                                            <ImageView
-                                                android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
-                                                android:adjustViewBounds="true"
-                                                android:scaleType="centerInside"
-                                                android:src="@drawable/math_formula"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toTopOf="parent" />
-
-                                            <TextView
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:text="数学公式"
-                                                android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
-                                                app:layout_constraintBottom_toBottomOf="parent"
-                                                app:layout_constraintEnd_toEndOf="parent"
-                                                app:layout_constraintStart_toStartOf="parent"
-                                                app:layout_constraintTop_toBottomOf="@+id/imageView12" />
-                                        </androidx.constraintlayout.widget.ConstraintLayout>
-                                    </androidx.constraintlayout.widget.ConstraintLayout>
-                                </LinearLayout>
-
-                            </LinearLayout>
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <ImageView
-                    android:id="@+id/iv_precision_learning"
-                    android:layout_width="@dimen/dp_140"
-                    android:layout_height="@dimen/dp_209"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/math_excellent_volume"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout-port/fragment_physics.xml

@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.physics.PhysicsFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/physical_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="同步学习"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <LinearLayout
-                    android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:orientation="horizontal"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/physical_synchronous_explanation"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
-
-                        <ImageView
-                            android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/physical_unit_tests"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </LinearLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
-
-                <ImageView
-                    android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/physical_lab"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <ImageView
-                    android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
-                    android:layout_weight="1"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/physical_fine_volume"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-port/fragment_precision.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.precision.PrecisionFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
-                android:background="@drawable/precision_box"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:maxLines="1"
-                        android:text="人教版"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_8"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/textView2"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/textView2" />
-
-                    <TextView
-                        android:id="@+id/textView2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:maxLines="1"
-                        android:text="精准学"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="0dp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/constraintLayout">
-
-                    <ImageView
-                        android:id="@+id/iv_bunk"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_163"
-                        android:src="@drawable/precision_question_bank"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/iv_paper"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_77"
-                        android:layout_marginStart="@dimen/dp_9"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/precision_test_paper"
-                        app:layout_constraintStart_toEndOf="@+id/iv_bunk"
-                        app:layout_constraintTop_toTopOf="@+id/iv_bunk" />
-
-                    <ImageView
-                        android:id="@+id/iv_test"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_77"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/precision_stage_test"
-                        app:layout_constraintBottom_toBottomOf="@+id/iv_bunk"
-                        app:layout_constraintStart_toStartOf="@+id/iv_paper" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <ImageView
-                android:id="@+id/iv_book"
-                android:layout_width="@dimen/dp_141"
-                android:layout_height="@dimen/dp_100"
-                android:layout_marginStart="@dimen/dp_10"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/precision_wrong_book"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/iv_favorites"
-                android:layout_width="@dimen/dp_141"
-                android:layout_height="@dimen/dp_100"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:src="@drawable/precision_favorites"
-                app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
-                app:layout_constraintStart_toStartOf="@+id/iv_book" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout-port/fragment_subject.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.subject.SubjectFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.flyco.tablayout.SlidingTabLayout
-            android:id="@+id/main_sliding_tab_layout"
-            android:layout_width="@dimen/dp_380"
-            android:layout_height="@dimen/dp_24"
-            android:layout_marginStart="@dimen/dp_8"
-            android:visibility="visible"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tl_indicator_color="#00000000"
-            app:tl_indicator_margin_left="2dp"
-            app:tl_indicator_margin_right="2dp"
-            app:tl_indicator_style="NORMAL"
-            app:tl_tab_space_equal="true"
-            app:tl_textSelectSize="@dimen/sp_15"
-            app:tl_textUnSelectSize="@dimen/sp_12"
-            app:tl_textBold="SELECT"
-            app:tl_textSize="@dimen/sp_12" />
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintTop_toBottomOf="@+id/main_sliding_tab_layout" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</FrameLayout>

app/src/main/res/layout-port/fragment_user.xml

@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.user.UserFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout4"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/dp_28"
-            android:layout_marginTop="@dimen/dp_8"
-            app:layout_constraintEnd_toEndOf="@+id/constraintLayout7"
-            app:layout_constraintStart_toStartOf="@+id/constraintLayout7"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/constraintLayout5"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <com.shehuan.niv.NiceImageView
-                    android:id="@+id/iv_avatar"
-                    android:layout_width="@dimen/dp_28"
-                    android:layout_height="@dimen/dp_28"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:src="@drawable/default_avatar"
-                    app:is_circle="true"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/tv_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/dp_8"
-                    android:maxLines="1"
-                    android:text="@string/default_name"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10"
-                    app:layout_constraintStart_toEndOf="@+id/iv_avatar"
-                    app:layout_constraintTop_toTopOf="@+id/iv_avatar" />
-
-                <TextView
-                    android:id="@+id/tv_grade"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="1"
-                    android:text="@string/default_grade"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10"
-                    app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-                    app:layout_constraintStart_toStartOf="@+id/tv_name" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <ImageView
-                android:id="@+id/iv_speaker"
-                android:layout_width="@dimen/dp_16"
-                android:layout_height="@dimen/dp_16"
-                android:layout_marginStart="@dimen/dp_96"
-                android:src="@drawable/user_speaker"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/constraintLayout5"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_notification"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_4"
-                android:layout_marginEnd="@dimen/dp_32"
-                android:maxLines="1"
-                android:text="@string/tips"
-                android:textColor="@color/lightGray"
-                android:textSize="@dimen/sp_8"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/iv_speaker"
-                app:layout_constraintTop_toTopOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_48"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraintLayout"
-                    android:layout_width="@dimen/dp_205"
-                    android:layout_height="@dimen/dp_211"
-                    android:background="@drawable/user_center_box"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_nodata"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="visible">
-
-                        <ImageView
-                            android:id="@+id/imageView12"
-                            android:layout_width="@dimen/dp_68"
-                            android:layout_height="@dimen/dp_82"
-                            android:layout_marginTop="@dimen/dp_32"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/user_trophy"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView8"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_16"
-                            android:text="暂无数据"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
-                            app:layout_constraintEnd_toEndOf="@+id/imageView12"
-                            app:layout_constraintStart_toStartOf="@+id/imageView12"
-                            app:layout_constraintTop_toBottomOf="@+id/imageView12" />
-
-                        <TextView
-                            android:id="@+id/tv_activation"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/bt_checkupdate_selector"
-                            android:paddingStart="@dimen/dp_8"
-                            android:paddingTop="@dimen/dp_2"
-                            android:paddingEnd="@dimen/dp_8"
-                            android:paddingBottom="@dimen/dp_2"
-                            android:text="点击激活学习系统"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_12"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/textView8" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_usedata"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/tv_activated"
-                            android:layout_width="wrap_content"
-                            android:layout_height="@dimen/dp_16"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:layout_marginEnd="@dimen/dp_8"
-                            android:background="@drawable/activation_bg"
-                            android:gravity="center"
-                            android:text="设备已激活"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <ImageView
-                            android:id="@+id/imageView17"
-                            android:layout_width="@dimen/dp_68"
-                            android:layout_height="@dimen/dp_82"
-                            android:layout_marginTop="@dimen/dp_32"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/user_trophy"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/tv_percent"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:maxLines="1"
-                            android:text="80%"
-                            android:textColor="@color/percent_color"
-                            android:textSize="@dimen/sp_25"
-                            app:layout_constraintEnd_toEndOf="@+id/imageView17"
-                            app:layout_constraintStart_toStartOf="@+id/imageView17"
-                            app:layout_constraintTop_toBottomOf="@+id/imageView17" />
-
-                        <TextView
-                            android:id="@+id/textView5"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:maxLines="1"
-                            android:text="学习时长超过同用户"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_percent" />
-
-                        <TextView
-                            android:id="@+id/tv_duration"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:maxLines="1"
-                            android:text="今日学习时间"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/textView5" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="@dimen/dp_293"
-                    android:layout_height="@dimen/dp_211"
-                    android:layout_marginStart="@dimen/dp_21"
-                    android:background="@drawable/user_app_box"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/constraintLayout"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_activation"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="visible">
-
-                        <TextView
-                            android:id="@+id/tv_date1"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:maxLines="1"
-                            android:text="2月14日 星期二"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_12"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:layout_marginEnd="@dimen/dp_8"
-                            android:background="@drawable/bt_checkupdate_selector"
-                            android:paddingStart="@dimen/dp_8"
-                            android:paddingTop="@dimen/dp_2"
-                            android:paddingEnd="@dimen/dp_8"
-                            android:paddingBottom="@dimen/dp_2"
-                            android:text="输入激活码"
-                            android:visibility="gone"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_10"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <TextView
-                            android:id="@+id/textView3"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="@dimen/dp_16"
-                            android:text="激活系统后，绑定设备"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_10"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_date1" />
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/textView3">
-
-                            <com.shehuan.niv.NiceImageView
-                                android:id="@+id/iv_applet_qrcode"
-                                android:layout_width="@dimen/dp_88"
-                                android:layout_height="@dimen/dp_88"
-                                android:adjustViewBounds="true"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/applet_qrcode"
-                                app:corner_radius="@dimen/dp_8"
-                                app:layout_constraintStart_toStartOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_16"
-                                android:gravity="center_horizontal"
-                                android:text="第一步\n扫码注册小程序"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_8"
-                                app:layout_constraintEnd_toEndOf="@+id/iv_applet_qrcode"
-                                app:layout_constraintStart_toStartOf="@+id/iv_applet_qrcode"
-                                app:layout_constraintTop_toBottomOf="@+id/iv_applet_qrcode" />
-
-                            <ImageView
-                                android:id="@+id/iv_progress"
-                                android:layout_width="@dimen/dp_16"
-                                android:layout_height="@dimen/dp_16"
-                                android:layout_marginStart="@dimen/dp_16"
-                                android:adjustViewBounds="true"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/user_progress"
-                                app:layout_constraintBottom_toBottomOf="@+id/iv_applet_qrcode"
-                                app:layout_constraintStart_toEndOf="@+id/iv_applet_qrcode"
-                                app:layout_constraintTop_toTopOf="@+id/iv_applet_qrcode" />
-
-                            <com.shehuan.niv.NiceImageView
-                                android:id="@+id/iv_device_qrcode"
-                                android:layout_width="@dimen/dp_88"
-                                android:layout_height="@dimen/dp_88"
-                                android:layout_marginStart="@dimen/dp_16"
-                                android:adjustViewBounds="true"
-                                android:scaleType="centerCrop"
-                                app:corner_radius="@dimen/dp_8"
-                                app:layout_constraintStart_toEndOf="@+id/iv_progress"
-                                app:layout_constraintTop_toTopOf="@+id/iv_applet_qrcode" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginTop="@dimen/dp_16"
-                                android:gravity="center_horizontal"
-                                android:text="第二步\n通过小程序扫码绑定设备"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_8"
-                                app:layout_constraintEnd_toEndOf="@+id/iv_device_qrcode"
-                                app:layout_constraintStart_toStartOf="@+id/iv_device_qrcode"
-                                app:layout_constraintTop_toBottomOf="@+id/iv_device_qrcode" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_app"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:id="@+id/tv_date2"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginTop="@dimen/dp_8"
-                            android:maxLines="1"
-                            android:text="2月14日 星期二"
-                            android:textColor="@color/white"
-                            android:textSize="@dimen/sp_12"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/cl_more"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            app:layout_constraintBottom_toBottomOf="@+id/tv_date2"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/tv_date2">
-
-                            <ImageView
-                                android:id="@+id/imageView13"
-                                android:layout_width="@dimen/dp_16"
-                                android:layout_height="@dimen/dp_16"
-                                android:layout_marginEnd="@dimen/dp_8"
-                                android:adjustViewBounds="true"
-                                android:scaleType="centerCrop"
-                                android:src="@drawable/user_more"
-                                app:layout_constraintBottom_toBottomOf="parent"
-                                app:layout_constraintEnd_toEndOf="parent"
-                                app:layout_constraintTop_toTopOf="parent" />
-
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="@dimen/dp_8"
-                                android:text="更多应用"
-                                android:textColor="@color/white"
-                                android:textSize="@dimen/sp_12"
-                                app:layout_constraintBottom_toBottomOf="@+id/imageView13"
-                                app:layout_constraintEnd_toStartOf="@+id/imageView13"
-                                app:layout_constraintTop_toTopOf="@+id/imageView13" />
-                        </androidx.constraintlayout.widget.ConstraintLayout>
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/rv_app"
-                            android:layout_width="match_parent"
-                            android:layout_height="0dp"
-                            android:layout_margin="@dimen/dp_8"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_date2" />
-
-                        <ImageView
-                            android:id="@+id/iv_nodata"
-                            android:layout_width="@dimen/dp_64"
-                            android:layout_height="@dimen/dp_64"
-                            android:adjustViewBounds="true"
-                            android:scaleType="centerCrop"
-                            android:src="@drawable/nodata"
-                            android:visibility="gone"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="@+id/rv_app" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-sw800dp/activity_main.xml

@@ -34,7 +34,7 @@
             android:id="@+id/constraintLayout2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_2"
+            android:layout_marginBottom="@dimen/dp_8"
             android:background="@drawable/custom_bg_ai"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -45,8 +45,8 @@
                 android:layout_height="match_parent"
                 android:layout_marginTop="@dimen/dp_4"
                 android:layout_marginEnd="@dimen/dp_4"
-                android:layout_marginStart="@dimen/dp_4"
                 android:layout_marginBottom="@dimen/dp_2"
+                android:layout_marginStart="@dimen/dp_4"
                 android:orientation="horizontal"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout-sw800dp/fragment_biology.xml

@@ -22,8 +22,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/biology_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -39,11 +39,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -66,9 +66,9 @@
 
                         <ImageView
                             android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/biology_synchronous_explanation"
@@ -85,9 +85,9 @@
 
                         <ImageView
                             android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginEnd="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/biology_unit_testing"
@@ -102,15 +102,15 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <ImageView
                     android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -121,8 +121,8 @@
 
                 <ImageView
                     android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"

app/src/main/res/layout-sw800dp/fragment_chemical.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/chemical_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -38,11 +38,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -65,9 +65,9 @@
 
                         <ImageView
                             android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/chemical_synchronous_explanation"
@@ -84,9 +84,9 @@
 
                         <ImageView
                             android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginEnd="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/chemical_synchronous_tutoring"
@@ -102,15 +102,15 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <ImageView
                     android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -121,8 +121,8 @@
 
                 <ImageView
                     android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"

app/src/main/res/layout-sw800dp/fragment_chinese.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/chinese_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -51,11 +51,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -78,9 +78,9 @@
 
                         <ImageView
                             android:id="@+id/iv_sync_video"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/chinese_synchronous_explanation"
@@ -96,9 +96,9 @@
                         android:layout_weight="1">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginEnd="@dimen/dp_4"
                             android:background="@drawable/chinese_card_bg"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -151,8 +151,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_synchronous_tutoring"
@@ -165,7 +165,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="同步辅导"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -189,8 +189,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_near_antonyms"
@@ -203,7 +203,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="近反义词"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -227,8 +227,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_read_composition"
@@ -241,7 +241,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="阅读写作"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -275,8 +275,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_featured_reading"
@@ -289,7 +289,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="精选阅读"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -315,8 +315,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_character"
@@ -329,7 +329,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="汉字学习"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -354,8 +354,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_classical"
@@ -368,7 +368,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="文言文"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -401,8 +401,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_rhetoric"
@@ -415,7 +415,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="修辞手法"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -441,8 +441,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_treasure"
@@ -455,7 +455,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="中华宝典"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -480,8 +480,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/chinese_punctuation"
@@ -494,7 +494,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="标点符号"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -514,15 +514,15 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <ImageView
                     android:id="@+id/iv_dictation"
-                    android:layout_width="@dimen/dp_142"
-                    android:layout_height="@dimen/dp_96"
+                    android:layout_width="@dimen/dp_114"
+                    android:layout_height="@dimen/dp_76"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -533,8 +533,8 @@
 
                 <ImageView
                     android:id="@+id/iv_character"
-                    android:layout_width="@dimen/dp_67"
-                    android:layout_height="@dimen/dp_105"
+                    android:layout_width="@dimen/dp_53"
+                    android:layout_height="@dimen/dp_84"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -544,8 +544,8 @@
 
                 <ImageView
                     android:id="@+id/iv_foundation"
-                    android:layout_width="@dimen/dp_67"
-                    android:layout_height="@dimen/dp_105"
+                    android:layout_width="@dimen/dp_53"
+                    android:layout_height="@dimen/dp_84"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"

app/src/main/res/layout-sw800dp/fragment_complex.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout6"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/complex_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -32,10 +32,10 @@
                     android:id="@+id/textView7"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginTop="@dimen/dp_6"
                     android:text="综合学习"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_12"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -73,8 +73,8 @@
                                     android:layout_height="match_parent">
 
                                     <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
+                                        android:layout_width="@dimen/dp_118"
+                                        android:layout_height="@dimen/dp_57"
                                         android:background="@drawable/complex_politics_box"
                                         app:layout_constraintBottom_toBottomOf="parent"
                                         app:layout_constraintEnd_toEndOf="parent"
@@ -84,7 +84,7 @@
                                         <LinearLayout
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
+                                            android:layout_marginTop="@dimen/dp_17"
                                             android:orientation="horizontal"
                                             app:layout_constraintBottom_toBottomOf="parent"
                                             app:layout_constraintEnd_toEndOf="parent"
@@ -105,8 +105,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView14"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_video"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步视频"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -140,8 +140,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView15"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_book"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -152,7 +152,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步辅导"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -175,8 +175,8 @@
                                     android:layout_height="match_parent">
 
                                     <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
+                                        android:layout_width="@dimen/dp_118"
+                                        android:layout_height="@dimen/dp_57"
                                         android:background="@drawable/complex_geography_box"
                                         app:layout_constraintBottom_toBottomOf="parent"
                                         app:layout_constraintEnd_toEndOf="parent"
@@ -186,7 +186,7 @@
                                         <LinearLayout
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
+                                            android:layout_marginTop="@dimen/dp_17"
                                             android:orientation="horizontal"
                                             app:layout_constraintBottom_toBottomOf="parent"
                                             app:layout_constraintEnd_toEndOf="parent"
@@ -206,8 +206,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView16"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_video"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -218,7 +218,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步视频"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -241,8 +241,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView17"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_book"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -253,7 +253,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步辅导"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -285,8 +285,8 @@
                                     android:layout_height="match_parent">
 
                                     <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
+                                        android:layout_width="@dimen/dp_118"
+                                        android:layout_height="@dimen/dp_57"
                                         android:background="@drawable/complex_history_box"
                                         app:layout_constraintBottom_toBottomOf="parent"
                                         app:layout_constraintEnd_toEndOf="parent"
@@ -296,7 +296,7 @@
                                         <LinearLayout
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
+                                            android:layout_marginTop="@dimen/dp_17"
                                             android:orientation="horizontal"
                                             app:layout_constraintBottom_toBottomOf="parent"
                                             app:layout_constraintEnd_toEndOf="parent"
@@ -316,8 +316,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView18"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_video"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -328,7 +328,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步视频"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -351,8 +351,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView19"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_book"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -363,7 +363,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步辅导"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -388,8 +388,8 @@
                                     android:layout_height="match_parent">
 
                                     <androidx.constraintlayout.widget.ConstraintLayout
-                                        android:layout_width="@dimen/dp_148"
-                                        android:layout_height="@dimen/dp_66"
+                                        android:layout_width="@dimen/dp_118"
+                                        android:layout_height="@dimen/dp_57"
                                         android:background="@drawable/complex_science_box"
                                         app:layout_constraintBottom_toBottomOf="parent"
                                         app:layout_constraintEnd_toEndOf="parent"
@@ -399,7 +399,7 @@
                                         <LinearLayout
                                             android:layout_width="match_parent"
                                             android:layout_height="match_parent"
-                                            android:layout_marginTop="@dimen/dp_19"
+                                            android:layout_marginTop="@dimen/dp_17"
                                             android:orientation="horizontal"
                                             app:layout_constraintBottom_toBottomOf="parent"
                                             app:layout_constraintEnd_toEndOf="parent"
@@ -419,8 +419,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView20"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_video"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -431,7 +431,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步视频"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -454,8 +454,8 @@
 
                                                     <ImageView
                                                         android:id="@+id/imageView21"
-                                                        android:layout_width="@dimen/dp_32"
-                                                        android:layout_height="@dimen/dp_32"
+                                                        android:layout_width="@dimen/dp_25"
+                                                        android:layout_height="@dimen/dp_25"
                                                         android:src="@drawable/complex_book"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -466,7 +466,7 @@
                                                         android:layout_height="wrap_content"
                                                         android:text="同步辅导"
                                                         android:textColor="@color/colorAccent"
-                                                        android:textSize="@dimen/sp_8"
+                                                        android:textSize="@dimen/sp_6"
                                                         app:layout_constraintBottom_toBottomOf="parent"
                                                         app:layout_constraintEnd_toEndOf="parent"
                                                         app:layout_constraintStart_toStartOf="parent"
@@ -484,16 +484,16 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dp_210"
-                android:layout_marginStart="@dimen/dp_10"
+                android:layout_height="@dimen/dp_168"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@id/constraintLayout6"
                 app:layout_constraintStart_toEndOf="@id/constraintLayout6"
                 app:layout_constraintTop_toTopOf="@id/constraintLayout6">
 
                 <ImageView
                     android:id="@+id/iv_video"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
                     android:src="@drawable/complex_knowledge_video"
@@ -503,8 +503,8 @@
 
                 <ImageView
                     android:id="@+id/iv_famous_teacher"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
                     android:src="@drawable/complex_famous_teacher"

app/src/main/res/layout-sw800dp/fragment_english.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/english_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -41,19 +41,19 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <ImageView
                         android:id="@+id/imageView5"
-                        android:layout_width="@dimen/dp_214"
-                        android:layout_height="@dimen/dp_163"
+                        android:layout_width="@dimen/dp_171"
+                        android:layout_height="@dimen/dp_130"
                         android:layout_marginStart="@dimen/dp_14"
                         android:layout_marginBottom="@dimen/dp_14"
                         android:adjustViewBounds="true"
@@ -64,8 +64,8 @@
 
                     <ImageView
                         android:id="@+id/imageView6"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
+                        android:layout_width="@dimen/dp_80"
+                        android:layout_height="@dimen/dp_37"
                         android:layout_marginStart="@dimen/dp_9"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -75,8 +75,8 @@
 
                     <ImageView
                         android:id="@+id/imageView7"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
+                        android:layout_width="@dimen/dp_80"
+                        android:layout_height="@dimen/dp_37"
                         android:layout_marginStart="@dimen/dp_9"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -87,8 +87,8 @@
 
                     <ImageView
                         android:id="@+id/imageView8"
-                        android:layout_width="@dimen/dp_101"
-                        android:layout_height="@dimen/dp_47"
+                        android:layout_width="@dimen/dp_80"
+                        android:layout_height="@dimen/dp_37"
                         android:layout_marginStart="@dimen/dp_9"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -102,14 +102,14 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="@dimen/dp_142"
-                    android:layout_height="@dimen/dp_209"
+                    android:layout_width="@dimen/dp_113"
+                    android:layout_height="@dimen/dp_168"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -119,8 +119,8 @@
 
                     <ImageView
                         android:id="@+id/imageView9"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
+                        android:layout_width="@dimen/dp_113"
+                        android:layout_height="@dimen/dp_51"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/english_remember_words"
@@ -130,8 +130,8 @@
 
                     <ImageView
                         android:id="@+id/imageView10"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
+                        android:layout_width="@dimen/dp_113"
+                        android:layout_height="@dimen/dp_51"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/english_listen_and_speak_special"
@@ -142,8 +142,8 @@
 
                     <ImageView
                         android:id="@+id/imageView11"
-                        android:layout_width="@dimen/dp_142"
-                        android:layout_height="@dimen/dp_64"
+                        android:layout_width="@dimen/dp_113"
+                        android:layout_height="@dimen/dp_51"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/english_precision_learning"

app/src/main/res/layout-sw800dp/fragment_main.xml

@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".fragment.main.MainFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.viewpager.widget.ViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/magicIndicator"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <net.lucode.hackware.magicindicator.MagicIndicator
-            android:id="@+id/magicIndicator"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dp_16"
-            android:layout_centerHorizontal="true"
-            android:visibility="visible"
-            app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/dp_2"
-            android:background="@drawable/custom_bg_ai"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/dp_2"
-                android:layout_marginEnd="@dimen/dp_4"
-                android:layout_marginStart="@dimen/dp_4"
-                android:layout_marginBottom="@dimen/dp_4"
-                android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon0"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_8"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_appstore"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname0"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="应用市场"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon0"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon0"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon0" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon1"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_browser"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname1"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="浏览器"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon1"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon1"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon1" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon2"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_clean"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname2"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="平板管家"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon2"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon2"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon2" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon3"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_camera"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="相机"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon3"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon3"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon3" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon4"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_settings"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname4"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="设置"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon4"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon4"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon4" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_5"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon5"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/com_android_gallery3d_app"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname5"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="图库"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon5"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon5"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon5" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_6"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon6"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_4"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_video"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname6"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="视频百科"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon6"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon6"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon6" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_7"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent">
-
-                    <ImageView
-                        android:id="@+id/iv_icon7"
-                        android:layout_width="@dimen/dp_32"
-                        android:layout_height="@dimen/dp_32"
-                        android:layout_marginStart="@dimen/dp_4"
-                        android:layout_marginEnd="@dimen/dp_8"
-                        android:adjustViewBounds="true"
-                        android:scaleType="centerCrop"
-                        android:src="@drawable/icon_dict"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <TextView
-                        android:id="@+id/tv_appname7"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="字典"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_7"
-                        app:layout_constraintEnd_toEndOf="@+id/iv_icon7"
-                        app:layout_constraintStart_toStartOf="@+id/iv_icon7"
-                        app:layout_constraintTop_toBottomOf="@+id/iv_icon7" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</FrameLayout>

app/src/main/res/layout-sw800dp/fragment_math.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/math_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -38,11 +38,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -65,9 +65,9 @@
 
                         <ImageView
                             android:id="@+id/iv_sync_video"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/math_synchronous_explanation"
@@ -83,9 +83,9 @@
                         android:layout_weight="1">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:background="@drawable/chinese_card_bg"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintEnd_toEndOf="parent"
@@ -126,8 +126,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView4"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_synchronous_tutoring"
@@ -140,7 +140,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="同步辅导"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -164,8 +164,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView5"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_problem_training"
@@ -178,7 +178,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="应用题训练"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -202,8 +202,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView6"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_olympiad_training"
@@ -216,7 +216,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="奥数训练"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -250,8 +250,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView7"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_equation_solution"
@@ -264,7 +264,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="方程精解"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -290,8 +290,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView8"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/mathematical_basis"
@@ -304,7 +304,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="数学基础"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -329,8 +329,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView9"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_arithmetic"
@@ -343,7 +343,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="四则运算"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -376,8 +376,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView10"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_encyclopedia"
@@ -390,7 +390,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="公式大全"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -416,8 +416,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView11"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_number"
@@ -430,7 +430,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="认识数字"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -455,8 +455,8 @@
 
                                             <ImageView
                                                 android:id="@+id/imageView12"
-                                                android:layout_width="@dimen/dp_32"
-                                                android:layout_height="@dimen/dp_32"
+                                                android:layout_width="@dimen/dp_25"
+                                                android:layout_height="@dimen/dp_25"
                                                 android:adjustViewBounds="true"
                                                 android:scaleType="centerInside"
                                                 android:src="@drawable/math_formula"
@@ -469,7 +469,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:text="数学公式"
                                                 android:textColor="@color/default_text_color"
-                                                android:textSize="@dimen/sp_7"
+                                                android:textSize="@dimen/sp_5"
                                                 app:layout_constraintBottom_toBottomOf="parent"
                                                 app:layout_constraintEnd_toEndOf="parent"
                                                 app:layout_constraintStart_toStartOf="parent"
@@ -489,15 +489,15 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <ImageView
                     android:id="@+id/iv_precision_learning"
-                    android:layout_width="@dimen/dp_140"
-                    android:layout_height="@dimen/dp_209"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_168"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"

app/src/main/res/layout-sw800dp/fragment_physics.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/physical_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -38,11 +38,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="同步学习"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -65,9 +65,9 @@
 
                         <ImageView
                             android:id="@+id/imageView1"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginStart="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/physical_synchronous_explanation"
@@ -84,9 +84,9 @@
 
                         <ImageView
                             android:id="@+id/imageView2"
-                            android:layout_width="@dimen/dp_159"
-                            android:layout_height="@dimen/dp_163"
-                            android:layout_marginEnd="@dimen/dp_6"
+                            android:layout_width="@dimen/dp_127"
+                            android:layout_height="@dimen/dp_130"
+                            android:layout_marginEnd="@dimen/dp_4"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/physical_unit_tests"
@@ -101,15 +101,15 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_marginStart="@dimen/dp_9"
+                android:layout_marginStart="@dimen/dp_8"
                 app:layout_constraintBottom_toBottomOf="@+id/constraintLayout3"
                 app:layout_constraintStart_toEndOf="@+id/constraintLayout3"
                 app:layout_constraintTop_toTopOf="@+id/constraintLayout3">
 
                 <ImageView
                     android:id="@+id/imageView3"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"
@@ -120,8 +120,8 @@
 
                 <ImageView
                     android:id="@+id/imageView4"
-                    android:layout_width="@dimen/dp_141"
-                    android:layout_height="@dimen/dp_100"
+                    android:layout_width="@dimen/dp_112"
+                    android:layout_height="@dimen/dp_80"
                     android:layout_weight="1"
                     android:adjustViewBounds="true"
                     android:scaleType="centerCrop"

app/src/main/res/layout-sw800dp/fragment_precision.xml

@@ -21,8 +21,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintLayout3"
-                android:layout_width="@dimen/dp_359"
-                android:layout_height="@dimen/dp_210"
+                android:layout_width="@dimen/dp_287"
+                android:layout_height="@dimen/dp_168"
                 android:background="@drawable/precision_box"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -51,11 +51,11 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_8"
+                        android:layout_marginTop="@dimen/dp_6"
                         android:maxLines="1"
                         android:text="精准学"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16"
+                        android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -72,8 +72,8 @@
 
                     <ImageView
                         android:id="@+id/iv_bunk"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_163"
+                        android:layout_width="@dimen/dp_128"
+                        android:layout_height="@dimen/dp_130"
                         android:src="@drawable/precision_question_bank"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -81,8 +81,8 @@
 
                     <ImageView
                         android:id="@+id/iv_paper"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_77"
+                        android:layout_width="@dimen/dp_128"
+                        android:layout_height="@dimen/dp_61"
                         android:layout_marginStart="@dimen/dp_9"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -92,22 +92,20 @@
 
                     <ImageView
                         android:id="@+id/iv_test"
-                        android:layout_width="@dimen/dp_160"
-                        android:layout_height="@dimen/dp_77"
+                        android:layout_width="@dimen/dp_128"
+                        android:layout_height="@dimen/dp_61"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
                         android:src="@drawable/precision_stage_test"
                         app:layout_constraintBottom_toBottomOf="@+id/iv_bunk"
                         app:layout_constraintStart_toStartOf="@+id/iv_paper" />
-
                 </androidx.constraintlayout.widget.ConstraintLayout>
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <ImageView
                 android:id="@+id/iv_book"
-                android:layout_width="@dimen/dp_141"
-                android:layout_height="@dimen/dp_100"
+                android:layout_width="@dimen/dp_112"
+                android:layout_height="@dimen/dp_80"
                 android:layout_marginStart="@dimen/dp_10"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
@@ -117,8 +115,8 @@
 
             <ImageView
                 android:id="@+id/iv_favorites"
-                android:layout_width="@dimen/dp_141"
-                android:layout_height="@dimen/dp_100"
+                android:layout_width="@dimen/dp_112"
+                android:layout_height="@dimen/dp_80"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
                 android:src="@drawable/precision_favorites"

app/src/main/res/layout-sw800dp/fragment_user.xml

@@ -78,8 +78,11 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_4"
-                android:layout_marginEnd="@dimen/dp_32"
-                android:maxLines="1"
+                android:ellipsize="marquee"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:marqueeRepeatLimit="marquee_forever"
+                android:singleLine="true"
                 android:text="@string/tips"
                 android:textColor="@color/lightGray"
                 android:textSize="@dimen/sp_8"
@@ -102,7 +105,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_36"
+                android:layout_marginTop="@dimen/dp_27"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +130,7 @@
                             android:id="@+id/imageView12"
                             android:layout_width="@dimen/dp_54"
                             android:layout_height="@dimen/dp_65"
-                            android:layout_marginTop="68dp"
+                            android:layout_marginTop="@dimen/dp_16"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/user_trophy"
@@ -188,9 +191,9 @@
 
                         <ImageView
                             android:id="@+id/imageView17"
-                            android:layout_width="@dimen/dp_68"
-                            android:layout_height="@dimen/dp_82"
-                            android:layout_marginTop="@dimen/dp_32"
+                            android:layout_width="@dimen/dp_54"
+                            android:layout_height="@dimen/dp_65"
+                            android:layout_marginTop="@dimen/dp_16"
                             android:adjustViewBounds="true"
                             android:scaleType="centerCrop"
                             android:src="@drawable/user_trophy"
@@ -206,7 +209,7 @@
                             android:maxLines="1"
                             android:text="80%"
                             android:textColor="@color/percent_color"
-                            android:textSize="@dimen/sp_25"
+                            android:textSize="@dimen/sp_18"
                             app:layout_constraintEnd_toEndOf="@+id/imageView17"
                             app:layout_constraintStart_toStartOf="@+id/imageView17"
                             app:layout_constraintTop_toBottomOf="@+id/imageView17" />
@@ -219,7 +222,7 @@
                             android:maxLines="1"
                             android:text="学习时长超过同用户"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
+                            android:textSize="@dimen/sp_7"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_percent" />
@@ -232,7 +235,7 @@
                             android:maxLines="1"
                             android:text="今日学习时间"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/sp_8"
+                            android:textSize="@dimen/sp_7"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/textView5" />
@@ -280,9 +283,9 @@
                             android:paddingEnd="@dimen/dp_6"
                             android:paddingBottom="@dimen/dp_2"
                             android:text="输入激活码"
-                            android:visibility="gone"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_8"
+                            android:visibility="gone"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -357,7 +360,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="@dimen/dp_12"
                                 android:gravity="center_horizontal"
-                                android:text="第二步\n通过小程序扫码绑定设备"
+                                android:text="第二步\n扫码绑定设备"
                                 android:textColor="@color/white"
                                 android:textSize="@dimen/sp_6"
                                 app:layout_constraintEnd_toEndOf="@+id/iv_device_qrcode"
@@ -376,12 +379,12 @@
                             android:id="@+id/tv_date2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/dp_8"
-                            android:layout_marginTop="@dimen/dp_8"
+                            android:layout_marginStart="@dimen/dp_6"
+                            android:layout_marginTop="@dimen/dp_6"
                             android:maxLines="1"
                             android:text="2月14日 星期二"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/sp_12"
+                            android:textSize="@dimen/sp_7"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
 
@@ -395,8 +398,8 @@
 
                             <ImageView
                                 android:id="@+id/imageView13"
-                                android:layout_width="@dimen/dp_16"
-                                android:layout_height="@dimen/dp_16"
+                                android:layout_width="@dimen/dp_8"
+                                android:layout_height="@dimen/dp_8"
                                 android:layout_marginEnd="@dimen/dp_8"
                                 android:adjustViewBounds="true"
                                 android:scaleType="centerCrop"
@@ -408,10 +411,10 @@
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="@dimen/dp_8"
+                                android:layout_marginEnd="@dimen/dp_4"
                                 android:text="更多应用"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/sp_8"
                                 app:layout_constraintBottom_toBottomOf="@+id/imageView13"
                                 app:layout_constraintEnd_toStartOf="@+id/imageView13"
                                 app:layout_constraintTop_toTopOf="@+id/imageView13" />
@@ -422,6 +425,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_margin="@dimen/dp_8"
+                            android:scrollbars="vertical"
+                            android:fadeScrollbars="false"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_date2" />
 

app/src/main/res/layout/activity_moreapp.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.more.MoreAppActivity">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_32"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="@dimen/dp_48"
+            android:layout_height="@dimen/dp_24"
+            android:layout_marginStart="@dimen/dp_8"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/exit"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="所有应用"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_appsize"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/app_size"
+            android:layout_marginEnd="@dimen/dp_8"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_11"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/dp_8"
+        android:layout_marginTop="@dimen/dp_4"
+        android:layout_marginEnd="@dimen/dp_8"
+        android:layout_marginBottom="@dimen/dp_4"
+        android:fadeScrollbars="false"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -14,5 +14,7 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="tips">努力不为感动谁，只为不与最好的自己失之交臂。趁着最美好的年华，继续奋斗吧。</string>
+    <string name="app_size">%d款应用</string>
+    <string name="today_study_time">今日学习时间%s</string>
 
 </resources>