diff --git a/app/build.gradle b/app/build.gradle
index 515805f..da1a1cc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 23
         targetSdkVersion 29
 
-        versionCode 39
-        versionName "1.3.8"
+        versionCode 41
+        versionName "1.4.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/java/com/xwad/os/activity/activation/ActivationViewModel.java b/app/src/main/java/com/xwad/os/activity/activation/ActivationViewModel.java
index ac76cfb..ffd3ac0 100644
--- a/app/src/main/java/com/xwad/os/activity/activation/ActivationViewModel.java
+++ b/app/src/main/java/com/xwad/os/activity/activation/ActivationViewModel.java
@@ -152,7 +152,7 @@ public class ActivationViewModel extends BaseViewModel<ActivityActivationBinding
     public MutableLiveData<Boolean> mCodeActivationData = new MutableLiveData<>();
 
     public void codeActivation(String code) {
-        NetInterfaceManager.getInstance().getCodeActivationControl(code)
+        NetInterfaceManager.getInstance().getActivationExchangeControl(code)
                 .compose(RxLifecycle.bindUntilEvent(getLifecycle(), ActivityEvent.DESTROY))
                 .subscribe(new Observer<BaseResponse<CodeBean>>() {
                     @Override
diff --git a/app/src/main/java/com/xwad/os/fragment/chinese/ChineseFragment.java b/app/src/main/java/com/xwad/os/fragment/chinese/ChineseFragment.java
index 04f2657..9f140bb 100644
--- a/app/src/main/java/com/xwad/os/fragment/chinese/ChineseFragment.java
+++ b/app/src/main/java/com/xwad/os/fragment/chinese/ChineseFragment.java
@@ -175,7 +175,6 @@ public class ChineseFragment extends BaseMvvmFragment<ChineseViewModel, Fragment
                 mViewDataBinding.ivTabJdbk.setVisibility(View.VISIBLE);
             }
         });
-
     }
 
     @Override
@@ -187,7 +186,6 @@ public class ChineseFragment extends BaseMvvmFragment<ChineseViewModel, Fragment
         mViewDataBinding.rvApps.setAdapter(contentAdapter);
         getMyList();
         contentAdapter.setNewData(appList);
-
     }
 
     @Override
@@ -220,6 +218,7 @@ public class ChineseFragment extends BaseMvvmFragment<ChineseViewModel, Fragment
     @Override
     public void onResume() {
         super.onResume();
+        Log.e(TAG, "onResume: ");
         load();
     }
 
@@ -231,10 +230,17 @@ public class ChineseFragment extends BaseMvvmFragment<ChineseViewModel, Fragment
     private void setTag(View view) {
         String str;
         String checkGrade = Util.checkGrade(SPUtils.getGrade());
-        if ("小学".equals(checkGrade)) {
-            str = "tag_args_new_ztsp_xxyw";
-        } else {
-            str = checkGrade.equals("初中") ? "tag_args_new_ztsp_czyw" : "tag_args_new_ztsp_gzyw";
+        switch (checkGrade) {
+            case "小学":
+                str = "tag_args_new_ztsp_xxyw";
+                break;
+            default:
+            case "初中":
+                str = "tag_args_new_ztsp_czyw";
+                break;
+            case "高中":
+                str = "tag_args_new_ztsp_gzyw";
+                break;
         }
         if (getActivity() != null) {
             view.setTag(getResources().getString(getResources().getIdentifier(str, "string", getActivity().getPackageName())));
@@ -254,6 +260,8 @@ public class ChineseFragment extends BaseMvvmFragment<ChineseViewModel, Fragment
     }
 
     private void load() {
+        setTag(mViewDataBinding.ivZxts);
+
         TbddBookBean tbddData = TbddProviderUtil.getTbddData("语文", "", "");
         try {
             if (tbddData != null) {
diff --git a/app/src/main/java/com/xwad/os/fragment/english/EnglishFragment.java b/app/src/main/java/com/xwad/os/fragment/english/EnglishFragment.java
index ac190f3..4712255 100644
--- a/app/src/main/java/com/xwad/os/fragment/english/EnglishFragment.java
+++ b/app/src/main/java/com/xwad/os/fragment/english/EnglishFragment.java
@@ -159,7 +159,6 @@ public class EnglishFragment extends BaseMvvmFragment<EnglishViewModel, Fragment
                 mViewDataBinding.ivTabJdbk.setVisibility(View.VISIBLE);
             }
         });
-
     }
 
     @Override
@@ -171,7 +170,6 @@ public class EnglishFragment extends BaseMvvmFragment<EnglishViewModel, Fragment
         mViewDataBinding.rvApps.setAdapter(contentAdapter);
         getMyList();
         contentAdapter.setNewData(appList);
-
     }
 
     @Override
@@ -184,6 +182,7 @@ public class EnglishFragment extends BaseMvvmFragment<EnglishViewModel, Fragment
     @Override
     public void onResume() {
         super.onResume();
+        Log.e(TAG, "onResume: ");
         load();
     }
 
