From eeaf2a8c0896ce4a9b2ca6b48f902c0b04aaa47f Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Sun, 12 Mar 2023 19:18:15 +0800
Subject: [PATCH] =?UTF-8?q?version:1.0=20fix:=E4=BF=AE=E5=A4=8Dbug=20updat?=
 =?UTF-8?q?e:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  84 ++++++++++++++--
 app/keystore/zhanxun.keystore                 | Bin 0 -> 2617 bytes
 .../zyappstore/activity/MainActivity.java     |  93 +++++++++---------
 .../zyappstore/activity/MoreAppActivity.java  |   2 +-
 .../uiui/zyappstore/adapter/AppAdapter.java   |   9 ++
 .../zyappstore/fragment/FeaturedFragment.java |  20 ++--
 .../network/NetInterfaceManager.java          |   4 +-
 .../com/uiui/zyappstore/utils/ApkUtils.java   |  79 ++++++++++++---
 .../com/uiui/zyappstore/utils/JGYUtils.java   |  19 ++--
 app/src/main/res/drawable-xhdpi/icon_0.png    | Bin 2785 -> 3443 bytes
 app/src/main/res/drawable-xhdpi/icon_1.png    | Bin 3443 -> 2704 bytes
 app/src/main/res/drawable-xhdpi/icon_2.png    | Bin 3585 -> 3952 bytes
 app/src/main/res/drawable-xhdpi/icon_3.png    | Bin 2481 -> 2868 bytes
 app/src/main/res/drawable-xhdpi/icon_4.png    | Bin 3442 -> 3401 bytes
 app/src/main/res/drawable-xhdpi/icon_5.png    | Bin 2707 -> 4607 bytes
 .../res/drawable-xhdpi/icon_download_task.png | Bin 940 -> 2544 bytes
 .../layout-land/activity_local_manager.xml    |   5 +-
 .../main/res/layout-land/activity_main.xml    |  36 +++++--
 .../res/layout-land/fragment_featured.xml     |   2 +-
 .../main/res/layout-port/activity_main.xml    |  36 +++++--
 .../res/layout-port/fragment_featured.xml     |   2 +-
 app/src/main/res/values/colors.xml            |   4 +-
 app/src/main/res/values/strings.xml           |  12 +--
 23 files changed, 292 insertions(+), 115 deletions(-)
 create mode 100644 app/keystore/zhanxun.keystore

