version:1.0.3

fix:
update:基本跳转对接

app/build.gradle

@@ -16,8 +16,8 @@ android {
         minSdkVersion 24
         targetSdkVersion 29
 
-        versionCode 3
+        versionCode 4
-        versionName "1.0.2"
+        versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/AndroidManifest.xml

@@ -96,12 +96,12 @@
             android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen"
             android:enabled="true"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:screenOrientation="landscape"
             android:stateNotNeeded="true"
-            android:exported="true"
             android:theme="@style/AppThemeWithoutFitsSystemWindows"
             android:windowSoftInputMode="adjustPan">
             <!--            <intent-filter>-->
@@ -121,12 +121,12 @@
             android:configChanges="orientation|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation|touchscreen"
             android:enabled="true"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:screenOrientation="landscape"
             android:stateNotNeeded="true"
-            android:exported="true"
             android:theme="@style/AppThemeWithoutFitsSystemWindows"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
@@ -139,6 +139,19 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activity.activation.ActivationActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".activity.login.LoginActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".activity.login.result.LoginSuccessfulActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape" />
+
         <activity
             android:name=".activity.NoticeActivity"
             android:excludeFromRecents="true"
@@ -220,6 +233,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="landscape" />
 
+
         <receiver
             android:name=".receiver.BootReceiver"
             android:enabled="true"
@@ -341,11 +355,11 @@
         <!-- 请填写你自己的- appKey -->
         <meta-data
             android:name="com.alibaba.app.appkey"
-            android:value="333816243" />
+            android:value="335634702" />
         <!-- 请填写你自己的appSecret -->
         <meta-data
             android:name="com.alibaba.app.appsecret"
-            android:value="ab5ffe213b1d449fb624d4a6e8ea7275" />
+            android:value="699c3543251a4853a9b501d7426872f0" />
 
         <meta-data
             android:name="design_width_in_dp"

app/src/main/java/com/xwad/os/activity/activation/ActivationActivity.java

@@ -0,0 +1,94 @@
+package com.xwad.os.activity.activation;
+
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.text.method.DigitsKeyListener;
+import android.view.View;
+
+import com.xwad.os.R;
+import com.xwad.os.base.mvvm.BaseMvvmActivity;
+import com.xwad.os.databinding.ActivityActivationBinding;
+
+public class ActivationActivity extends BaseMvvmActivity<ActivationViewModel, ActivityActivationBinding> {
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_activation;
+    }
+
+    @Override
+    protected void initDataBinding() {
+        mViewModel.setCtx(this);
+        mViewModel.setVDBinding(mViewDataBinding);
+        mViewModel.setLifecycle(getLifecycleSubject());
+        mViewDataBinding.setClick(new BtnClick());
+    }
+
+    @Override
+    protected void initView() {
+        // 优化后的InputFilter：兼容手动输入、粘贴、输入法联想
+        InputFilter englishNumberFilter = new InputFilter() {
+            @Override
+            public CharSequence filter(CharSequence source, int start, int end,
+                                       Spanned dest, int dstart, int dend) {
+                // 空字符直接返回（避免过滤正常的删除/回退操作）
+                if (source.toString().isEmpty()) {
+                    return source;
+                }
+
+                StringBuilder legalStr = new StringBuilder();
+                for (int i = start; i < end; i++) {
+                    char c = source.charAt(i);
+                    // 严格匹配：大小写英文 或 数字
+                    boolean isLetter = (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+                    boolean isNumber = (c >= '0' && c <= '9');
+                    if (isLetter || isNumber) {
+                        legalStr.append(c);
+                    }
+                }
+                return legalStr;
+            }
+        };
+
+        // 设置仅允许输入指定字符
+        mViewDataBinding.etCoupons.setFilters(new InputFilter[]{
+                englishNumberFilter,
+                new InputFilter.LengthFilter(20)
+        });
+        mViewDataBinding.etKey.setFilters(new InputFilter[]{
+                englishNumberFilter,
+                new InputFilter.LengthFilter(20)
+        });
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    public class BtnClick {
+        public void exit(View view) {
+            finish();
+        }
+
+        public void useQrCode(View view) {
+            mViewDataBinding.clQrcode.setVisibility(View.VISIBLE);
+            mViewDataBinding.clCoupons.setVisibility(View.GONE);
+            mViewDataBinding.clKey.setVisibility(View.GONE);
+        }
+
+        public void useCoupons(View view) {
+            mViewDataBinding.clQrcode.setVisibility(View.GONE);
+            mViewDataBinding.clCoupons.setVisibility(View.VISIBLE);
+            mViewDataBinding.clKey.setVisibility(View.GONE);
+        }
+
+        public void useKey(View view) {
+            mViewDataBinding.clQrcode.setVisibility(View.GONE);
+            mViewDataBinding.clCoupons.setVisibility(View.GONE);
+            mViewDataBinding.clKey.setVisibility(View.VISIBLE);
+        }
+    }
+
+}

app/src/main/java/com/xwad/os/activity/activation/ActivationViewModel.java

@@ -0,0 +1,18 @@
+package com.xwad.os.activity.activation;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.xwad.os.base.mvvm.BaseViewModel;
+import com.xwad.os.databinding.ActivityActivationBinding;
+
+public class ActivationViewModel extends BaseViewModel<ActivityActivationBinding, ActivityEvent> {
+
+    @Override
+    public ActivityActivationBinding getVDBinding() {
+        return binding;
+    }
+
+    @Override
+    public void onDestroy() {
+
+    }
+}

app/src/main/java/com/xwad/os/activity/home/HomeActivity.java

@@ -20,7 +20,6 @@ import android.view.animation.TranslateAnimation;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -33,6 +32,8 @@ import com.hjq.toast.Toaster;
 import com.tencent.mmkv.MMKV;
 import com.xwad.os.BuildConfig;
 import com.xwad.os.R;
+import com.xwad.os.activity.activation.ActivationActivity;
+import com.xwad.os.activity.login.LoginActivity;
 import com.xwad.os.activity.permission.PermissionActivity;
 import com.xwad.os.base.mvvm.BaseMvvmActivity;
 import com.xwad.os.bean.jxw.TabBean;
@@ -57,7 +58,6 @@ import com.xwad.os.manager.RemoteManager;
 import com.xwad.os.utils.DataUtil;
 import com.xwad.os.utils.OpenApkUtils;
 import com.xwad.os.utils.Utils;
-import com.xwad.os.view.viewpager.BaseFragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -67,23 +67,9 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
-    private List<TabBean> tabBeanLists = new ArrayList();
+    private List<TabBean> tabBeanLists = new ArrayList<>();
-    private List<Fragment> fragments = new ArrayList();
+    private List<Fragment> fragments = new ArrayList<>();
 
-    private String[] mAllTitle = new String[]{"我的", "AI+学习", "语文", "数学", "英语", "其他学科", "读书", "绿色安全",};
-
-    private MineFragment mMineFragment;
-    private AiFragment mAiFragment;
-    private ChineseFragment mChineseFragment;
-    private MathFragment mMathFragment;
-    private EnglishFragment mEnglishFragment;
-    private ComplexFragment mComplexFragment;
-    private ReadFragment mReadFragment;
-    private SafeFragment mSafeFragment;
-
-    private FragmentManager mFragmentManager;
-    private BaseFragmentPagerAdapter mBaseFragmentPagerAdapter;
-    private ViewPager.OnPageChangeListener mListener;
     private int defaultCurrent = 0;
 
     @Override
@@ -110,6 +96,7 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
     public void initView() {
         Log.e(TAG, "initView: getSerial = " + RemoteManager.getInstance().getSerial());
 
+        startActivity(new Intent(HomeActivity.this, LoginActivity.class));
         RemoteManager.setListener(this);
         Utils.getAndroiodScreenProperty(this);
 
@@ -171,9 +158,9 @@ public class HomeActivity extends BaseMvvmActivity<HomeViewModel, ActivityHomeBi
 //        }
         tabBeanLists.add(new TabBean("绿色安全", R.drawable.icon_tab_lsaq, R.drawable.icon_tab_lsaq_pre));
         tabAdapter.setData(this.tabBeanLists);
-        mViewDataBinding.subjectViewPager.setOffscreenPageLimit(5);
+        mViewDataBinding.subjectViewPager.setOffscreenPageLimit(10);
-        tabAdapter.setChoosePosition(0);
+        tabAdapter.setChoosePosition(defaultCurrent);
-        mViewDataBinding.subjectViewPager.setCurrentItem(0);
+        mViewDataBinding.subjectViewPager.setCurrentItem(defaultCurrent);
         mViewDataBinding.subjectViewPager.setScrollAnim(true);
         mViewDataBinding.subjectViewPager.setAdapter(new TabFragmentAdapter(getSupportFragmentManager()));
 

app/src/main/java/com/xwad/os/activity/login/LoginActivity.java

@@ -0,0 +1,41 @@
+package com.xwad.os.activity.login;
+
+import android.content.Intent;
+import android.view.View;
+
+import com.xwad.os.R;
+import com.xwad.os.activity.login.result.LoginSuccessfulActivity;
+import com.xwad.os.base.mvvm.BaseMvvmActivity;
+import com.xwad.os.databinding.ActivityLoginBinding;
+
+public class LoginActivity extends BaseMvvmActivity<LoginViewModel, ActivityLoginBinding> {
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_login;
+    }
+
+    @Override
+    protected void initDataBinding() {
+        mViewModel.setCtx(this);
+        mViewModel.setVDBinding(mViewDataBinding);
+        mViewModel.setLifecycle(getLifecycleSubject());
+        mViewDataBinding.setClick(new BtnClick());
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    public class BtnClick {
+        public void loginPhone(View view) {
+            startActivity(new Intent(LoginActivity.this, LoginSuccessfulActivity.class));
+        }
+    }
+}

app/src/main/java/com/xwad/os/activity/login/LoginViewModel.java

@@ -0,0 +1,12 @@
+package com.xwad.os.activity.login;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.xwad.os.base.mvvm.BaseViewModel;
+import com.xwad.os.databinding.ActivityLoginBinding;
+
+public class LoginViewModel extends BaseViewModel<ActivityLoginBinding, ActivityEvent> {
+    @Override
+    public void onDestroy() {
+
+    }
+}

app/src/main/java/com/xwad/os/activity/login/result/LoginSuccessfulActivity.java

@@ -0,0 +1,37 @@
+package com.xwad.os.activity.login.result;
+
+import com.xwad.os.R;
+import com.xwad.os.base.mvvm.BaseMvvmActivity;
+import com.xwad.os.databinding.ActivityLoginBinding;
+import com.xwad.os.databinding.ActivityLoginSuccessfulBinding;
+
+public class LoginSuccessfulActivity extends BaseMvvmActivity<LoginSuccessfulViewModel, ActivityLoginSuccessfulBinding> {
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_login_successful;
+    }
+
+    @Override
+    protected void initDataBinding() {
+        mViewModel.setCtx(this);
+        mViewModel.setVDBinding(mViewDataBinding);
+        mViewModel.setLifecycle(getLifecycleSubject());
+        mViewDataBinding.setClick(new BtnClick());
+    }
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    protected void initData() {
+
+    }
+
+    public class BtnClick {
+
+    }
+
+}

app/src/main/java/com/xwad/os/activity/login/result/LoginSuccessfulViewModel.java

@@ -0,0 +1,13 @@
+package com.xwad.os.activity.login.result;
+
+import com.trello.rxlifecycle4.android.ActivityEvent;
+import com.xwad.os.base.mvvm.BaseViewModel;
+import com.xwad.os.databinding.ActivityLoginBinding;
+import com.xwad.os.databinding.ActivityLoginSuccessfulBinding;
+
+public class LoginSuccessfulViewModel extends BaseViewModel<ActivityLoginSuccessfulBinding, ActivityEvent> {
+    @Override
+    public void onDestroy() {
+
+    }
+}

app/src/main/java/com/xwad/os/base/BaseApplication.java

@@ -11,6 +11,9 @@ import android.util.Log;
 
 import androidx.multidex.MultiDex;
 
+import com.alibaba.sdk.android.push.CloudPushService;
+import com.alibaba.sdk.android.push.CommonCallback;
+import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
 import com.arialyy.aria.core.Aria;
 import com.hjq.toast.Toaster;
 import com.tencent.bugly.crashreport.CrashReport;
@@ -101,27 +104,27 @@ public class BaseApplication extends Application {
 //            Aria.get(this).getDownloadConfig().setMaxTaskNum(1);
 //            Aria.get(this).getDownloadConfig().setConvertSpeed(true);
 
-//        aliyunPushInit();
+            aliyunPushInit();
         }
     }
 
-//    public void aliyunPushInit() {
+    public void aliyunPushInit() {
-//        PushServiceFactory.init(this);
+        PushServiceFactory.init(this);
-//        final CloudPushService pushService = PushServiceFactory.getCloudPushService();
+        final CloudPushService pushService = PushServiceFactory.getCloudPushService();
-//        pushService.setLogLevel(CloudPushService.LOG_DEBUG);
+        pushService.setLogLevel(CloudPushService.LOG_DEBUG);
-////        pushService.register(this, new CommonCallback() {
+        pushService.register(this, new CommonCallback() {
-////            @Override
+            @Override
-////            public void onSuccess(String response) {
+            public void onSuccess(String response) {
-////                Log.e("AliyunPush", "init cloudchannel success");
+                Log.e("AliyunPush", "init cloudchannel success");
-////                Log.e("AliyunPush", "init cloudchannel success  " + pushService.getDeviceId());
+                Log.e("AliyunPush", "init cloudchannel success  " + pushService.getDeviceId());
-////            }
+            }
-////
+
-////            @Override
+            @Override
-////            public void onFailed(String errorCode, String errorMessage) {
+            public void onFailed(String errorCode, String errorMessage) {
-////                Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
+                Log.e("AliyunPush", "init cloudchannel failed -- errorcode:" + errorCode + " -- errorMessage:" + errorMessage);
-////            }
+            }
-////        });
+        });
-//    }
+    }
 
     private APKinstallReceiver apKinstallReceiver;
 

app/src/main/java/com/xwad/os/fragment/mine/MineFragment.java

@@ -1,17 +1,47 @@
 package com.xwad.os.fragment.mine;
 
 import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 
 import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.xwad.os.R;
+import com.xwad.os.activity.activation.ActivationActivity;
+import com.xwad.os.activity.home.HomeActivity;
 import com.xwad.os.base.mvvm.fragment.BaseMvvmFragment;
+import com.xwad.os.bean.jxw.AppInfo;
 import com.xwad.os.config.CommonConfig;
 import com.xwad.os.databinding.FragmentMineBinding;
 import com.tencent.mmkv.MMKV;
+import com.xwad.os.jxw.StudyRecordMng;
+import com.xwad.os.jxw.ToastUtil;
+import com.xwad.os.jxw.adapter.ZhMenuAdapter;
+import com.xwad.os.jxw.event.UpdateColorEvent;
+import com.xwad.os.utils.OpenApkUtils;
+import com.xwad.os.view.jxw.view.dialog.QhbzDialog;
+import com.xwad.os.view.jxw.view.dialog.RemoveAppDialog;
+import com.xwad.os.view.jxw.widget.RecyclerMarginClickHelper;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -23,6 +53,11 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
     private Activity mContext;
+    private ZhMenuAdapter zhMenuAdapter;
+    private List<AppInfo> mlistAppInfo = new ArrayList<>();
+    private Handler mHandler = new Handler();
+    public String file_name = "app_list_6.0";
+
 
     // TODO: Rename parameter arguments, choose names that match
     // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
@@ -76,11 +111,78 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
             mParam2 = getArguments().getString(ARG_PARAM2);
         }
 
