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 0000000..7c46fbc Binary files /dev/null and b/app/keystore/zhanxun.keystore differ 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 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>>() { @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 { 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>>() { @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 fuxiaoyingApp = new HashSet() {{ + private static final HashSet fuxiaoyingApp = new HashSet() {{ 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 JXWAPP = new HashSet() {{ + 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 getLocalApp(Context context) { List 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 ownApp = new HashSet() {{ 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 2367a27..55eb134 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_0.png and b/app/src/main/res/drawable-xhdpi/icon_0.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_1.png b/app/src/main/res/drawable-xhdpi/icon_1.png index 74087de..0b522a5 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_1.png and b/app/src/main/res/drawable-xhdpi/icon_1.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_2.png b/app/src/main/res/drawable-xhdpi/icon_2.png index 25f3ec3..1c32294 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_2.png and b/app/src/main/res/drawable-xhdpi/icon_2.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_3.png b/app/src/main/res/drawable-xhdpi/icon_3.png index 2c5b074..a149474 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_3.png and b/app/src/main/res/drawable-xhdpi/icon_3.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_4.png b/app/src/main/res/drawable-xhdpi/icon_4.png index cdadbb0..cd0f256 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_4.png and b/app/src/main/res/drawable-xhdpi/icon_4.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_5.png b/app/src/main/res/drawable-xhdpi/icon_5.png index 41c0bc3..795b65f 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_5.png and b/app/src/main/res/drawable-xhdpi/icon_5.png differ 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 75acd97..3c41567 100644 Binary files a/app/src/main/res/drawable-xhdpi/icon_download_task.png and b/app/src/main/res/drawable-xhdpi/icon_download_task.png differ 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" /> - - - \ 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"> - + android:layout_height="match_parent"> + android:orientation="horizontal" + app:layout_constraintEnd_toStartOf="@+id/iv_download" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + - + 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" /> + \ 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"> - + android:layout_height="match_parent"> + android:orientation="horizontal" + app:layout_constraintEnd_toStartOf="@+id/iv_download" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + - + 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" /> + \ 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 @@ - #efefef + #f6f6f6 #303F9F #4880ff @@ -20,7 +20,7 @@ #FFFFFF #d64743 #00a0e9 - #e8e7e7 + #f3f0f0 #4880ff 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 @@ 热门推荐 更多… - 购物 - 热门 - 养生 - 影音 - 娱乐 - 管理 + 热门推荐 + 在线学习 + 学霸必备 + 偏科助手 + 基础工具 + 学习软件