diff --git a/app/build.gradle b/app/build.gradle
index e43bb9c..f0bb2f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,9 @@ android {
         applicationId "com.uiui.zyappstore"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.1"
+
+        versionCode 1
+        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -45,23 +46,90 @@ android {
 
     //签名
     signingConfigs {
-        mtk12 {
+        MTK {
             storeFile file("keystore/TeclastMTK12.jks")
             storePassword "123456"
             keyAlias "TeclastMTK12"
             keyPassword "123456"
             v2SigningEnabled false
         }
+
+        cube8183 {
+            storeFile file("keystore/TeclastMTK12.jks")
+            storePassword "123456"
+            keyAlias "TeclastMTK12"
+            keyPassword "123456"
+            v2SigningEnabled false
+        }
+
+        teclast8183 {
+            storeFile file("keystore/TeclastMTK12.jks")
+            storePassword "123456"
+            keyAlias "TeclastMTK12"
+            keyPassword "123456"
+            v2SigningEnabled false
+        }
+
+        zhanRui {
+            storeFile file("keystore/zhanxun.keystore")
+            storePassword "123456"
+            keyAlias "zhanxun"
+            keyPassword "123456"
+            v1SigningEnabled true
+            v2SigningEnabled false
+        }
     }
 
     buildTypes {
+        Cube8183Debug.initWith(debug)
+        Cube8183Debug {
+            debuggable true
+            versionNameSuffix "-debug"
+            buildConfigField "String", "platform", '"cube8183"'
+            signingConfig signingConfigs.cube8183
+        }
+
+        Cube8183Release.initWith(release)
+        Cube8183Release {
+            buildConfigField "String", "platform", '"cube8183"'
+            signingConfig signingConfigs.cube8183
+        }
+
+        Teclast8183Debug.initWith(debug)
+        Teclast8183Debug {
+            debuggable true
+            versionNameSuffix "-debug"
+            buildConfigField "String", "platform", '"teclast8183"'
+            signingConfig signingConfigs.teclast8183
+        }
+
+        Teclast8183Release.initWith(release)
+        Teclast8183Release {
+            buildConfigField "String", "platform", '"teclast8183"'
+            signingConfig signingConfigs.teclast8183
+        }
+
+        zhanRuiDebug.initWith(debug)
+        zhanRuiDebug {
+            debuggable true
+            versionNameSuffix "-debug"
+            buildConfigField "String", "platform", '"展锐"'
+            signingConfig signingConfigs.zhanRui
+        }
+
+        zhanRuiRelease.initWith(release)
+        zhanRuiRelease {
+            buildConfigField "String", "platform", '"展锐"'
+            signingConfig signingConfigs.zhanRui
+        }
+
         debug {
-            buildConfigField "String", "platform", '"TeclastMTK12"'
+            buildConfigField "String", "platform", '"MTK"'
             versionNameSuffix "-debug"
             minifyEnabled false
             //Zipalign优化
             zipAlignEnabled true
-            signingConfig signingConfigs.mtk12
+            signingConfig signingConfigs.MTK
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     if (outputFile != null) {
@@ -72,7 +140,7 @@ android {
             }
         }
         release {
-            buildConfigField "String", "platform", '"TeclastMTK12"'
+            buildConfigField "String", "platform", '"MTK"'
             //混淆
             minifyEnabled false
             //Zipalign优化
@@ -80,7 +148,7 @@ android {
             //前一部分代表系统默认的android程序的混淆文件，该文件已经包含了基本的混淆声明，后一个文件是自己的定义混淆文件
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             //签名
-            signingConfig signingConfigs.mtk12
+            signingConfig signingConfigs.MTK
 //            将release版本的包名重命名，加上版本及日期
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
@@ -128,7 +196,7 @@ dependencies {
     //动态权限框架
     implementation 'com.hjq:xxpermissions:6.0'
     //okhttp
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.2'
     //Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
diff --git a/app/keystore/zhanxun.keystore b/app/keystore/zhanxun.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..7c46fbc6f1cfbc0ac9370820ac7ba95fc2e165a9
GIT binary patch
literal 2617
zcmY+EWmFUl7KUeF7;@+m9EO%=f=&fR1w={#0m)$)hn5bJAq1prLAp!25tVL`29**-
zq$P)D**&}8cfKF@+;g7yz4zw>$5TiW0g2&w@@+7=P{@N20t843%)*l|fbitsukkb-
zPlEeLL}CKMlNerO{p-;NQ~vLYiULTKg$JF%@gM?R5KQrZeEpmq#K@8_L~u{ew2*^E
zaEyC+r|7VBY!eX!I<!G}P%q(PbEEUdcF-#(7=7{<13g>ladcwY0w|wjq*YIsPi@Qv
z^3)_`OTk6E|9-DBF$M^0^t9K~awC@d_=?9U0j<Gy@*DnQ)74~LVS+2FZeX;1G~~8B
zcOfGxZsV3>K@0sP=cvIB$Zxx5+-tjbgo@_(Dt2W*TIOF`(i~J6E0r8(nAKZgR5@f;
zB6nE9n|jRl<Q&F(dp|Z`WLoZ0B;`UQMO^CF8J$Q-Zy<=OhNeroEqu&zacq^ficJME
z?`5rE+<Vwc`l8fAG`n|pdYkTK5doITanu>*=XFzDiEi5ihiwWet)&=_(+bVRO+so5
z*~M6g1=Fc-lwrB;*BUhWgT-SI#p^z`mfCkH|K#UR%>3c+|CX-fKHt@jRK69&#IM`G
z|MWDn6_uXsR@5F&I<%*qW4h^7PHgzo;@RC~U!dkp&Mn}c0J4N;IH?=|1~#ehphq?3
zBl5;H8rpoAu>Ly2t2SPC%*Ec30+D~QPoJ01wtP4h@8N4G9EW<Sj#jm~q>v5h3w1bc
zaKdwV-oqh8@@&I-m4Dpl80LmVEw<LgnC0A^(<21oHVxe+n{WMEY{roB;}<lFQ%fFt
zkgXwUZcvCW_FVaF+NCOJ9x6IUZ7Ez@nM%6bcjm>L|8ORGX#z_c*YS;>`)2iq$er+^
zUi-8X>;JF1^9fVVv3c<gDwSk$EXN|r1=47b0sSTHSrd%8XS4xvOit6sR{_-jc3<W}
zc+_c{#HC*zKhePpo)Quh^0syHy$tkTLasnjJA)l*nqt<e@R=Bv%r9FpzYJ^}J(Tg~
zEF(v`#Y3t?;+tR19?T&aYI+aDmX!-=wCi$gGtTlV!TH=mX5tgkX4(;{HR?#20-t4u
z@}dyoph30iKtBDiHuZg3{=GeqEQjeI1LThV=9ibRz<as)v-g8e_=qdxy-2R0<>HA$
zW6FyxC$B#3?d)dgY6d%oo%m>dW&6poeBP_%iKN(8IodP7QhKnmi|^v;OM}2u?&pgd
zOu2%0dD3*{hX2%*e<0rp`_%B~o$H|LH-}`_Vf`7&EpOSNmutsEF1-ldZqj=l;e9Xn
z^@G)DoU)K;ReLIxM0@3S+@wn7kHxvC<~xr&C3lFJ-W#vw`nJY>l<nq39ZlO%kJ4Jp
z@Bb=nkqC@U;BPDe2}LE+N#eHobUuZKu|~2`E_?KIewS5JZZ6*#0Q^zdeMh-=+S}~D
zuo`1*M?G0_;E~1=N?>o9h$Q2c1r!f4GYh?8=f_2pFGnU+bnO!|z~0&>ZAog5gDlT2
z*SqA-8%sj8@A8g_=`qcbinm`n<CgfB1W=Ze2Z{6<_hRI^Xf4ts(+-Z9rKYr~#oZJ2
zo{Ze_{GRG2^{c{p0HzrKlN6;OBmDHJ$wRMhlH1$hmO(&Kolbbcn2TWrlP+a_TwH7D
zXHzg*@7K+#Ol*s$;Ai^+5DJsk02R9YcEU-uu(R~^2bIr@l_6C%0sk|3;7>aik1q@K
z^+YH25y-BUB}vq=n#2{U_3b+jEm!&3>&~=|mBNra^BL=}?Cx6@&dWl(1D<!X@7!+d
zPFR#l)_Pd=8QANgT&jh3o;>|fI_Qi!%rdo%STeI`Xff34p=d7AY;PW=XEdHfsKB9r
zsgj%#LCZl6@CMidEC3DwPk<Z10nYVz%!FVB(d%RF(VPe=BmyoCM@S%~P{?b2TK`od
z1z#KW$u-g;0s^j=`rirgAC3k8$FZZXj<u4z0%#3d^O5Rwj3?zvHt&BO`x+0TJz#-$
zMNbi|aGB~lQC!ts#d%d3rKoyVWh{f`qX9t%C8oiUp|^a~*fd_H^6})HuhO=`v4Vny
zaYmL1QKSL)43A&~7#)Q$pkqZ_H#RXJ)xRYX$HtG8L0dP}&sL9SI^o67r919V`m<d=
zR&W*>OwG7?DuVyHThh7{rW?*G`Zktl#o7YG@!eNIH_DdIBrdzGJe{Cu<|lk^DSL%v
zc~+pPUO?Hjy<n(0AqTK?fAXm0A_bG9zSxILA2}zg8szT?YR5TH$vsFL{M`@rxY>((
zc9Pw(63rclW`t`Ohokz8@}c!9RpO4wHrz?K*9f$?k_DD-o0Kny&oLk&vlCCnCeI$n
zxoM^{=QY`rLm{(<zl-V-WKHRJ^te{=f~!AbU_EN2Nq5s8{W4R8j^+odC*qCxeB9od
zmx(n^dLtd)`_28)IS6R1oNw+Ws`legy&yJ)2j&ngmX(@*?owfSF?|8pcs6`0U3#g+
z@1K=(9bBIt{?<jzO3G($?AX*TL_j>~1(+pTmuVSVKQ9GS$6CJt9^9*B7zy1H<uG~>
zL+)MrL0VaLEO!ezCdnL}_tB^Un0%fj9VLE-mS;<9CS}aj$}DE6j7y$=0^8|-PX~Zg
z9kJ#3BS>t6f~$wp`d(e4RrGmm4`NSmV$U{4SRcjH>CzizMxM%emI@3NYX-fhl<MSR
z77tP)GbNc-%Zy}}rpL6K-zgk|S%+Yn=BBd3AvU7V0IhE_6@41Je8r#-Y`W^0FF%yf
zVsY8yg9d~);Wc5`gQfPY*B^&>Z1ZosB|U8Ea{g*qWOq4mrx9yDxIx`!I~xOVe3LHm
z3AM?89%Da4Ty5hr@wI8lRW-bR-Nj#U;XFG^fU=rT-CRAjw#@(2w8w60=m3v{V3`B|
z$K~qHiY5{XOn7xs?Yt<L|NEcsdqO50b)Jh&Emq&IDVE-u)gOD=<kz<BoXTu}1nCZJ
z?j|O<@KmYOokH$jQObizwK4{9sDM)l&CH3Csbg^<bG?XyRkE<CmRFdqQx0YC4Lp3O
z44A@m=w}^3<z1weA~4L3dY$lyqE)?sZF9KC^^2Ul=WERuuyq<;%k8=2GLFgJjsoHV
zAk|CYQA@P;7Av1Ai&Nd=7vdMICK`NLQ>MIx%gX6mnlOhRqMeSOxdg6oKRlOtuXtbO
zcTFb~&dgy#$AYTBk5_yE+RU(}*BAzuXQD9O+3oFmd?KdD+j&~rOzZP>ZQGXB4YOUW
zSgPxxn#bHp9l^?KMS{J!qwc9s#j7sX!e-BgnR0<3n}yDr1LQ(L+cqC1fFQ-4*yK_@
zS%#F@8v8spI9P4ssyZC}4h!XUt#ahi$p?=Zt?CLuoWEF+u75lb7ntOh?SBqef^)&i
z!6d@e#6)Z)01zV?F4h*(A#~yTDOmv)G3Pp{#6}BZ)XjV{?6>>aOv!OTqJBJnOQV&3
KiHH~&lJ##+rq5Ua

literal 0
HcmV?d00001

diff --git a/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
index cadedd0..44f2dbd 100644
--- a/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/MainActivity.java
@@ -39,6 +39,8 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observer;
@@ -49,11 +51,17 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 public class MainActivity extends BaseActivity {
     private static final String TAG = MainActivity.class.getSimpleName();
 
-    private RelativeLayout search_layout;
-    private ImageView iv_download, iv_appicon;
-    private SlidingTabLayout mSlidingTabLayout;
-    private ViewPager mViewPager;
-    private long exitTime = 0;
+    @BindView(R.id.search_layout)
+    RelativeLayout search_layout;
+    @BindView(R.id.iv_download)
+    ImageView iv_download;
+    @BindView(R.id.iv_appicon)
+    ImageView iv_appicon;
+    @BindView(R.id.main_sliding_tab_layout)
+    SlidingTabLayout mSlidingTabLayout;
+    @BindView(R.id.main_view_pager)
+    ViewPager mViewPager;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -63,69 +71,47 @@ public class MainActivity extends BaseActivity {
         starService();
     }
 
-    private void starService() {
-        startService(new Intent(this, GuardService.class));
-        startService(new Intent(this, StepService.class));
-        startService(new Intent(this, MainService.class));
-        startService(new Intent(this, DownloadService.class));
-    }
-
     @Override
     protected int setLayoutResourceID() {
         return R.layout.activity_main;
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-//        getUserInfo();
-    }
-
-    @Override
-    public void onConfigurationChanged(@NonNull Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        Log.e(TAG, "onConfigurationChanged");
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        Log.e(TAG, "onSaveInstanceState");
-    }
-
     @Override
     protected void initView() {
-        iv_appicon = findViewById(R.id.iv_appicon);
+        ButterKnife.bind(this);
         iv_appicon.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
 //                startActivity(new Intent(MainActivity.this, AboutActivity.class));
             }
         });
-        iv_download = findViewById(R.id.iv_download);
         iv_download.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startActivity(new Intent(MainActivity.this, DownloadManagerActivity.class));
+                startActivity(new Intent(MainActivity.this, ManagerAppActivity.class));
             }
         });
-        search_layout = findViewById(R.id.search_layout);
         search_layout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 startActivity(new Intent(MainActivity.this, SearcherActivity.class));
             }
         });
-        mSlidingTabLayout = findViewById(R.id.main_sliding_tab_layout);
-        mViewPager = findViewById(R.id.main_view_pager);
         initTabLayout();
     }
 
+    @Override
+    protected void initData() {
+//        getAllAppPackageName();
+    }
+
+    private void starService() {
+        startService(new Intent(this, GuardService.class));
+        startService(new Intent(this, StepService.class));
+        startService(new Intent(this, MainService.class));
+        startService(new Intent(this, DownloadService.class));
+    }
+
     private void initTabLayout() {
         final List<Fragment> fragmentList = new ArrayList<>();
         fragmentList.add(new FeaturedFragment());
@@ -149,8 +135,26 @@ public class MainActivity extends BaseActivity {
     }
 
     @Override
-    protected void initData() {
-//        getAllAppPackageName();
+    protected void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+//        getUserInfo();
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Log.e(TAG, "onConfigurationChanged");
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        Log.e(TAG, "onSaveInstanceState");
     }
 
     @Override
@@ -211,9 +215,10 @@ public class MainActivity extends BaseActivity {
             return false;
         }
         return super.onKeyDown(keyCode, event);
-
     }
 
+    private long exitTime = 0;
+
     public void exit() {
         if ((System.currentTimeMillis() - exitTime) > 2000) {
             ToastUtil.show("再按一次退出程序");
diff --git a/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
index 6e6dd86..695e744 100644
--- a/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
+++ b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java
@@ -109,7 +109,7 @@ public class MoreAppActivity extends BaseActivity {
 
     private void getAdminApp() {
         NetInterfaceManager.getInstance()
-                .getAdminAppObservable()
+                .getAdminAppByClassObservable(2)
                 .subscribe(new Observer<BaseResponse<List<AppInfo>>>() {
                     @Override
                     public void onSubscribe(Disposable d) {
diff --git a/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
index e33f5ce..9a24f92 100644
--- a/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
+++ b/app/src/main/java/com/uiui/zyappstore/adapter/AppAdapter.java
@@ -2,6 +2,8 @@ package com.uiui.zyappstore.adapter;
 
 import android.content.Context;
 import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,6 +30,7 @@ import com.uiui.zyappstore.bean.GlideCircleWithBorder;
 import com.uiui.zyappstore.utils.ApkUtils;
 import com.uiui.zyappstore.utils.FileUtils;
 import com.uiui.zyappstore.utils.StorageUtils;
+import com.uiui.zyappstore.utils.ToastUtil;
 import com.uiui.zyappstore.utils.Utils;
 
 import org.jetbrains.annotations.NotNull;
@@ -134,6 +137,12 @@ public class AppAdapter extends RecyclerView.Adapter<AppAdapter.Holder> {
                 if (installed && !update) {
                     ApkUtils.openApp(mContext, appInfo.getApp_package());
                 } else {
+                    int is_storeinstall = Settings.Global.getInt(mContext.getContentResolver(), "setting_is_storeinstall", 0);
+                    Log.e(TAG, "onClick: " + is_storeinstall);
+                    if (is_storeinstall == 0) {
+                        ToastUtil.show("应用市场已被禁止安装");
+                        return;
+                    }
                     Utils.addPackageToWhiteList(mContext, appInfo.getApp_package());
                     DownloadEntity entity = Aria.download(this).getFirstDownloadEntity(appInfo.getApp_url());
                     if (null != entity) {
diff --git a/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
index 598fc48..56a30a4 100644
--- a/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
+++ b/app/src/main/java/com/uiui/zyappstore/fragment/FeaturedFragment.java
@@ -216,7 +216,8 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
         cl_5.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(getActivity(), ManagerAppActivity.class));
+//                startActivity(new Intent(getActivity(), ManagerAppActivity.class));
+                openAppClass(5);
             }
         });
         tv_exclusive_app.setOnClickListener(new View.OnClickListener() {
@@ -254,9 +255,10 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
 //        } else {
 //            rv_popular.setLayoutManager(new LinearLayoutManager(mContext));
 //        }
+        rv_popular.setAdapter(mPopularAppAdapter);
+
         GridLayoutManager gridLayoutManager2 = new GridLayoutManager(mContext, 2);
         rv_exclusive.setLayoutManager(gridLayoutManager2);
-        rv_popular.setAdapter(mPopularAppAdapter);
         rv_exclusive.setAdapter(mExclusiveAppAdapter);
     }
 
@@ -333,13 +335,13 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
     }
 
     synchronized private void initAPPData() {
-        int setting_admin_app = Settings.System.getInt(mContext.getContentResolver(), "setting_admin_app", 1);
-        if (setting_admin_app == 0) {
-            getAllAppInfo();
-        } else {
-            getAllAppInfo();
+//        int setting_admin_app = Settings.System.getInt(mContext.getContentResolver(), "setting_admin_app", 1);
+//        if (setting_admin_app == 0) {
             getAdminApp();
-        }
+//        } else {
+//            getAllAppInfo();
+//            getAdminApp();
+//        }
         getBanner();
         getAppClass();
     }
@@ -524,7 +526,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
 
     private void getAdminApp() {
         NetInterfaceManager.getInstance()
-                .getAdminAppObservable()
+                .getAdminAppByClassObservable(2)
                 .subscribe(new Observer<BaseResponse<List<AppInfo>>>() {
                     @Override
                     public void onSubscribe(Disposable d) {
diff --git a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
index fc71fbf..8307e5d 100644
--- a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java
@@ -208,7 +208,9 @@ public class NetInterfaceManager {
                 set.add(JGYUtils.UMTK11Tag);
             } else if (platform == JGYUtils.UZY12Platform) {
                 set.add(JGYUtils.UZY12Tag);
-            } else if (platform == JGYUtils.TeclastMTK12Platform) {
+            } else if (platform == JGYUtils.Cube8183Platform) {
+                set.add(JGYUtils.Cube8183Tag);
+            }else if (platform == JGYUtils.Teclast8183Platform) {
                 set.add(JGYUtils.TeclastMTK12Tag);
             }
         });
diff --git a/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
index 5579ef0..945d286 100644
--- a/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/ApkUtils.java
@@ -12,6 +12,7 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -37,10 +38,12 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 public class ApkUtils {
+    private static final String TAG = ApkUtils.class.getSimpleName();
 
     public static synchronized boolean getRootAhth() {
         Process process = null;
@@ -72,17 +75,13 @@ public class ApkUtils {
         }
     }
 
-    public static void openApp(Context context, View view) {
-        try {
-            Intent intent = context.getPackageManager().getLaunchIntentForPackage((String) view.getTag(R.string.download_btn_had));
-            context.startActivity(intent);
-        } catch (Exception e) {
-            Toast.makeText(context, R.string.open_app_fail, Toast.LENGTH_LONG).show();
-        }
-        return;
-    }
-
     public static void openApp(Context context, String packageName) {
+        int setting_other_appInstaller = Settings.Global.getInt(context.getContentResolver(), "setting_other_appInstaller", 0);
+        Log.e(TAG, "openApp: " + setting_other_appInstaller);
+        if (setting_other_appInstaller == 0) {
+            ToastUtil.show("已禁止应用打开");
+            return;
+        }
         Intent intent = context.getPackageManager().getLaunchIntentForPackage(packageName);
         if (intent != null) {
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -636,7 +635,7 @@ public class ApkUtils {
         }
     }
 
-    static HashSet<String> fuxiaoyingApp = new HashSet<String>() {{
+    private static final HashSet<String> fuxiaoyingApp = new HashSet<String>() {{
         this.add("com.fuying.fuxiaoying");
         this.add("com.zhiduoke.fxy");
         this.add("com.fuying.english");
@@ -646,6 +645,54 @@ public class ApkUtils {
         this.add("com.fuying.aobama.pad");
     }};
 
+
+    private static final Set<String> JXWAPP = new HashSet<String>() {{
+        this.add("com.uiui.zybrowser");
+        this.add("com.study.flashplayer");
+        this.add("com.jxw.laboratory");
+        this.add("com.safe.uiui");
+        this.add("software.ecenter.study");
+        this.add("com.iflytek.speechcloud");
+        this.add("com.jxw.online_study");
+        this.add("com.jxw.jinfangyici");
+        this.add("air.com.zhihuiyoujiao.flashplayer");
+        this.add("com.ll.ahschool");
+        this.add("com.jxw.classtable");
+        this.add("com.jxw.teacher.video");
+        this.add("com.jxw.game");
+        this.add("com.jxw.yyhb");
+        this.add("com.jxw.zncd");
+        this.add("com.jxw.dmxcy");
+        this.add("com.jxw.bishunguize");
+        this.add("com.jxw.characterlearning");
+        this.add("com.jxw.newyouer.video");
+        this.add("com.iflytek.cyber.iot.show.core");
+        this.add("com.jxw.huiben");
+        this.add("com.jxw.liancichengju");
+        this.add("com.jxw.singsound");
+        this.add("com.jxw.jxwcalculator");
+        this.add("com.uiui.zyappstore");
+        this.add("com.jxw.launcher");
+        this.add("com.jxw.jxwbook");
+        this.add("com.uiui.zysn");
+        this.add("com.jxw.question");
+        this.add("com.example.arithmeticformula");
+        this.add("com.jxw.schultegrid");
+        this.add("com.jxw.mskt.video");
+        this.add("com.jxw.wuweijidanci");
+        this.add("com.tech.translate");
+        this.add("com.jxw.studydigital");
+        this.add("com.jxw.englishsoundmark");
+        this.add("com.jxw.handwrite");
+        this.add("com.example.pianpangbushou");
+        this.add("com.jxw.learnchinesepinyin");
+        this.add("com.example.elementcycleapp");
+        this.add("com.jxw.examsystem");
+        this.add("com.jxw.letterstudynew");
+        this.add("com.jxw.yuwenxiezuo");
+        this.add("com.jxw.bihuamingcheng");
+    }};
+
     synchronized public static List<LocalApp> getLocalApp(Context context) {
         List<LocalApp> appList = new ArrayList<>();
         Intent intent = new Intent(Intent.ACTION_MAIN, null);
@@ -669,6 +716,9 @@ public class ApkUtils {
                 continue;
             }
             bean.setPackageName(packageName);
+            if (JXWAPP.contains(packageName)) {
+                bean.setCanUnintall(false);
+            }
             Drawable icon = resolveInfoList.get(i).loadIcon(context.getPackageManager());
             bean.setIcon(icon);
 //            if (forceAppSet.contains(packageName)) {
@@ -753,9 +803,10 @@ public class ApkUtils {
     public static HashSet<String> ownApp = new HashSet<String>() {{
         this.add(BuildConfig.APPLICATION_ID);
         this.add("com.android.uiuios");
-        this.add("com.uiui.os");
-        this.add("com.uiui.browser");
-        this.add("com.uiui.sn");
+        this.add("com.uiui.zyos");
+        this.add("com.uiui.zybrowser");
+        this.add("com.uiui.zysn");
         this.add("com.uiui.aios");
+        this.add("com.safe.uiui");
     }};
 }
diff --git a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
index aa13bec..bb56fda 100644
--- a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
+++ b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java
@@ -43,7 +43,8 @@ public class JGYUtils {
     public static final int ZhanruiPlatform = 3;
     public static final int UMTK11Platform = 4;
     public static final int UZY12Platform = 7;
-    public static final int TeclastMTK12Platform = 8;
+    public static final int Cube8183Platform = 8;
+    public static final int Teclast8183Platform = 9;
     public static final int UnknowPlatform = 0;
 
     public static final String MTKTag = "MTK";
@@ -51,7 +52,8 @@ public class JGYUtils {
     public static final String NewZhanruiTag = "新展锐";
     public static final String UMTK11Tag = "UMTK11";
     public static final String UZY12Tag = "UZY12";
-    public static final String TeclastMTK12Tag = "TeclastMTK12";
+    public static final String Cube8183Tag = "cube8183";
+    public static final String TeclastMTK12Tag = "teclast8183";
 
 
     private JGYUtils(Context context) {
@@ -316,9 +318,12 @@ public class JGYUtils {
         } else if (UZY12Tag.equalsIgnoreCase(platform)) {
             Log.i(TAG, "checkAppPlatform: " + "UZY12");
             return UZY12Platform;
-        }else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) {
-            Log.i(TAG, "checkAppPlatform: " + "TeclastMTK12");
-            return TeclastMTK12Platform;
+        }else if (Cube8183Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "cube8183");
+            return Cube8183Platform;
+        } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) {
+            Log.i(TAG, "checkAppPlatform: " + "teclast8183");
+            return Teclast8183Platform;
         } else {
             Log.i(TAG, "checkAppPlatform: " + "没有数据");
             return UnknowPlatform;
@@ -351,7 +356,9 @@ public class JGYUtils {
         } else if (UZY12Tag.equalsIgnoreCase(platform)) {
             getAppPlatformCallback.AppPlatform(UZY12Platform);
         } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) {
-            getAppPlatformCallback.AppPlatform(TeclastMTK12Platform);
+            getAppPlatformCallback.AppPlatform(Teclast8183Platform);
+        } else if (Cube8183Tag.equalsIgnoreCase(platform)) {
+            getAppPlatformCallback.AppPlatform(Cube8183Platform);
         } else {
             getAppPlatformCallback.AppPlatform(UnknowPlatform);
         }
diff --git a/app/src/main/res/drawable-xhdpi/icon_0.png b/app/src/main/res/drawable-xhdpi/icon_0.png
index 2367a276c120b2dd037df76f92253e97d624933b..55eb134e086a2f5e6af77e92f420b1e4a25b7981 100644
GIT binary patch
delta 2785
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

delta 2121
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_1.png b/app/src/main/res/drawable-xhdpi/icon_1.png
index 74087deca31e994340f17702288b1525b0d7d8a3..0b522a566a644c2f75049a046561b6c595c2d4ce 100644
GIT binary patch
delta 2040
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
WFI|KWlu%=dALHWS0p0?r=l%r>|DL`8

delta 2785
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_2.png b/app/src/main/res/drawable-xhdpi/icon_2.png
index 25f3ec3aad7a4d93ae61d3617f5d48687a8fc174..1c32294634613dce56e298927aeb7825d2c706ca 100644
GIT binary patch
delta 3272
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
WPDX6e%as)WL|@wo_FmKB#s2_-sxqno

delta 2902
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
T&Sk}uDE>qfr2~9awFvqjlL~vh