+        mViewDataBinding.gridViewId.setLayoutManager(new GridLayoutManager(mContext, 8));
+        zhMenuAdapter = new ZhMenuAdapter(mContext, mlistAppInfo);
+        mViewDataBinding.gridViewId.setAdapter(zhMenuAdapter);
+//        mViewDataBinding.relaRoot.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                zhMenuAdapter.setToDelete(false);
+//            }
+//        });
+        RecyclerMarginClickHelper.setOnMarginClickListener(mViewDataBinding.gridViewId, new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                zhMenuAdapter.setToDelete(false);
+            }
+        });
+        zhMenuAdapter.setOnItemClickListener(new ZhMenuAdapter.RadiaoOnItemClickListener() {
+            @Override
+            public void onSelectClick(int i) {
+                AppInfo appInfo;
+                if (mlistAppInfo == null || mlistAppInfo.size() <= 0 || (appInfo = mlistAppInfo.get(i)) == null) {
+                    return;
+                }
+                if (appInfo.appName.equals("切换壁纸")) {
+                    QhbzDialog qhbzDialog = new QhbzDialog(mContext);
+                    qhbzDialog.show();
+                    qhbzDialog.setOnCallback(new QhbzDialog.Callback() {
+                        @Override
+                        public void onCallback(int i2) {
+                            EventBus.getDefault().postSticky(new UpdateColorEvent());
+                        }
+                    });
+                } else if (!TextUtils.isEmpty(appInfo.getPkgName())) {
+                    Log.e(TAG, "onSelectClick: onItemClick 11");
+                    startApkByPackName(mContext, appInfo.getPkgName());
+                } else if (TextUtils.isEmpty(appInfo.mStargss)) {
+
+                } else {
+                    Log.e(TAG, "onItemClick66 " + appInfo.mStargss);
+//                    MyApp.getInstance().mBottomBtnOnClickListener.setContext(mContext);
+//                    MyApp.getInstance().mBottomBtnOnClickListener.onClick(appInfo.mStargss);
+                    OpenApkUtils.getInstance().openJxwApp(appInfo.mStargss);
+                }
+            }
+
+            @Override
+            public void onDeleteClick(final String str, final int i, String str2) {
+                RemoveAppDialog removeAppDialog = new RemoveAppDialog(mContext, str2);
+                removeAppDialog.show();
+                removeAppDialog.setOnCallback(new RemoveAppDialog.Callback() {
+                    @Override
+                    public void onCallback() {
+                        readContent(str, i);
+                        if (mlistAppInfo != null) {
+                            mlistAppInfo.clear();
+                        }
+                        initAppData();
+                    }
+                });
+            }
+        });
+        zhMenuAdapter.setOnItemChildLongClickListener(new BaseQuickAdapter.OnItemChildLongClickListener() {
+            @Override
+            public boolean onItemChildLongClick(BaseQuickAdapter baseQuickAdapter, View view, int i) {
+                zhMenuAdapter.setToDelete(true);
+                return false;
+            }
+        });
     }
 
     @Override
     protected void initData(Bundle savedInstanceState) {
-
+        initAppData();
     }
 
     @Override