@@ -195,10 +194,17 @@ public class EnglishFragment extends BaseMvvmFragment<EnglishViewModel, Fragment
     private void setTag(View view) {
         String str;
         String checkGrade = Util.checkGrade(SPUtils.getGrade());
-        if ("小学".equals(checkGrade)) {
-            str = "tag_args_new_ztsp_xxyy";
-        } else {
-            str = checkGrade.equals("初中") ? "tag_args_new_ztsp_czyy" : "tag_args_new_ztsp_gzyy";
+        switch (checkGrade) {
+            case "小学":
+                str = "tag_args_new_ztsp_xxyy";
+                break;
+            default:
+            case "初中":
+                str = "tag_args_new_ztsp_czyy";
+                break;
+            case "高中":
+                str = "tag_args_new_ztsp_gzyy";
+                break;
         }
         if (getActivity() != null) {
             view.setTag(getResources().getString(getResources().getIdentifier(str, "string", getActivity().getPackageName())));
@@ -218,6 +224,8 @@ public class EnglishFragment extends BaseMvvmFragment<EnglishViewModel, Fragment
     }
 
     private void load() {
+        setTag(mViewDataBinding.ivZxts);
+
         TbddBookBean tbddData = TbddProviderUtil.getTbddData("英语", "", "");
         if (tbddData != null) {
             mViewDataBinding.ivZb.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/xwad/os/fragment/math/MathFragment.java b/app/src/main/java/com/xwad/os/fragment/math/MathFragment.java
index 1b209aa..17ddbb5 100644
--- a/app/src/main/java/com/xwad/os/fragment/math/MathFragment.java
+++ b/app/src/main/java/com/xwad/os/fragment/math/MathFragment.java
@@ -110,7 +110,6 @@ public class MathFragment extends BaseMvvmFragment<MathViewModel, FragmentMathBi
         Log.e(TAG, "onCreate: ");
     }
 
-
     @Override
     protected int getLayoutId() {
         return R.layout.fragment_math;
@@ -157,7 +156,6 @@ public class MathFragment extends BaseMvvmFragment<MathViewModel, FragmentMathBi
                 mViewDataBinding.ivTabJdbk.setVisibility(View.VISIBLE);
             }
         });
-
     }
 
     @Override
@@ -169,12 +167,19 @@ public class MathFragment extends BaseMvvmFragment<MathViewModel, FragmentMathBi
         mViewDataBinding.rvApps.setAdapter(contentAdapter);
         getMyList();
         contentAdapter.setNewData(appList);
-
     }
 
     @Override
     public void fetchData() {
         Log.e(TAG, "fetchData: ");
+        setTag(mViewDataBinding.ivZxts);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Log.e(TAG, "onResume: ");
+        setTag(mViewDataBinding.ivZxts);
     }
 
     @Override