diff --git a/app/src/main/res/drawable-xhdpi/icon_3.png b/app/src/main/res/drawable-xhdpi/icon_3.png
index 2c5b074a305a65f35276689ff9307140e933f6a5..a149474ee76555aaefce827a32b1a00ef3024fc8 100644
GIT binary patch
delta 2205
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
UcniggXZtJHaF*B_%<l>R0i|8vk^lez

delta 1815
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
H{4@R!QZGGs

diff --git a/app/src/main/res/drawable-xhdpi/icon_4.png b/app/src/main/res/drawable-xhdpi/icon_4.png
index cdadbb064d21173dbff9fedbe3a9c89e6b838a48..cd0f25637c40acb0118863d125bf705faca5f70b 100644
GIT binary patch
delta 2742
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

delta 2784
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

diff --git a/app/src/main/res/drawable-xhdpi/icon_5.png b/app/src/main/res/drawable-xhdpi/icon_5.png
index 41c0bc3098a84be4c48ddf10f1b7d3d4650c6b19..795b65f04dba9c519ecfcc15bb0a20203b6b9d0b 100644
GIT binary patch
delta 3958
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
T^e7{V{ug~6BgkhhNA&*zgi>mm

delta 2043
zcmZ{kdpHx09>(Q1cg+;dC>xVxHZr?}tl7b1eslSy3zZe+nliVYA4`k2nWBW;W-e38
zb(omSC581v<WA~Xp^!@{M{_#QIsf+l^?lyw{XFkq-*+2!XIBkL-p>Y0vavxUkxob(
zXB5hrh$UKMkD@U)hn#FNc0>Xix-Tv~l1#=CFP)1H4~(F>678YC9K`wH^SJ-BsNb=7
zish02E3hRw|1JdG7e(_548ooNU4bo$^gH$rLV>{WSkhq2$pHYaL?@rP@y`XpVY-3(
zFL+B4B0%_ja%P<+#jV%#5bH>$wyq}<u4V*GW5L0WtS&1SoCpF{$C-xcp5rF26oWy~
zeQanp^fZfIs#mt*)E4tkr<V0E+Zrv4w3bsbB4Jd0pVg0Yp-?y&%i9(&i$8iu`ule>
z9>o8sej9x4{Ly5J)*($dezy~TNYnO6ASJYj8G|^pXQ0~<Y=TrDSFB`m`0lyj8si)M
zgnpyB*F+CA5H?Jh;A^HA2#gRHQ+@Nj-HJr~!HoQa@N31vw(B?=NL8jmcuVNxvnn`Q
z!1?}D{T*9a_K&7W)K~Djn#R1gl%deL^ACydw)q?oWo)8Tq{oLf)kHN|Q*CH3PpRv)
zGp%ME1G+eDaINO1{1rEMSdj8MNV5Ot5bFhhqkaFA>oX>oZS{g4sg1Dm_}a6HMds}O
z*tVrTN!%RO1PA8{WxB5SnKteyh5LPU;^gk)j<iXTbp&4CV@evHt};-@&_2mQlcYJ2
z9U#cGa^B8__eFNhU1V*-nhB}-vKc}an8Y1L)D9Gs|6>X^Bheg{9erPnxA#M}w-!$b
z4rD3*e3v97FBAv2c6K7s`$<K|bCaK@ni{3l4rjxTxg698L|Y%-ZBR?024IxJh*h0!
zk*i}Y8k_mfq!wtd17LKxW;yKzNmbeuF^^<Q$NG8%rK87j1Fs2&g$}6p{UDCezvtWJ
ztnOy%`XPTKNd0VVEp4FQ#PVDm-o_!R%GIU*b8KxrQ0Dv85>DbGuNi~E8x8u#EFksz
zJ`xLfP2ZTLLcRW9BcP%FMyHDR*>_cN^W07qC+<!d6v6m6%xcRJ9qJb<*n7azom}!2
z8#PB|I2zu6$nPp#N)IK+N?w&H4SGMQ5Hi0F=a=mO`95?{cx-}$(3ZE9GT+m@j!~iE
zmVU&sL4lI}bX5;FZ%ut}oa^rP49j_KbJ3NaqD#)OW?39>9ld>nAli-4!l9?$t!U(>
z-^!n1Fc2sxfeui<=*WR>Ka?5Ia_gJou56^a^WIT!q&3@`#d1}@PWk(cPs2A@?8t@o
zc#a5vu^@ET?!^1Wm~pR~bo!>1_VU`Z`j)lTyHIzsq5Jno;-U4Dv8<dC+Iv6YZ4l=|
zOUlMd0#nLdRyt^F>tC=Q?|jeaOv7w;797VIAJSi4x!~zt$5G7+?KcdKDCOnlRnaH!
zY1t*5IDyb?zIdhdLDEf;qFsp&{Ii3%vE`?;k(Oq*2#-5ah9O~;B?DPz%ftgB41}r7
z|KJ)eJe`GQM)0DfBc|Vcd<UL}Z<D|00}K}K9{9BIC`|g*@xK3JW#zC*>!jQy=F$^J
z-B0_9KC?cNhZZcNw*W6rNVV_<!E!oY?%DNH>85_37x@h*x+)_u+2G0tcO%$gCev+-
z$8MO&thj&drvusEK38ye@PkjZE}fS9p}N<;_~WWeM{lt3R>gK+n(hS%cJbTQV38QO
zP^A(iV2_}_izHLHO2X^stnsD4J*yenK{*?-lc`(u;7`rX@LNFX;$q2Zy;4Djg?Tp(
z9+`^?59yf<zw?6C_+%Q@%G;Q=q;wfb<ja!>OH&3XhbQol!8E^R-wq3>y{G(2xkY<4
zWAma;V#xn08(V$jo02_!<=o#R6zc7B1++7XNw1xJr^Z|p6cn1lGsHi0eM=Z008RRs
zN;*PsxFKvN1rlrcs5>TYoR@9wpK)SFcCZp$Ah5{&D{^_B-$l2!$Zw?3<17nce?cw<
z3)Dn;$6iUiLd;2T>mLtvwKhI22<5A{W^1@I1AsGD;_AlS#ANfw-Q7Lcug>E{P4RV3
zpUP5uTnZT_Q9b(ns_{Ajj$tkJ;_mcWuLJ6tYNZT5C(&FWk^o}suRjHkv21hz9p-^B
z4>yQLG9WZ09G_i1J0JN<N4o=~tgW2zW`z0c{O&n*bJTJLsaObIZ5U@M=+3gG1X`2=
zr>rXgCcd?qaOT%yEN`O267hIbbaUISvT4UIm02}AnfSm8V<63t^@CCbY5StEqt}Gw
zS*{4*Dw;<1sEE7Q)I|g%_MbyD=m~EbULl&fwl){zA}*Hy!#iG1@2}APB;@ju7L$nF
z_6??4KzqiKOE>M1ons#j*u0>_>L3S=Z-T`GV{?hktEI64)aL`}oG)E*fH4AAbzNh~
z3Z-dKSk}k@!u`HdwW1}tyjHPtMdoOV#B+|GQ)89M?6`M064I<iH(JQT0Fuj99n^Mp
zTyLg0>Mn`lg~}VZMWp9_)I|B7^id0+c!N$}`_&q=5NBLLO79cBqA{8j^~|*Yhq?Zi
z@*M0^?W<Ia7-uTM1lzv1u)OJoh3riQw0d_u8ReGZ)w+CQPu2Y|V8rQ7ABB~Q&8K|f
e$)C(^C4ITlBGt=lL5ncCUvhQ!AXX91Ui%MG<F%&%

diff --git a/app/src/main/res/drawable-xhdpi/icon_download_task.png b/app/src/main/res/drawable-xhdpi/icon_download_task.png
index 75acd9797953a8ae71486c7750e6914010f5bf74..3c41567f96cdde79a4dd49dbc7a3e6f63e851f01 100644
GIT binary patch
literal 2544
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
KuxK{-rTzuvz<H_w

literal 940
zcmV;d15^BoP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&W=TXrRA@u(Sv_bJK@@&(ic}UND1tv241zOn!$}Zhr51`Jkr+Y5pkg6{7Dfmu
zv{sNH#==G{RMf)1sE9!uwK6s$H*X<DB%)xE(kjJqPbTahbIbi@FY6K5h2wr^-h1Eo
z-ZwLE_YhY2g)1CC<OG^kkchT2^N(ip(vD|V0j+fb5hoFGi-_C}!|;4skd5pzBS1ux
z05BK_XXZ>|W#ZI<CZdl3us0{rM0a@w>Ln<bP>WkuE}>jPElQ={v|K{DgmMYBnSoqF
zZ6+|^g;unLj4^8f-~<5dR7yRy)=tHQ8Z~pq7>$U>5ph98rkVLuS|zn5p&$r`MdVQ&
z+<~&zK5KMC<G?$zB4Q%Dd(3>UQv?o)$U8rHOrll=YJdk3xgUn%*^Us1GW{F?jwMNm
z$OZqF(q%l6`9%}IYH3KcB_S73Yu%-kawG;40GzHX_r!=8da_v-@QVpZ!#ZiBwO*x^
zdI10jTJ_g%<}2&2)qu_Bxg7}+9f?ZT>$bq&VsGZR+4!<lAP%CnUaypT2>`qQ2l!=^
zkPlXCy*VP$mn5-VvZ>lIyn|;*L<ZW~(qdo6m>xuQl?ZB`5zS=LXq<@d0KgP8zpYe2
zYrRV;H63khU#+$M?F4bQ(P?`T0J_{WQfqD1d6CAyF=oy^YmIF8xf6VG4G_^N0E~Ot
zI%=(bl_p45HbD>!iimsO8ee0~JRTF+4*(y$!K=)CJu5J2{1VX>0J!EQ`LL^MOkfiL
z{E7!f<VhHY!)XF#Wn+wajEE;=|D{r?duC?lXJs2DqTc|pF`6*1l<F@Qi*s24T8iJ^
z-rnwVx$M^Hx@evLvDR*=EMoT|2!hula>R3do0&(J5-6*=L^J^ampuQI%sf;@fQZ})
z>YnNQ*C}SMw98omY~<G%a~csJ_;V0(yR~+vih%nP?Xj+l^siB7zS$x0V~BXek1Zl+
z!Z3VTS<FdbL^KZoYZJe_Kk16mD|0T0xUF0+_qq2Z4rcDDszxm|MD(Ucdz?A&CIP-P
z^N!@4y3L$1W&{y$bsF`e&Jic9wU=vQY1oY#V-5nq9z=8tyzTa4iOFy`M4v_EOBjal
z>)E#4P8SM=)umFYutX54rY|fke4Cw}{o9Ih%LH0+)`>Yeflg%IkNFRdvR*(|=@;Gr
O0000<MNUMnLSTY=R-vc>

diff --git a/app/src/main/res/layout-land/activity_local_manager.xml b/app/src/main/res/layout-land/activity_local_manager.xml
index 17cdd6f..a68d1a8 100644
--- a/app/src/main/res/layout-land/activity_local_manager.xml
+++ b/app/src/main/res/layout-land/activity_local_manager.xml
@@ -38,15 +38,14 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-
     <com.scwang.smartrefresh.layout.SmartRefreshLayout
         android:id="@+id/local_app_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        android:background="@color/white"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout2">
 
         <RelativeLayout
@@ -71,7 +70,5 @@
 
             </ImageView>
         </RelativeLayout>
-
     </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 0024b72..f9ef419 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -6,16 +6,18 @@
     android:layout_height="match_parent"
     tools:context=".activity.MainActivity">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:id="@+id/linearLayout4"
+            android:layout_width="0dp"
             android:layout_height="@dimen/dp_24"
-            android:layout_marginBottom="@dimen/dp_4"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toStartOf="@+id/iv_download"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/iv_appicon"
@@ -70,7 +72,6 @@
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/iv_download"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
@@ -79,12 +80,25 @@
                 android:visibility="gone" />
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/iv_download"
+            android:layout_width="@dimen/dp_12"
+            android:layout_height="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_8"
+            android:adjustViewBounds="true"
+            android:scaleType="centerInside"
+            android:src="@drawable/icon_download_task"
+            app:layout_constraintBottom_toBottomOf="@+id/linearLayout4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/linearLayout4" />
+
         <com.flyco.tablayout.SlidingTabLayout
             android:id="@+id/main_sliding_tab_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:background="@color/white"
             android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/linearLayout4"
             app:tl_indicator_style="TRIANGLE"
             app:tl_tab_space_equal="true"
             app:tl_textBold="SELECT"
@@ -98,6 +112,10 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:background="@color/white"
-            android:overScrollMode="never" />
-    </LinearLayout>
+            android:overScrollMode="never"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/main_sliding_tab_layout" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_featured.xml b/app/src/main/res/layout-land/fragment_featured.xml
index d90c205..a13ecfb 100644
--- a/app/src/main/res/layout-land/fragment_featured.xml
+++ b/app/src/main/res/layout-land/fragment_featured.xml
@@ -9,7 +9,7 @@
         android:id="@+id/featured_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/adapter_selector_default"
+        android:background="@color/colorPrimary"
         app:srlAccentColor="@color/colorAccent"
         app:srlPrimaryColor="@color/colorPrimary">
 
diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
index 01185ca..edd99a9 100644
--- a/app/src/main/res/layout-port/activity_main.xml
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -6,16 +6,18 @@
     android:layout_height="match_parent"
     tools:context=".activity.MainActivity">
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
         <LinearLayout
-            android:layout_width="match_parent"
+            android:id="@+id/linearLayout4"
+            android:layout_width="0dp"
             android:layout_height="@dimen/dp_24"
-            android:layout_marginBottom="@dimen/dp_4"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toStartOf="@+id/iv_download"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
                 android:id="@+id/iv_appicon"
@@ -70,7 +72,6 @@
             </RelativeLayout>
 
             <ImageView
-                android:id="@+id/iv_download"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical"
@@ -79,12 +80,25 @@
                 android:visibility="gone" />
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/iv_download"
+            android:layout_width="@dimen/dp_12"
+            android:layout_height="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_8"
+            android:adjustViewBounds="true"
+            android:scaleType="centerInside"
+            android:src="@drawable/icon_download_task"
+            app:layout_constraintBottom_toBottomOf="@+id/linearLayout4"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/linearLayout4" />
+
         <com.flyco.tablayout.SlidingTabLayout
             android:id="@+id/main_sliding_tab_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:background="@color/white"
             android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@+id/linearLayout4"
             app:tl_indicator_style="TRIANGLE"
             app:tl_tab_space_equal="true"
             app:tl_textBold="SELECT"
@@ -98,6 +112,10 @@
             android:layout_height="0dp"
             android:layout_weight="1"
             android:background="@color/white"
-            android:overScrollMode="never" />
-    </LinearLayout>
+            android:overScrollMode="never"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/main_sliding_tab_layout" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_featured.xml b/app/src/main/res/layout-port/fragment_featured.xml
index a3dd4b9..d4ea9bf 100644
--- a/app/src/main/res/layout-port/fragment_featured.xml
+++ b/app/src/main/res/layout-port/fragment_featured.xml
@@ -9,7 +9,7 @@
         android:id="@+id/featured_refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/adapter_selector_default"
+        android:background="@color/colorPrimary"
         app:srlAccentColor="@color/colorAccent"
         app:srlPrimaryColor="@color/colorPrimary">
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e812d35..f250bd6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#efefef</color>
+    <color name="colorPrimary">#f6f6f6</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#4880ff</color>
 <!--    <color name="colorPrimary">#008577</color>-->
@@ -20,7 +20,7 @@
     <color name="search">#FFFFFF</color>
     <color name="red">#d64743</color>
     <color name="blue">#00a0e9</color>
-    <color name="adapter_selector_default">#e8e7e7</color>
+    <color name="adapter_selector_default">#f3f0f0</color>
     <color name="activation_color">#4880ff</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dbd92e6..1a659ac 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,10 +12,10 @@
     <string name="popular_recommendation">热门推荐</string>
     <string name="more_app">更多…</string>
 
-    <string name="class_shopping">购物</string>
-    <string name="class_popular">热门</string>
-    <string name="class_health">养生</string>
-    <string name="class_video">影音</string>
-    <string name="class_entertainment">娱乐</string>
-    <string name="class_manage">管理</string>
+    <string name="class_shopping">热门推荐</string>
+    <string name="class_popular">在线学习</string>
+    <string name="class_health">学霸必备</string>
+    <string name="class_video">偏科助手</string>
+    <string name="class_entertainment">基础工具</string>
+    <string name="class_manage">学习软件</string>
 </resources>