@@ -91,7 +193,7 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
 
     @Override
     public void fetchData() {
-
+        initAppData();
     }
 
     @Override
@@ -106,11 +208,110 @@ public class MineFragment extends BaseMvvmFragment<MineViewModel, FragmentMineBi
 
     }
 
+    public void initAppData() {
+        AppInfo build = new AppInfo.Builder().appLabel("课程表").appStargs(getResources().getString(R.string.tag_args_new_kcb)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_kcb)).build();
+        AppInfo build2 = new AppInfo.Builder().appLabel("语音翻译").appStargs(getResources().getString(R.string.tag_args_new_zyhy)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yyfy)).build();
+//        AppInfo build3 = new AppInfo.Builder().appLabel("使用助手").appStargs(getResources().getString(R.string.tag_args_new_sysmx)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_syzs)).build();
+        AppInfo build4 = new AppInfo.Builder().appLabel("资源更新").appStargs(getResources().getString(R.string.tag_args_updae)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yygx)).build();
+        AppInfo build5 = new AppInfo.Builder().appLabel("一键加速").appStargs(getResources().getString(R.string.tag_args_new_yjjs)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_yjjs)).build();
+        AppInfo build6 = new AppInfo.Builder().appLabel("下载中心").appStargs(getResources().getString(R.string.tag_args_new_download)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_xzzx)).build();
+        AppInfo build7 = new AppInfo.Builder().appLabel("切换壁纸").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_qhbz)).build();
+        AppInfo build8 = new AppInfo.Builder().appLabel("回到安卓").appStargs(getResources().getString(R.string.tag_args_launcher)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_azpt)).build();
+        AppInfo build9 = new AppInfo.Builder().appLabel("设置").appStargs(getResources().getString(R.string.tag_args_new_jxwSettings)).appIcon(mContext.getResources().getDrawable(R.drawable.icon_bbx_sz)).build();
+        mlistAppInfo.add(build);
+        mlistAppInfo.add(build2);
+//        mlistAppInfo.add(build3);
+        mlistAppInfo.add(build4);
+        mlistAppInfo.add(build5);
+        mlistAppInfo.add(build6);
+        mlistAppInfo.add(build7);
+        mlistAppInfo.add(build8);
+        mlistAppInfo.add(build9);
+        getAppData();
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                zhMenuAdapter.setData(mlistAppInfo);
+                zhMenuAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void getAppData() {
+        File fileStreamPath = mContext.getFileStreamPath(file_name);
+        if (!fileStreamPath.exists()) {
+            return;
+        }
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath));
+            PackageManager packageManager = mContext.getPackageManager();
+            while (true) {
+                String readLine = bufferedReader.readLine();
+                if (readLine != null) {
+                    try {
+                        ApplicationInfo applicationInfo = packageManager.getApplicationInfo(readLine, PackageManager.GET_META_DATA);
+                        mlistAppInfo.add(new AppInfo.Builder().appLabel((String) packageManager.getApplicationLabel(applicationInfo)).pkgName(readLine).appIcon(packageManager.getApplicationIcon(applicationInfo)).build());
+                    } catch (PackageManager.NameNotFoundException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    bufferedReader.close();
+                    return;
+                }
+            }
+        } catch (FileNotFoundException e2) {
+            e2.printStackTrace();
+        } catch (IOException e3) {
+            e3.printStackTrace();
+        }
+    }
+
+    void startApkByPackName(Context context, String str) {
+        try {
+            context.startActivity(context.getPackageManager().getLaunchIntentForPackage(str));
+            StudyRecordMng.startCount(context, str, "", "", true);
+        } catch (Exception e) {
+            Log.d("zzj", "startApkByPackName error : " + e.toString());
+            ToastUtil.showTextToastDia("此应用已经被家长管控");
+        }
+    }
+
+    public String readContent(String str, int i) {
+        File fileStreamPath = mContext.getFileStreamPath(file_name);
+        if (!fileStreamPath.exists()) {
+            return null;
+        }
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath));
+            String str2 = "";
+            Log.e(TAG, "pkg = " + str + "poi=" + i);
+            while (true) {
+                String readLine = bufferedReader.readLine();
+                if (readLine != null) {
+                    Log.e(TAG, "line " + readLine);
+                    if (!readLine.equals(str)) {
+                        str2 = str2 + readLine + "\n";
+                    }
+                } else {
+                    bufferedReader.close();
+                    FileOutputStream fileOutputStream = new FileOutputStream(fileStreamPath, false);
+                    Log.e(TAG, "sb = " + str2);
+                    fileOutputStream.write(str2.getBytes());
+                    fileOutputStream.flush();
+                    fileOutputStream.close();
+                    return null;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
 
     public class BtnClick {
-        public void openPrecisionHome(View view) {
+        public void toLigin(View view) {
-
+            startActivity(new Intent(mContext, ActivationActivity.class));
         }
     }
 }

app/src/main/java/com/xwad/os/fragment/safe/SafeFragment.java

@@ -22,12 +22,13 @@ import com.xwad.os.bean.jxw.AppInfo;
 import com.xwad.os.config.CommonConfig;
 import com.xwad.os.databinding.FragmentSafeBinding;
 import com.xwad.os.jxw.AssertUtils;
-import com.xwad.os.jxw.event.GkEvent;
-import com.xwad.os.view.jxw.view.dialog.QhbzDialog;
 import com.xwad.os.jxw.StudyRecordMng;
 import com.xwad.os.jxw.ToastUtil;
+import com.xwad.os.jxw.adapter.ZhMenuAdapter;
+import com.xwad.os.jxw.event.GkEvent;
 import com.xwad.os.jxw.event.UpdateColorEvent;
 import com.xwad.os.utils.OpenApkUtils;
+import com.xwad.os.view.jxw.view.dialog.QhbzDialog;
 import com.xwad.os.view.jxw.view.dialog.RemoveAppDialog;
 import com.xwad.os.view.jxw.widget.RecyclerMarginClickHelper;
 
@@ -58,7 +59,7 @@ public class SafeFragment extends BaseMvvmFragment<SafeViewModel, FragmentSafeBi
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
     private AppInfo addAppinfo;
-    private AssertUtils.ZhMenuAdapter zhMenuAdapter;
+    private ZhMenuAdapter zhMenuAdapter;
     private List<AppInfo> mlistAppInfo = new ArrayList<>();
     private Handler mHandler = new Handler();
     public String file_name = "app_list_6.0";
@@ -118,7 +119,7 @@ public class SafeFragment extends BaseMvvmFragment<SafeViewModel, FragmentSafeBi
         }
 
         mViewDataBinding.gridViewId.setLayoutManager(new GridLayoutManager(mContext, 8));
-        zhMenuAdapter = new AssertUtils.ZhMenuAdapter(mContext, mlistAppInfo);
+        zhMenuAdapter = new ZhMenuAdapter(mContext, mlistAppInfo);
         mViewDataBinding.gridViewId.setAdapter(zhMenuAdapter);
         mViewDataBinding.relaRoot.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -132,7 +133,7 @@ public class SafeFragment extends BaseMvvmFragment<SafeViewModel, FragmentSafeBi
                 zhMenuAdapter.setToDelete(false);
             }
         });