@@ -185,10 +190,17 @@ public class MathFragment extends BaseMvvmFragment<MathViewModel, FragmentMathBi
     private void setTag(View view) {
         String str;
         String checkGrade = Util.checkGrade(SPUtils.getGrade());
-        if ("小学".equals(checkGrade)) {
-            str = "tag_args_new_ztsp_xxsx";
-        } else {
-            str = checkGrade.equals("初中") ? "tag_args_new_ztsp_czsx" : "tag_args_new_ztsp_gzsx";
+        switch (checkGrade) {
+            case "小学":
+                str = "tag_args_new_ztsp_xxsx";
+                break;
+            default:
+            case "初中":
+                str = "tag_args_new_ztsp_czsx";
+                break;
+            case "高中":
+                str = "tag_args_new_ztsp_gzsx";
+                break;
         }
         if (getActivity() != null) {
             view.setTag(getResources().getString(getResources().getIdentifier(str, "string", getActivity().getPackageName())));
@@ -281,7 +293,6 @@ public class MathFragment extends BaseMvvmFragment<MathViewModel, FragmentMathBi
         }
     }
 
-
     public class BtnClick {
         public void openAppsDialog(View view) {
             AppsDialog appsDialog = new AppsDialog(getActivity(), type);
diff --git a/app/src/main/java/com/xwad/os/fragment/usercenter/account/AccountFragment.java b/app/src/main/java/com/xwad/os/fragment/usercenter/account/AccountFragment.java
index ae2609f..743be9d 100644
--- a/app/src/main/java/com/xwad/os/fragment/usercenter/account/AccountFragment.java
+++ b/app/src/main/java/com/xwad/os/fragment/usercenter/account/AccountFragment.java
@@ -32,9 +32,8 @@ import com.xwad.os.fragment.dialog.viplist.VipListDialogFragment;
 import com.xwad.os.utils.ActivationUtil;
 import com.xwad.os.utils.OpenApkUtils;
 
-
 public class AccountFragment extends BaseMvvmFragment<AccountViewModel, FragmentAccountBinding> {
-    private static final String TAG = "ParentsFragment";
+    private static final String TAG = "AccountFragment";
 
     private MMKV mMMKV = MMKV.mmkvWithID(CommonConfig.MMKV_ID, MMKV.MULTI_PROCESS_MODE);
 
diff --git a/app/src/main/java/com/xwad/os/fragment/usercenter/parents/ParentsFragment.java b/app/src/main/java/com/xwad/os/fragment/usercenter/parents/ParentsFragment.java
index ced01c1..c810eaf 100644
--- a/app/src/main/java/com/xwad/os/fragment/usercenter/parents/ParentsFragment.java
+++ b/app/src/main/java/com/xwad/os/fragment/usercenter/parents/ParentsFragment.java
@@ -11,7 +11,6 @@ import com.xwad.os.utils.OpenApkUtils;
 
 public class ParentsFragment extends BaseMvvmFragment<ParentsViewModel, FragmentParentsBinding> {
 
-
     private Context mContext;
 
     public static ParentsFragment newInstance() {
diff --git a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java
index 92aa922..0fc785f 100644
--- a/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/xwad/os/network/NetInterfaceManager.java
@@ -543,6 +543,7 @@ public class NetInterfaceManager {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
+    @Deprecated
     public Observable<BaseResponse<CodeBean>> getCodeActivationControl(String code) {
         return mRetrofit.create(UserApi.class)
                 .codeActivation(getToken(), AdminManager.getInstance().getSerial(), code)
@@ -550,6 +551,13 @@ public class NetInterfaceManager {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
+    public Observable<BaseResponse<CodeBean>> getActivationExchangeControl(String exchangeCode) {
+        return mRetrofit.create(UserApi.class)
+                .activationExchange(getToken(), AdminManager.getInstance().getSerial(), exchangeCode)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
     @Deprecated
     public Observable<BaseResponse<CodeBean>> getActivationCodeControl() {
         return mRetrofit.create(UserApi.class)
diff --git a/app/src/main/java/com/xwad/os/network/UrlAddress.java b/app/src/main/java/com/xwad/os/network/UrlAddress.java
index d458584..3a55cbe 100644
--- a/app/src/main/java/com/xwad/os/network/UrlAddress.java
+++ b/app/src/main/java/com/xwad/os/network/UrlAddress.java
@@ -30,12 +30,15 @@ public class UrlAddress {
     public static final String DISCOUNT_CODE_QUERY = "user/discount-code-query";
 
     /*激活码激活*/
-    public static final String activation_code = "activation/code";
+    @Deprecated
+    public static final String ACTIVATION_CODE = "activation/code";
     /*获取激活码(激活成功后才有)*/
     @Deprecated
     public static final String GET_ACTIVATION_CODE_DEPRECATED = "activation/get-code";
     /*获取加密激活码*/
     public static final String GET_ACTIVATION_CODE = "activation/get-activation-code";
+    /*输入兑换码激活*/
+    public static final String ACTIVATION_EXCHANGE = "activation/exchange";
 
     /*发起支付*/
     public static final String PAY_QRCODE = "pay/qrcode";
diff --git a/app/src/main/java/com/xwad/os/network/api/UserApi.java b/app/src/main/java/com/xwad/os/network/api/UserApi.java
index 2d0ce57..60e76e5 100644
--- a/app/src/main/java/com/xwad/os/network/api/UserApi.java
+++ b/app/src/main/java/com/xwad/os/network/api/UserApi.java
@@ -60,13 +60,21 @@ public interface UserApi {
     );
 
     @FormUrlEncoded
-    @POST(UrlAddress.activation_code)
+    @POST(UrlAddress.ACTIVATION_CODE)
     Observable<BaseResponse<CodeBean>> codeActivation(
             @Header("token") String token,
             @Field("sn") String sn,
             @Field("code") String code
     );
 
+    @FormUrlEncoded
+    @POST(UrlAddress.ACTIVATION_EXCHANGE)
+    Observable<BaseResponse<CodeBean>> activationExchange(
+            @Header("token") String token,
+            @Field("sn") String sn,
+            @Field("exchange_code") String exchangeCode
+    );
+
     @Deprecated
     @GET(UrlAddress.GET_ACTIVATION_CODE_DEPRECATED)
     Observable<BaseResponse<CodeBean>> getActivationCode(
diff --git a/app/src/main/res/drawable-hdpi/wechat_service.png b/app/src/main/res/drawable-hdpi/wechat_service.png
index 25c52f4..98f4c76 100644
Binary files a/app/src/main/res/drawable-hdpi/wechat_service.png and b/app/src/main/res/drawable-hdpi/wechat_service.png differ
diff --git a/build.gradle b/build.gradle
index 6f98d77..1e825bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     repositories {
         google()
 //        mavenCentral()
-        maven { url "https://jitpack.io" }
+        maven { url 'https://jitpack.io' }
         maven { url 'https://developer.huawei.com/repo/' }
         maven { url 'https://maven.aliyun.com/repository/central' }
-        maven { url "https://maven.aliyun.com/repository/jcenter" }
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
     }
@@ -29,10 +29,10 @@ allprojects {
     repositories {
         google()
 //        mavenCentral()
-        maven { url "https://jitpack.io" }
+        maven { url 'https://jitpack.io' }
         maven { url 'https://developer.huawei.com/repo/' }
         maven { url 'https://maven.aliyun.com/repository/central' }
-        maven { url "https://maven.aliyun.com/repository/jcenter" }
+        maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/google' }
     }