-        zhMenuAdapter.setOnItemClickListener(new AssertUtils.ZhMenuAdapter.RadiaoOnItemClickListener() {
+        zhMenuAdapter.setOnItemClickListener(new ZhMenuAdapter.RadiaoOnItemClickListener() {
             @Override
             public void onSelectClick(int i) {
                 AppInfo appInfo;
@@ -354,7 +355,6 @@ public class SafeFragment extends BaseMvvmFragment<SafeViewModel, FragmentSafeBi
         }
         try {
             BufferedReader bufferedReader = new BufferedReader(new FileReader(fileStreamPath));
-            int i2 = len;
             String str2 = "";
             Log.e(TAG, "pkg = " + str + "poi=" + i);
             while (true) {

app/src/main/java/com/xwad/os/jxw/AssertUtils.java

@@ -67,123 +67,4 @@ public class AssertUtils {
         return context.getResources().getDimensionPixelSize(context.getResources().getIdentifier(str, "dimen", context.getPackageName()));
     }
 
-    public static class ZhMenuAdapter extends BaseQuickAdapter<AppInfo, BaseViewHolder> {
-        private Context context;
-        private List<AppInfo> data;
-        private List<String> gkAppData;
-        private RadiaoOnItemClickListener listener;
-        private Handler mHandler;
-        public int remove_position;
-        private boolean xiezai;
-
-        public interface RadiaoOnItemClickListener {
-            void onDeleteClick(String str, int i, String str2);
-
-            void onSelectClick(int i);
-        }
-
-        public boolean getToDelete() {
-            return this.xiezai;
-        }
-
-        public void setToDelete(boolean z) {
-            this.xiezai = z;
-            notifyDataSetChanged();
-        }
-
-        public void setData(List<AppInfo> list) {
-            this.data = list;
-            notifyDataSetChanged();
-        }
-
-        public ZhMenuAdapter(Context context, List<AppInfo> list) {
-            super(R.layout.item_app_gk, list);
-            this.xiezai = false;
-            this.remove_position = -1;
-            this.mHandler = new Handler();
-            this.context = context;
-        }
-
-        @Override
-        public void convert(final BaseViewHolder baseViewHolder, final AppInfo appInfo) {
-            try {
-                TextView textView = baseViewHolder.getView(R.id.app_name);
-                ImageView imageView = baseViewHolder.getView(R.id.app_icon);
-                ImageView imageView2 = baseViewHolder.getView(R.id.delet_iv);
-                RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_jinyong);
-                RelativeLayout relativeLayout2 = baseViewHolder.getView(R.id.rl_xzsy);
-                textView.setText(appInfo.appName);
-                if (SPUtils.getInt(this.mContext, "themenBg", 0) == 1) {
-                    textView.setTextColor(-10066330);
-                } else {
-                    textView.setTextColor(-1);
-                }
-                Glide.with(imageView).load(appInfo.getAppIcon()).apply(RequestOptions.bitmapTransform(new RoundedCorners((int) this.mContext.getResources().getDimension(R.dimen.x20)))).into(imageView);
-                relativeLayout.setVisibility(8);
-                relativeLayout2.setVisibility(8);
-                if (GkAppUseInfo.getGkAppUseInfo().datas != null) {
-                    for (AppUseInfo appUseInfo : GkAppUseInfo.getGkAppUseInfo().datas) {
-                        Log.e("jxw", appInfo.packageName + "--" + appUseInfo.getPackageName());
-                        if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 0)) {
-                            Log.e("jxw-", "禁止使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName());
-                            relativeLayout.setVisibility(0);
-                            break;
-                        } else if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 2) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled().intValue() == 2)) {
-                            Log.e("jxw-", "限制使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName());
-                            relativeLayout2.setVisibility(0);
-                            break;
-                        }
-                    }
-                }
-                if (!this.xiezai) {
-                    imageView2.setVisibility(8);
-                } else {
-                    imageView2.setVisibility(0);
-                }
-                imageView2.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if (ZhMenuAdapter.this.listener != null) {
-                            ZhMenuAdapter.this.listener.onDeleteClick(appInfo.packageName, baseViewHolder.getAdapterPosition(), appInfo.appName);
-                        }
-                    }
-                });
-                if (!this.xiezai) {
-                    imageView2.setVisibility(8);
-                } else if (!TextUtils.isEmpty(appInfo.packageName) && appInfo.getIntent() == null) {
-                    imageView2.setVisibility(0);
-                } else {
-                    imageView2.setVisibility(8);
-                }
-                baseViewHolder.addOnLongClickListener(R.id.app_icon);
-                imageView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if (GkAppUseInfo.getGkAppUseInfo().datas != null) {
-                            for (AppUseInfo appUseInfo2 : GkAppUseInfo.getGkAppUseInfo().datas) {
-                                Log.e("jxw", appInfo.packageName + "--" + appUseInfo2.getPackageName());
-                                if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled().intValue() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled().intValue() == 0)) {
-                                    new LockDialog(ZhMenuAdapter.this.mContext, appInfo.appName).show();
-                                    return;
-                                }
-                            }
-                        }
-                        if (ZhMenuAdapter.this.listener != null) {
-                            ZhMenuAdapter.this.listener.onSelectClick(baseViewHolder.getAdapterPosition());
-                        }
-                    }
-                });
-            } catch (Exception unused) {
-            }
-        }
-
-        public void setGkApp(List<String> list) {
-            this.gkAppData = list;
-            notifyDataSetChanged();
-        }
-
-        public void setOnItemClickListener(RadiaoOnItemClickListener radiaoOnItemClickListener) {
-            this.listener = radiaoOnItemClickListener;
-        }
-    }
 }

app/src/main/java/com/xwad/os/jxw/adapter/ZhMenuAdapter.java

@@ -0,0 +1,144 @@
+package com.xwad.os.jxw.adapter;
+
+import android.content.Context;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.BaseViewHolder;
+import com.xwad.os.R;
+import com.xwad.os.bean.jxw.AppInfo;
+import com.xwad.os.bean.jxw.AppUseInfo;
+import com.xwad.os.bean.jxw.GkAppUseInfo;
+import com.xwad.os.jxw.SPUtils;
+import com.xwad.os.view.jxw.view.dialog.LockDialog;
+
+import java.util.List;
+
+public class ZhMenuAdapter extends BaseQuickAdapter<AppInfo, BaseViewHolder> {
+    private Context context;
+    private List<AppInfo> data;
+    private List<String> gkAppData;
+    private RadiaoOnItemClickListener listener;
+    private Handler mHandler;
+    public int remove_position;
+    private boolean xiezai;
+
+    public interface RadiaoOnItemClickListener {
+        void onDeleteClick(String str, int i, String str2);
+
+        void onSelectClick(int i);
+    }
+
+    public boolean getToDelete() {
+        return xiezai;
+    }
+
+    public void setToDelete(boolean z) {
+        xiezai = z;
+        notifyDataSetChanged();
+    }
+
+    public void setData(List<AppInfo> list) {
+        data = list;
+        notifyDataSetChanged();
+    }
+
+    public ZhMenuAdapter(Context context, List<AppInfo> list) {
+        super(R.layout.item_app_gk, list);
+        xiezai = false;
+        remove_position = -1;
+        mHandler = new Handler();
+        this.context = context;
+    }
+
+    @Override
+    public void convert(final BaseViewHolder baseViewHolder, final AppInfo appInfo) {
+        try {
+            TextView textView = baseViewHolder.getView(R.id.app_name);
+            ImageView imageView = baseViewHolder.getView(R.id.app_icon);
+            ImageView imageView2 = baseViewHolder.getView(R.id.delet_iv);
+            RelativeLayout relativeLayout = baseViewHolder.getView(R.id.rl_jinyong);
+            RelativeLayout relativeLayout2 = baseViewHolder.getView(R.id.rl_xzsy);
+            textView.setText(appInfo.appName);
+            if (SPUtils.getInt(mContext, "themenBg", 0) == 1) {
+                textView.setTextColor(-10066330);
+            } else {
+                textView.setTextColor(-1);
+            }
+            Glide.with(imageView).load(appInfo.getAppIcon()).apply(RequestOptions.bitmapTransform(new RoundedCorners((int) mContext.getResources().getDimension(R.dimen.x20)))).into(imageView);
+            relativeLayout.setVisibility(View.GONE);
+            relativeLayout2.setVisibility(View.GONE);
+            if (GkAppUseInfo.getGkAppUseInfo().datas != null) {
+                for (AppUseInfo appUseInfo : GkAppUseInfo.getGkAppUseInfo().datas) {
+                    Log.e("jxw", appInfo.packageName + "--" + appUseInfo.getPackageName());
+                    if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled() == 0)) {
+                        Log.e("jxw-", "禁止使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName());
+                        relativeLayout.setVisibility(View.VISIBLE);
+                        break;
+                    } else if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo.getPackageName()) && appUseInfo.getEnabled() == 2) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo.getPackageName()) && appUseInfo.getEnabled() == 2)) {
+                        Log.e("jxw-", "限制使用的app==" + appInfo.packageName + "--" + appInfo.mStargss + "--" + appUseInfo.getPackageName());
+                        relativeLayout2.setVisibility(View.VISIBLE);
+                        break;
+                    }
+                }
+            }
+            if (!xiezai) {
+                imageView2.setVisibility(View.GONE);
+            } else {
+                imageView2.setVisibility(View.VISIBLE);
+            }
+            imageView2.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (listener != null) {
+                        listener.onDeleteClick(appInfo.packageName, baseViewHolder.getAdapterPosition(), appInfo.appName);
+                    }
+                }
+            });
+            if (!xiezai) {
+                imageView2.setVisibility(View.GONE);
+            } else if (!TextUtils.isEmpty(appInfo.packageName) && appInfo.getIntent() == null) {
+                imageView2.setVisibility(View.VISIBLE);
+            } else {
+                imageView2.setVisibility(View.GONE);
+            }
+            baseViewHolder.addOnLongClickListener(R.id.app_icon);
+            imageView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (GkAppUseInfo.getGkAppUseInfo().datas != null) {
+                        for (AppUseInfo appUseInfo2 : GkAppUseInfo.getGkAppUseInfo().datas) {
+                            Log.e("jxw", appInfo.packageName + "--" + appUseInfo2.getPackageName());
+                            if ((appInfo.packageName != null && appInfo.packageName.equals(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled() == 0) || (appInfo.mStargss != null && appInfo.mStargss.contains(appUseInfo2.getPackageName()) && appUseInfo2.getEnabled() == 0)) {
+                                new LockDialog(mContext, appInfo.appName).show();
+                                return;
+                            }
+                        }
+                    }
+                    if (listener != null) {
+                        listener.onSelectClick(baseViewHolder.getAdapterPosition());
+                    }
+                }
+            });
+        } catch (Exception unused) {
+        }
+    }
+
+    public void setGkApp(List<String> list) {
+        gkAppData = list;
+        notifyDataSetChanged();
+    }
+
+    public void setOnItemClickListener(RadiaoOnItemClickListener radiaoOnItemClickListener) {
+        listener = radiaoOnItemClickListener;
+    }
+}

app/src/main/res/drawable/edit_background.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff" />
+            <corners android:radius="4dp" />
+            <stroke
+                android:width="1dp"
+                android:color="#cbdaee" />
+
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/drawable/edit_text_background.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff" />
+            <corners android:radius="4dp" />
+            <stroke
+                android:width="1dp"
+                android:color="#cbdaee" />
+            <padding
+                android:bottom="2dp"
+                android:left="4dp"
+                android:right="4dp"
+                android:top="2dp" />
+        </shape>
+    </item>
+</layer-list>

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

@@ -0,0 +1,716 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".activity.activation.ActivationActivity">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.xwad.os.activity.activation.ActivationActivity.BtnClick" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/mine_wallpaper">
+
+        <ImageView
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:adjustViewBounds="true"
+            android:onClick="@{click::exit}"
+            android:scaleType="centerCrop"
+            android:src="@drawable/icon_activation_exit"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView7"
+            app:layout_constraintEnd_toStartOf="@+id/imageView7"
+            app:layout_constraintHorizontal_bias="0.07"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/imageView7"
+            app:layout_constraintVertical_bias="0.7" />
+
+        <ImageView
+            android:layout_width="248dp"
+            android:layout_height="304dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/icon_activation_robot_365"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.089"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.7" />
+
+        <ImageView
+            android:id="@+id/imageView7"
+            android:layout_width="148dp"
+            android:layout_height="18dp"
+            android:adjustViewBounds="true"
+            android:scaleType="centerCrop"
+            android:src="@drawable/icon_activation_title"
+            app:layout_constraintBottom_toTopOf="@+id/constraintLayout16"
+            app:layout_constraintEnd_toEndOf="@+id/constraintLayout16"
+            app:layout_constraintStart_toStartOf="@+id/constraintLayout16"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayout16"
+            android:layout_width="284dp"
+            android:layout_height="283dp"
+            android:background="@drawable/icon_activation_backgroud_card"
+            android:paddingStart="10dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="12dp"
+            android:paddingBottom="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.89"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.7">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                app:layout_constraintBottom_toTopOf="@+id/textView5"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_qrcode"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="visible"
+                    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:orientation="vertical">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="订购-学王365软终端许可证"
+                                android:textColor="@color/black"
+                                android:textSize="14sp"
+                                android:textStyle="bold"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:id="@+id/tv_price"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="￥980.00"
+                                android:textColor="#fe8300"
+                                android:textSize="14sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="请在15分钟内完成支付，超时二维码将失效"
+                                android:textColor="#9bb2cc"
+                                android:textSize="8sp"
+                                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="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:id="@+id/iv_qrcode"
+                                android:layout_width="64dp"
+                                android:layout_height="64dp"
+                                android:layout_gravity="center"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_qrcode_empty"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                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_gravity="center"
+                                    android:gravity="center"
+                                    android:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="支持"
+                                    android:textColor="@color/black"
+                                    android:textSize="11sp" />
+
+                                <ImageView
+                                    android:layout_width="16dp"
+                                    android:layout_height="16dp"
+                                    android:layout_gravity="center"
+                                    android:layout_marginStart="4dp"
+                                    android:adjustViewBounds="true"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_wechat_pay" />
+
+                                <ImageView
+                                    android:layout_width="16dp"
+                                    android:layout_height="16dp"
+                                    android:layout_gravity="center"
+                                    android:layout_marginStart="4dp"
+                                    android:layout_marginEnd="4dp"
+                                    android:adjustViewBounds="true"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_alipay" />
+
+                                <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:gravity="center"
+                                    android:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="扫码支付"
+                                    android:textColor="@color/black"
+                                    android:textSize="11sp" />
+                            </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="160dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                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:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="商品名称"
+                                    android:textColor="@color/activation_text_color"
+                                    android:textSize="9sp" />
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="end"
+                                    android:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="软件终端许可证-AI旗舰版"
+                                    android:textColor="#000000"
+                                    android:textSize="9sp" />
+
+                            </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <LinearLayout
+                                android:layout_width="160dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:orientation="horizontal"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                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:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="商品名称"
+                                    android:textColor="@color/activation_text_color"
+                                    android:textSize="9sp" />
+
+                                <TextView
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:gravity="end"
+                                    android:maxLines="1"
+                                    android:singleLine="true"
+                                    android:text="软件终端许可证-AI旗舰版"
+                                    android:textColor="#000000"
+                                    android:textSize="9sp" />
+
+                            </LinearLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:layout_width="247dp"
+                                android:layout_height="1dp"
+                                android:layout_gravity="center"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_activation_divider_line"
+                                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="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:layout_marginBottom="8dp">
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="180dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useCoupons}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_coupons"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useKey}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_key"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_coupons"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    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="32dp"
+                        android:orientation="vertical">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="输入优惠券码"
+                                android:textColor="@color/black"
+                                android:textSize="14sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <EditText
+                                android:id="@+id/et_coupons"
+                                android:layout_width="match_parent"
+                                android:layout_height="20dp"
+                                android:layout_marginStart="32dp"
+                                android:layout_marginEnd="32dp"
+                                android:background="@drawable/edit_text_background"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:textColor="@color/black"
+                                android:textSize="12sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_marginBottom="32dp"
+
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:layout_width="110dp"
+                                android:layout_height="25dp"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_activation_confirm"
+                                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="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:layout_width="247dp"
+                                android:layout_height="1dp"
+                                android:layout_gravity="center"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_activation_divider_line"
+                                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="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:layout_marginBottom="8dp">
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="180dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useQrCode}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_qrcode"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useKey}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_key"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_key"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    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:orientation="vertical">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="输入许可证密钥"
+                                android:textColor="@color/black"
+                                android:textSize="14sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="16dp"
+                                android:layout_marginEnd="16dp"
+                                android:gravity="center"
+                                android:text="@string/license_notice"
+                                android:textColor="#9bb2cc"
+                                android:textSize="7sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <EditText
+                                android:id="@+id/et_key"
+                                android:layout_width="match_parent"
+                                android:layout_height="20dp"
+                                android:layout_marginStart="32dp"
+                                android:layout_marginEnd="32dp"
+                                android:background="@drawable/edit_text_background"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:textColor="@color/black"
+                                android:textSize="12sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:gravity="center"
+                                android:maxLines="1"
+                                android:singleLine="true"
+                                android:text="注意：涂层刮开视为使用，无法退换货"
+                                android:textColor="@color/red"
+                                android:textSize="7sp"
+                                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="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                            <ImageView
+                                android:layout_width="110dp"
+                                android:layout_height="25dp"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_activation_confirm"
+                                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="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <ImageView
+                                android:layout_width="247dp"
+                                android:layout_height="1dp"
+                                android:layout_gravity="center"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_activation_divider_line"
+                                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="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="4dp"
+                            android:layout_marginBottom="8dp">
+
+                            <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="180dp"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useCoupons}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_coupons"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <ImageView
+                                    android:layout_width="63dp"
+                                    android:layout_height="14dp"
+                                    android:layout_gravity="center"
+                                    android:adjustViewBounds="true"
+                                    android:onClick="@{click::useQrCode}"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_activation_use_qrcode"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </LinearLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/privacy_statement"
+                android:textColor="@color/activation_text_color"
+                android:textSize="5sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>

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

@@ -15,7 +15,7 @@
         android:id="@+id/ll_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/img_home_bg_0"
+        android:background="@drawable/mine_wallpaper"
         android:orientation="vertical">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -27,31 +27,33 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <TextView
-                android:id="@+id/tv_time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:textColor="@color/white"
-                android:textSize="12sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="00:00" />
-
             <ImageView
                 android:id="@+id/iv_logo"
-                android:layout_width="93dp"
+                android:layout_width="112dp"
-                android:layout_height="20dp"
+                android:layout_height="24dp"
                 android:layout_marginStart="12dp"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
                 android:src="@drawable/xuewang_logo_ai"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/tv_time"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/tv_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="8dp"
+                android:textColor="@color/white"
+                android:textSize="11sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/linearLayout6"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="00:00" />
+
             <LinearLayout
+                android:id="@+id/linearLayout6"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="9dp"
@@ -64,9 +66,9 @@
                 <ImageView
                     android:id="@+id/bluetooth_iv"
                     android:layout_width="5dp"
-                    android:visibility="gone"
+                    android:layout_height="7dp"
                     android:src="@drawable/ic_bluetooth_open"
-                    android:layout_height="7dp" />
+                    android:visibility="gone" />
 
                 <ImageView
                     android:id="@+id/iv_wifi"
@@ -76,8 +78,8 @@
 
                 <com.xwad.os.view.jxw.view.JxwBatteryCircular
                     android:id="@+id/battery_view"
-                    android:layout_width="18dp"
+                    android:layout_width="24dp"
-                    android:layout_height="9dp"
+                    android:layout_height="12dp"
                     android:layout_marginStart="3dp" />
             </LinearLayout>
 
@@ -146,8 +148,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/home"
-            app:layout_constraintTop_toBottomOf="@+id/home"
+            app:layout_constraintTop_toBottomOf="@+id/home" />
-            tools:layout_editor_absoluteX="19dp" />
 
         <com.xwad.os.view.jxw.widget.NoScrollViewPager
             android:id="@+id/subject_viewPager"

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

@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".activity.login.LoginActivity">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.xwad.os.activity.login.LoginActivity.BtnClick" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/mine_wallpaper">
+
+        <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="174dp"
+                android:layout_height="27dp"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_xuewang365_logo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="345dp"
+                android:layout_height="206dp"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/icon_logon_background"
+                android:paddingStart="10dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="12dp"
+                android:paddingBottom="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView8">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="欢迎进入学王365软终端"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            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="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="200dp"
+                            android:layout_height="32dp"
+                            android:background="@drawable/edit_background"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent">
+
+                            <ImageView
+                                android:id="@+id/iv_phone"
+                                android:layout_width="20dp"
+                                android:layout_height="20dp"
+                                android:layout_marginStart="4dp"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_login_phone"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <View
+                                android:id="@+id/view1"
+                                android:layout_width="1dp"
+                                android:layout_height="20dp"
+                                android:layout_marginStart="4dp"
+                                android:background="#cbdaee"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/iv_phone"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <EditText
+                                android:layout_width="0dp"
+                                android:layout_height="match_parent"
+                                android:background="@null"
+                                android:textColor="@color/black"
+                                android:textColorHint="#cbdaee"
+                                android:hint="手机号"
+                                android:textSize="11sp"
+                                android:layout_marginStart="4dp"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toEndOf="@+id/view1"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:layout_width="200dp"
+                            android:layout_height="32dp"
+                            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="0dp"
+                                android:layout_height="match_parent"
+                                android:background="@drawable/edit_background"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toStartOf="@+id/imageView10"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent">
+
+                                <ImageView
+                                    android:id="@+id/iv_sms"
+                                    android:layout_width="20dp"
+                                    android:layout_height="20dp"
+                                    android:layout_marginStart="4dp"
+                                    android:adjustViewBounds="true"
+                                    android:scaleType="centerCrop"
+                                    android:src="@drawable/icon_login_sms"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <View
+                                    android:id="@+id/view2"
+                                    android:layout_width="1dp"
+                                    android:layout_height="20dp"
+                                    android:layout_marginStart="4dp"
+                                    android:background="#cbdaee"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintStart_toEndOf="@+id/iv_sms"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                                <EditText
+                                    android:layout_width="0dp"
+                                    android:layout_height="match_parent"
+                                    android:layout_marginStart="4dp"
+                                    android:background="@null"
+                                    android:hint="验证码"
+                                    android:textColor="@color/black"
+                                    android:textColorHint="#cbdaee"
+                                    android:textSize="11sp"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintStart_toEndOf="@+id/view2"
+                                    app:layout_constraintTop_toTopOf="parent" />
+
+                            </androidx.constraintlayout.widget.ConstraintLayout>
+
+                            <ImageView
+                                android:id="@+id/imageView10"
+                                android:layout_width="96dp"
+                                android:layout_height="29dp"
+                                android:adjustViewBounds="true"
+                                android:scaleType="centerCrop"
+                                android:src="@drawable/icon_login_sms_code"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="110dp"
+                            android:layout_height="25dp"
+                            android:adjustViewBounds="true"
+                            android:scaleType="centerCrop"
+                            android:onClick="@{click::loginPhone}"
+                            android:src="@drawable/icon_activation_confirm"
+                            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="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="4dp">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="*未注册手机号验证后将自动创建学王365账号"
+                            android:textColor="#9bb2cc"
+                            android:textSize="8sp"
+                            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>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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"
+    tools:context=".activity.login.result.LoginSuccessfulActivity">
+
+    <data>
+
+        <variable
+            name="click"
+            type="com.xwad.os.activity.login.result.LoginSuccessfulActivity.BtnClick" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/mine_wallpaper">
+
+        <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="174dp"
+                android:layout_height="27dp"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_xuewang365_logo"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="345dp"
+                android:layout_height="206dp"
+                android:layout_marginTop="32dp"
+                android:background="@drawable/icon_logon_background"
+                android:paddingStart="10dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="12dp"
+                android:paddingBottom="12dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageView8">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    android:orientation="vertical">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="欢迎进入学王365软终端"
+                            android:textColor="@color/black"
+                            android:textSize="14sp"
+                            android:textStyle="bold"
+                            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="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:text="本机已激活成功，系统终身免费，谢谢您的使用。"
+                            android:textColor="@color/black"
+                            android:textSize="12sp"
+                            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="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="110dp"
+                            android:layout_height="25dp"
+                            android:adjustViewBounds="true"
+                            android:scaleType="centerCrop"
+                            android:src="@drawable/icon_activation_confirm"
+                            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>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

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

@@ -12,48 +12,76 @@
     </data>
 
     <!--基数3.2，图片宽高直接除-->
+    <!--555*300-->
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <RelativeLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="wrap_content"
+            android:layout_width="555dp"
-            android:layout_height="wrap_content"
+            android:layout_height="300dp"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <RelativeLayout
+            <ImageView
+                android:id="@+id/imageView6"
+                android:layout_width="555dp"
+                android:layout_height="222dp"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/icon_mine_robot"
+                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="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="150dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/rl_grxx"
-                android:layout_width="272dp"
+                    android:layout_width="207dp"
-                android:layout_height="62dp"
+                    android:layout_height="70dp"
                     android:background="@drawable/bg_shape_212562_40"
-                android:onClick="onClick"
+                    android:onClick="@{click::toLigin}"
-                android:tag="@string/tag_args_xxgrzx">
+                    android:tag="@string/tag_args_xxgrzx"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
 
                     <com.xwad.os.view.jxw.util.CircleImageView
                         android:id="@+id/head_image"
-                    android:layout_width="34dp"
+                        android:layout_width="48dp"
-                    android:layout_height="34dp"
+                        android:layout_height="48dp"
-                    android:layout_margin="12dp"
+                        android:layout_marginStart="16dp"
-                    android:src="@drawable/icon_tx1" />
+                        android:src="@drawable/icon_tx1"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
 
                     <LinearLayout
                         android:id="@+id/ll_grxx"
-                    android:layout_width="wrap_content"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
+                        android:layout_marginStart="12dp"
+                        android:layout_marginEnd="12dp"
                         android:layout_toEndOf="@+id/head_image"
                         android:onClick="onClick"
                         android:orientation="vertical"
-                    android:tag="@string/tag_args_xxgrzx">
+                        android:tag="@string/tag_args_xxgrzx"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toStartOf="@+id/ll_dj"
+                        app:layout_constraintStart_toEndOf="@+id/head_image"
+                        app:layout_constraintTop_toTopOf="parent">
 
                         <LinearLayout
-                        android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="14dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
@@ -67,7 +95,7 @@
 
                             <TextView
                                 android:id="@+id/tv_name"
-                            android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:ellipsize="marquee"
                                 android:singleLine="true"
@@ -77,7 +105,7 @@
                         </LinearLayout>
 
                         <LinearLayout
-                        android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="14dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
@@ -91,7 +119,7 @@
 
                             <TextView
                                 android:id="@+id/tv_grade"
-                            android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="未注册"
                                 android:textColor="@color/white"
@@ -99,7 +127,7 @@
                         </LinearLayout>
 
                         <LinearLayout
-                        android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="14dp"
                             android:gravity="center_vertical"
                             android:orientation="horizontal">
@@ -113,7 +141,7 @@
 
                             <TextView
                                 android:id="@+id/tv_wlz"
-                            android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="0"
                                 android:textColor="@color/white"
@@ -125,10 +153,11 @@
                         android:id="@+id/ll_dj"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                    android:layout_marginStart="53dp"
+                        android:layout_marginEnd="12dp"
                         android:layout_toEndOf="@+id/ll_grxx"
                         android:gravity="center"
-                    android:orientation="vertical">
+                        android:orientation="vertical"
+                        app:layout_constraintEnd_toEndOf="parent">
 
                         <ImageView
                             android:id="@+id/iv_djjp"
@@ -165,203 +194,70 @@
                                 android:background="@drawable/icon_wd_wjx_pre" />
                         </LinearLayout>
                     </LinearLayout>
-            </RelativeLayout>
+                </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <LinearLayout
-                android:layout_width="272dp"
-                android:layout_height="226dp"
-                android:layout_below="@+id/rl_grxx"
-                android:layout_marginTop="12dp"
-                android:background="@drawable/bg_shape_212562_40"
-                android:orientation="vertical">
-
-                <LinearLayout
-                    android:id="@+id/tv_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:text="本周累计打卡"
-                        android:textColor="@color/white"
-                        android:textSize="12sp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom"
-                        android:layout_marginStart="5dp"
-                        android:text="不积小流，无以成江河"
-                        android:textColor="#b3b1ca"
-                        android:textSize="9sp" />
-                </LinearLayout>
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rl_dk"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="9dp"
-                    android:layout_marginEnd="12dp" />
-
-                <com.xwad.os.view.jxw.widget.TreeView
-                    android:id="@+id/tree"
-                    android:layout_width="178dp"
-                    android:layout_height="162dp"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginStart="19dp" />
-            </LinearLayout>
-
-            <com.xwad.os.view.jxw.widget.DailyTasksView
-                android:id="@+id/ll_mrrw"
-                android:layout_width="272dp"
-                android:layout_height="132dp"
-                android:layout_marginStart="12dp"
-                android:layout_toEndOf="@+id/rl_grxx"
-                android:orientation="vertical" />
-
-            <RelativeLayout
-                android:id="@+id/ll_ctb"
-                android:layout_width="162dp"
-                android:layout_height="156dp"
-                android:layout_below="@+id/ll_mrrw"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
-                android:layout_toEndOf="@+id/rl_grxx"
-                android:background="@drawable/bg_shape_zjxx"
-                android:orientation="vertical"
-                android:paddingStart="12dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="本周错题本"
-                    android:textColor="#ffffff"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="31dp"
-                    android:text="错题周周清，学习节节高"
-                    android:textColor="#60ffffff"
-                    android:textSize="9sp" />
-
-                <LinearLayout
-                    android:layout_width="67dp"
-                    android:layout_height="42dp"
-                    android:layout_marginTop="56dp"
-                    android:background="@drawable/bg_shape_d9d9d9_20"
-                    android:gravity="center"
-                    android:onClick="onClick"
-                    android:orientation="vertical"
-                    android:tag="@string/taf_args_zjx_ctb">
-
-                    <TextView
-                        android:id="@+id/tv_jzx_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="1dp"
-                        android:text="AI精准学"
-                        android:textColor="@color/white"
-                        android:textSize="8sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="67dp"
-                    android:layout_height="42dp"
-                    android:layout_marginStart="72dp"
-                    android:layout_marginTop="56dp"
-                    android:background="@drawable/bg_shape_d9d9d9_20"
-                    android:gravity="center"
-                    android:onClick="onClick"
-                    android:orientation="vertical"
-                    android:tag="@string/taf_args_souti_ctb">
-
-                    <TextView
-                        android:id="@+id/tv_zndy_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="1dp"
-                        android:text="智能答疑"
-                        android:textColor="@color/white"
-                        android:textSize="8sp" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="138dp"
-                    android:layout_height="42dp"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginTop="102dp"
-                    android:background="@drawable/bg_shape_d9d9d9_20"
-                    android:gravity="center"
-                    android:onClick="onClick"
-                    android:orientation="vertical"
-                    android:tag="@string/taf_args_tbfd_ctb">
-
-                    <TextView
-                        android:id="@+id/tv_ykyl_count"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="0"
-                        android:textColor="@color/white"
-                        android:textSize="12sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="1dp"
-                        android:text="一课一练"
-                        android:textColor="@color/white"
-                        android:textSize="8sp" />
-                </LinearLayout>
-            </RelativeLayout>
 
                 <ImageView
-                android:id="@+id/iv_scb"
+                    android:id="@+id/iv_xwcd"
-                android:layout_width="97dp"
+                    android:layout_width="104dp"
-                android:layout_height="72dp"
+                    android:layout_height="70dp"
-                android:layout_below="@+id/ll_mrrw"
                     android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
+                    android:adjustViewBounds="true"
-                android:layout_toEndOf="@+id/ll_ctb"
-                android:background="@drawable/icon_wd_scb"
                     android:onClick="onClick"
-                android:tag="@string/tag_args_new_scb" />
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_xwcd"
+                    android:tag="@string/tag_args_new_xwcd_online"
+                    app:layout_constraintStart_toEndOf="@+id/rl_grxx"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                android:layout_width="97dp"
+                    android:id="@+id/iv_sjzx"
-                android:layout_height="72dp"
+                    android:layout_width="104dp"
-                android:layout_below="@+id/iv_scb"
+                    android:layout_height="70dp"
                     android:layout_marginStart="12dp"
-                android:layout_marginTop="12dp"
+                    android:adjustViewBounds="true"
-                android:layout_toEndOf="@+id/ll_ctb"
-                android:background="@drawable/icon_wd_xwcd"
                     android:onClick="onClick"
-                android:tag="@string/tag_args_new_xwcd_online" />
+                    android:scaleType="centerCrop"
-        </RelativeLayout>
+                    android:src="@drawable/icon_sjzx"
+                    android:tag="@string/tag_args_new_hemo"
+                    app:layout_constraintStart_toEndOf="@+id/iv_xwcd"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <ImageView
+                    android:id="@+id/iv_szzs"
+                    android:layout_width="104dp"
+                    android:layout_height="70dp"
+                    android:layout_marginStart="12dp"
+                    android:adjustViewBounds="true"
+                    android:onClick="onClick"
+                    android:scaleType="centerCrop"
+                    android:src="@drawable/icon_szzs"
+                    android:tag="@string/tag_args_new_hemo"
+                    app:layout_constraintStart_toEndOf="@+id/iv_sjzx"
+                    app:layout_constraintTop_toTopOf="parent" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/rela_root"
+                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/constraintLayout6">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/gridView_id"
+                    style="@style/vertical_style"
+                    android:layout_width="match_parent"
+                    android:layout_height="66dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>

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

@@ -65,5 +65,6 @@
 
     <color name="indicator_normal_color">#70B1B1B1</color>
     <color name="indicator_selected_color">#ffffff</color>
+    <color name="activation_text_color">#656565</color>
 
 </resources>

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

@@ -48,7 +48,9 @@
     <dimen name="abc_edit_text_inset_horizontal_material">4dp</dimen>
     <dimen name="abc_edit_text_inset_top_material">10dp</dimen>
     <dimen name="abc_floating_window_z">16dp</dimen>
-    <dimen name="abc_list_item_padding_horizontal_material">@dimen/abc_action_bar_content_inset_material</dimen>
+    <dimen name="abc_list_item_padding_horizontal_material">
+        @dimen/abc_action_bar_content_inset_material
+    </dimen>
     <dimen name="abc_panel_menu_list_width">296dp</dimen>
     <dimen name="abc_progress_bar_height_material">4dp</dimen>
     <dimen name="abc_search_view_preferred_height">48dp</dimen>
@@ -167,6 +169,7 @@
     <dimen name="tooltip_y_offset_touch">16dp</dimen>
     <dimen name="video_progress_dialog_margin_top">80dp</dimen>
     <dimen name="video_volume_dialog_margin_left">24dp</dimen>
+
     <dimen name="x1">1px</dimen>
     <dimen name="x10">10px</dimen>
     <dimen name="x100">100px</dimen>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">学王365</string>
+    <string name="app_name">学王365旗舰</string>
     <string name="privacy_agreement"><u>隐私协议</u></string>
     <string name="privacy_agreement_title">服务协议和隐私政策</string>
     <string name="privacy_agreement_content">\t\t\t\t请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了向你提供即时通讯，内容分享等服务，
@@ -17,5 +17,8 @@
     <string name="today_study_time">学习时长%s</string>
     <string name="unknown">未设置</string>
     <string name="desktop_permission">桌面运行需授予权限，点击设置</string>
+    <string name="privacy_statement">本服务需获取网络、账号、设备、应用、交易信息以及您主动上传的数据，用于提供应用内支付服务。同时为了提升您的使用体验，基于您的“同意"为您启个性化服务。\n使用本服务，即表示您已满 14 周岁，并同意上述内容及学王365软终端内支付用户协议，关于学王365软终端内支付与隐私的声明。
+</string>
+    <string name="license_notice">如果您已经订购实体包装版，您可以在包装盒内找到“许可证”贴纸，\n请刮开涂层，将密钥输入在下面的对话框内</string>
 
 </resources>