From 7426c3893536689ee4905165cbe62ffca4678224 Mon Sep 17 00:00:00 2001 From: Administrator <981964879@qq.com> Date: Fri, 27 Nov 2020 11:00:00 +0800 Subject: [PATCH] =?UTF-8?q?update:2020.11.27=20fix:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A8=AA=E5=B1=8F=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/.gitignore | 86 ++++++ app/app.iml | 209 --------------- app/src/main/AndroidManifest.xml | 41 ++- .../java/com/appstore/uiui/MyApplication.java | 2 +- .../appstore/uiui/activity/MainActivity.java | 16 +- .../uiui/activity/SearcherActivity.java | 4 +- .../com/appstore/uiui/adapter/AppAdapter.java | 10 +- .../com/appstore/uiui/base/BaseActivity.java | 6 +- .../uiui/fragment/FeaturedFragment.java | 49 ++-- .../uiui/fragment/ManageFragment.java | 30 ++- app/src/main/res/drawable-xhdpi/ic_back.png | Bin 1808 -> 676 bytes .../res/drawable-xhdpi/ic_menu_search.png | Bin 2174 -> 1625 bytes .../main/res/drawable/shap_search_left.xml | 2 +- .../main/res/drawable/shap_search_right.xml | 2 +- .../activity_about.xml | 6 +- .../activity_copyright.xml | 0 .../activity_details.xml | 9 +- .../activity_download_manager.xml | 4 +- .../activity_kind_detail.xml | 4 +- .../activity_local_manager.xml | 4 +- .../main/res/layout-land/activity_main.xml | 115 ++++++++ .../activity_searcher.xml | 4 +- .../fragment_collect.xml | 0 .../fragment_download_record.xml | 0 .../fragment_downloadfinish.xml | 0 .../fragment_downloading.xml | 0 .../fragment_featured.xml | 0 .../{layout => layout-land}/fragment_kind.xml | 0 .../fragment_kind_detail.xml | 0 .../fragment_localapp.xml | 0 .../fragment_manage.xml | 0 .../{layout => layout-land}/fragment_rank.xml | 0 .../include_line_horizontal.xml | 0 .../include_line_vertical.xml | 0 .../res/{layout => layout-land}/item_app.xml | 6 +- .../item_donwloadfinish.xml | 0 .../item_donwloading.xml | 7 +- .../item_download_manager.xml | 13 +- .../{layout => layout-land}/item_image.xml | 0 .../res/{layout => layout-land}/item_kind.xml | 0 .../item_local_app.xml | 8 +- .../res/{layout => layout-land}/item_net.xml | 0 .../main/res/layout-port/activity_about.xml | 94 +++++++ .../res/layout-port/activity_copyright.xml | 9 + .../main/res/layout-port/activity_details.xml | 245 ++++++++++++++++++ .../layout-port/activity_download_manager.xml | 69 +++++ .../res/layout-port/activity_kind_detail.xml | 76 ++++++ .../layout-port/activity_local_manager.xml | 78 ++++++ .../{layout => layout-port}/activity_main.xml | 6 +- .../res/layout-port/activity_searcher.xml | 54 ++++ .../main/res/layout-port/fragment_collect.xml | 47 ++++ .../layout-port/fragment_download_record.xml | 47 ++++ .../layout-port/fragment_downloadfinish.xml | 12 + .../res/layout-port/fragment_downloading.xml | 11 + .../res/layout-port/fragment_featured.xml | 57 ++++ .../main/res/layout-port/fragment_kind.xml | 19 ++ .../res/layout-port/fragment_kind_detail.xml | 19 ++ .../res/layout-port/fragment_localapp.xml | 17 ++ .../main/res/layout-port/fragment_manage.xml | 180 +++++++++++++ .../main/res/layout-port/fragment_rank.xml | 19 ++ .../layout-port/include_line_horizontal.xml | 9 + .../res/layout-port/include_line_vertical.xml | 8 + app/src/main/res/layout-port/item_app.xml | 101 ++++++++ .../res/layout-port/item_donwloadfinish.xml | 51 ++++ .../main/res/layout-port/item_donwloading.xml | 71 +++++ .../res/layout-port/item_download_manager.xml | 129 +++++++++ app/src/main/res/layout-port/item_image.xml | 15 ++ app/src/main/res/layout-port/item_kind.xml | 46 ++++ .../main/res/layout-port/item_local_app.xml | 89 +++++++ app/src/main/res/layout-port/item_net.xml | 32 +++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 7543 -> 5618 bytes app/src/main/res/values/colors.xml | 4 +- 72 files changed, 1953 insertions(+), 298 deletions(-) create mode 100644 app/.gitignore delete mode 100644 app/app.iml rename app/src/main/res/{layout => layout-land}/activity_about.xml (96%) rename app/src/main/res/{layout => layout-land}/activity_copyright.xml (100%) rename app/src/main/res/{layout => layout-land}/activity_details.xml (97%) rename app/src/main/res/{layout => layout-land}/activity_download_manager.xml (95%) rename app/src/main/res/{layout => layout-land}/activity_kind_detail.xml (96%) rename app/src/main/res/{layout => layout-land}/activity_local_manager.xml (96%) create mode 100644 app/src/main/res/layout-land/activity_main.xml rename app/src/main/res/{layout => layout-land}/activity_searcher.xml (95%) rename app/src/main/res/{layout => layout-land}/fragment_collect.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_download_record.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_downloadfinish.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_downloading.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_featured.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_kind.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_kind_detail.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_localapp.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_manage.xml (100%) rename app/src/main/res/{layout => layout-land}/fragment_rank.xml (100%) rename app/src/main/res/{layout => layout-land}/include_line_horizontal.xml (100%) rename app/src/main/res/{layout => layout-land}/include_line_vertical.xml (100%) rename app/src/main/res/{layout => layout-land}/item_app.xml (95%) rename app/src/main/res/{layout => layout-land}/item_donwloadfinish.xml (100%) rename app/src/main/res/{layout => layout-land}/item_donwloading.xml (92%) rename app/src/main/res/{layout => layout-land}/item_download_manager.xml (92%) rename app/src/main/res/{layout => layout-land}/item_image.xml (100%) rename app/src/main/res/{layout => layout-land}/item_kind.xml (100%) rename app/src/main/res/{layout => layout-land}/item_local_app.xml (93%) rename app/src/main/res/{layout => layout-land}/item_net.xml (100%) create mode 100644 app/src/main/res/layout-port/activity_about.xml create mode 100644 app/src/main/res/layout-port/activity_copyright.xml create mode 100644 app/src/main/res/layout-port/activity_details.xml create mode 100644 app/src/main/res/layout-port/activity_download_manager.xml create mode 100644 app/src/main/res/layout-port/activity_kind_detail.xml create mode 100644 app/src/main/res/layout-port/activity_local_manager.xml rename app/src/main/res/{layout => layout-port}/activity_main.xml (95%) create mode 100644 app/src/main/res/layout-port/activity_searcher.xml create mode 100644 app/src/main/res/layout-port/fragment_collect.xml create mode 100644 app/src/main/res/layout-port/fragment_download_record.xml create mode 100644 app/src/main/res/layout-port/fragment_downloadfinish.xml create mode 100644 app/src/main/res/layout-port/fragment_downloading.xml create mode 100644 app/src/main/res/layout-port/fragment_featured.xml create mode 100644 app/src/main/res/layout-port/fragment_kind.xml create mode 100644 app/src/main/res/layout-port/fragment_kind_detail.xml create mode 100644 app/src/main/res/layout-port/fragment_localapp.xml create mode 100644 app/src/main/res/layout-port/fragment_manage.xml create mode 100644 app/src/main/res/layout-port/fragment_rank.xml create mode 100644 app/src/main/res/layout-port/include_line_horizontal.xml create mode 100644 app/src/main/res/layout-port/include_line_vertical.xml create mode 100644 app/src/main/res/layout-port/item_app.xml create mode 100644 app/src/main/res/layout-port/item_donwloadfinish.xml create mode 100644 app/src/main/res/layout-port/item_donwloading.xml create mode 100644 app/src/main/res/layout-port/item_download_manager.xml create mode 100644 app/src/main/res/layout-port/item_image.xml create mode 100644 app/src/main/res/layout-port/item_kind.xml create mode 100644 app/src/main/res/layout-port/item_local_app.xml create mode 100644 app/src/main/res/layout-port/item_net.xml diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..53e730c --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,86 @@ +# Built application files +*.apk +*.aar +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ +# Uncomment the following line in case you need and you don't have the release build type files in your app +# release/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +# Android Studio 3 in .gitignore file. +.idea/caches +.idea/modules.xml +# Comment next line if keeping position of elements in Navigation Editor is relevant for you +.idea/navEditor.xml + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild +.cxx/ + +# Google Services (e.g. APIs or Firebase) +# google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md + +# Version control +vcs.xml + +# lint +lint/intermediates/ +lint/generated/ +lint/outputs/ +lint/tmp/ +# lint/reports/ +/.idea/ diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index cd6d9d0..0000000 --- a/app/app.iml +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d35425..b2be800 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,6 @@ - @@ -28,27 +27,44 @@ android:name=".MyApplication" android:allowBackup="true" android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher" android:label="@string/app_name" android:launchMode="singleTask" android:networkSecurityConfig="@xml/network" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - - - + + + - - - - - + + + + + @@ -207,9 +223,10 @@ - + android:exported="true" /> diff --git a/app/src/main/java/com/appstore/uiui/MyApplication.java b/app/src/main/java/com/appstore/uiui/MyApplication.java index 33fe0cb..b3f7477 100644 --- a/app/src/main/java/com/appstore/uiui/MyApplication.java +++ b/app/src/main/java/com/appstore/uiui/MyApplication.java @@ -61,7 +61,7 @@ public class MyApplication extends Application { @NonNull @Override public RefreshHeader createRefreshHeader(@NonNull Context context, @NonNull RefreshLayout layout) { - layout.setPrimaryColorsId(R.color.download, R.color.red);//全局设置主题颜色 + layout.setPrimaryColorsId(R.color.download, R.color.default_color);//全局设置主题颜色 return new ClassicsHeader(context);//.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header，默认是 贝塞尔雷达Header } }); diff --git a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java index b3c90d4..f28ccd8 100644 --- a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java +++ b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.os.Bundle; import android.os.Environment; import android.os.Handler; @@ -77,6 +78,7 @@ public class MainActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + Log.e("MainActivity","onCreate"); requestPermission(); registerMessageReceiver(); // used for receive msg String rid = JPushInterface.getRegistrationID(getApplicationContext()); @@ -100,6 +102,18 @@ public class MainActivity extends BaseActivity { return R.layout.activity_main; } + @Override + public void onConfigurationChanged(@NonNull Configuration newConfig) { + super.onConfigurationChanged(newConfig); + Log.e("MainActivity","onConfigurationChanged"); + } + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + Log.e("MainActivity","onSaveInstanceState"); + } + + @Override protected void initView() { iv_appicon = findViewById(R.id.iv_appicon); @@ -130,7 +144,7 @@ public class MainActivity extends BaseActivity { private void initTabLayout() { final List fragmentList = new ArrayList<>(); - fragmentList.add(new FeaturedFragment(this)); + fragmentList.add(new FeaturedFragment()); // fragmentList.add(new RankFragment()); fragmentList.add(new KindFragment()); fragmentList.add(new ManageFragment()); diff --git a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java index 2a59c1d..e5bb30e 100644 --- a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java +++ b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java @@ -40,8 +40,8 @@ public class SearcherActivity extends BaseActivity { search = findViewById(R.id.search); // int id = search.getContext().getResources().getIdentifier("android:id/search_src_text", null, null); TextView textView = search.findViewById(androidx.appcompat.R.id.search_src_text); - textView.setTextColor(Color.WHITE); - textView.setHintTextColor(Color.WHITE);//提示字体颜色** + textView.setTextColor(Color.BLACK); + textView.setHintTextColor(Color.GRAY);//提示字体颜色** recyclerView = findViewById(R.id.recyclerView); } diff --git a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java index 90e1b05..2c81cc9 100644 --- a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java +++ b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java @@ -110,17 +110,17 @@ public class AppAdapter extends RecyclerView.Adapter { if (appInfo.isInstall()) { if (appInfo.isUpdate()) { holder.btnDownLoad.setText("更新"); - holder.btnDownLoad.setTextColor(mContext.getColor(R.color.install)); + holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color)); holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none)); } else { holder.btnDownLoad.setText("打开"); - holder.btnDownLoad.setTextColor(mContext.getColor(R.color.white)); - holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_open)); + holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color)); + holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none)); } } else { holder.btnDownLoad.setText("安装"); - holder.btnDownLoad.setTextColor(mContext.getColor(R.color.white)); - holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_open)); + holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color)); + holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none)); if (downloadTask != null) { holder.refresh(downloadTask.progress); } diff --git a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java b/app/src/main/java/com/appstore/uiui/base/BaseActivity.java index 07c59fc..a12069f 100644 --- a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java +++ b/app/src/main/java/com/appstore/uiui/base/BaseActivity.java @@ -23,9 +23,9 @@ public abstract class BaseActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); // requestWindowFeature(Window.FEATURE_NO_TITLE); - if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } +// if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { +// setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); +// } setStatusBar(); setContentView(setLayoutResourceID()); initView(); diff --git a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java index 5ace352..a3b9fd5 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java +++ b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java @@ -4,12 +4,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.view.View; import android.widget.ImageView; +import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -35,6 +37,7 @@ import com.zhpan.bannerview.utils.BannerUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** @@ -56,10 +59,9 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager private installReceiver myReceiver; private Context mContext; - public FeaturedFragment(Context context) { - this.mContext = context; - } + public FeaturedFragment() { + } @Override public int getLayoutId() { @@ -81,6 +83,32 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager @Override public void onStart() { super.onStart(); + mContext = this.getActivity(); + adapter = new AppAdapter(newAppInfoList, false, getContext()); + adapter.setHasStableIds(true); + int orientation = 0; + orientation = mContext.getResources().getConfiguration().orientation; + if (orientation == Configuration.ORIENTATION_LANDSCAPE) { + GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 3); + mRvResult.setLayoutManager(gridLayoutManager); + } else if (orientation == Configuration.ORIENTATION_PORTRAIT) { + GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2); + mRvResult.setLayoutManager(gridLayoutManager); + } else { + mRvResult.setLayoutManager(new LinearLayoutManager(getActivity())); + } + mRvResult.setAdapter(adapter); + mRefreshLayout.setEnableLoadMore(false); + mRefreshLayout.setEnableRefresh(true); + mRefreshLayout.setOnRefreshListener(new OnRefreshListener() { + @Override + public void onRefresh(RefreshLayout refreshlayout) { +// initData(); + initAPPData(handler); + } + }); + mRefreshLayout.autoRefresh(); + adapter.setData(checkUpdateOrInstalled(newAppInfoList)); adapter.notifyDataSetChanged(); if (myReceiver == null) { @@ -92,6 +120,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY); mContext.registerReceiver(myReceiver, filter); } + } @Override @@ -127,21 +156,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager isNotLoadBitmap = false; - adapter = new AppAdapter(newAppInfoList, false, getContext()); - adapter.setHasStableIds(true); - mRvResult.setAdapter(adapter); - mRvResult.setLayoutManager(new LinearLayoutManager(getActivity())); - mRefreshLayout.setEnableLoadMore(false); - mRefreshLayout.setEnableRefresh(true); - mRefreshLayout.setOnRefreshListener(new OnRefreshListener() { - @Override - public void onRefresh(RefreshLayout refreshlayout) { -// initData(); - initAPPData(handler); - } - }); - mRefreshLayout.autoRefresh(); } @Override diff --git a/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java b/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java index d37d5c0..0301c93 100644 --- a/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java +++ b/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java @@ -1,5 +1,6 @@ package com.appstore.uiui.fragment; +import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; @@ -49,6 +50,7 @@ public class ManageFragment extends LazyLoadFragment { private List packageNameList = new ArrayList<>(); private UpdateAppAdapter adapter; private ConstraintLayout manage_cl_localapp, manage_cl_download; + private Context mContext; @Override public int getLayoutId() { @@ -62,26 +64,25 @@ public class ManageFragment extends LazyLoadFragment { manage_cl_localapp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(getActivity(), LocalManagerActivity.class)); + startActivity(new Intent(mContext, LocalManagerActivity.class)); } }); manage_cl_download = view.findViewById(R.id.manage_cl_download); manage_cl_download.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - startActivity(new Intent(getActivity(), DownloadManagerActivity.class)); + startActivity(new Intent(mContext, DownloadManagerActivity.class)); } }); iv_nodata = view.findViewById(R.id.iv_nodata); mRvLocal = view.findViewById(R.id.manage_rv_local); updateAppInfoList = new ArrayList<>(); - adapter = new UpdateAppAdapter(updateAppInfoList, getContext()); + adapter = new UpdateAppAdapter(updateAppInfoList, mContext); mRvLocal.setAdapter(adapter); - mRvLocal.setLayoutManager(new LinearLayoutManager(getActivity())); + mRvLocal.setLayoutManager(new LinearLayoutManager(mContext)); - initAPPData(handler); } @Override @@ -89,6 +90,13 @@ public class ManageFragment extends LazyLoadFragment { } + @Override + public void onStart() { + super.onStart(); + mContext = getActivity(); + initAPPData(handler); + } + synchronized private void initAPPData(final Handler handler) { OKGO.getAllAppInfo(handler); } @@ -97,19 +105,19 @@ public class ManageFragment extends LazyLoadFragment { List appList = new ArrayList<>(); Intent intent = new Intent(Intent.ACTION_MAIN, null); intent.addCategory(Intent.CATEGORY_LAUNCHER); - List resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent, 0); + List resolveInfoList = mContext.getPackageManager().queryIntentActivities(intent, 0); for (int i = 0; i < resolveInfoList.size(); i++) { LocalApp bean = new LocalApp(); - bean.setAppName(resolveInfoList.get(i).loadLabel(getActivity().getPackageManager()).toString()); + bean.setAppName(resolveInfoList.get(i).loadLabel(mContext.getPackageManager()).toString()); String packageName = resolveInfoList.get(i).activityInfo.packageName; bean.setPackageName(packageName); - Drawable icon = resolveInfoList.get(i).loadIcon(getActivity().getPackageManager()); + Drawable icon = resolveInfoList.get(i).loadIcon(mContext.getPackageManager()); bean.setIcon(icon); try { - PackageInfo packageInfo = getActivity().getPackageManager().getPackageInfo(packageName, 0); - String versionCode = getActivity().getPackageManager() + PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(packageName, 0); + String versionCode = mContext.getPackageManager() .getPackageInfo(packageName, 0).versionName; bean.setVersion(versionCode); bean.setVersionCode(packageInfo.versionCode); @@ -139,7 +147,7 @@ public class ManageFragment extends LazyLoadFragment { for (LocalApp app : localAppList) { if (packageNameList.contains(app.getPackageName())) { AppInfo info = list.get(packageNameList.indexOf(app.getPackageName())); - if (ApkUtils.checkIsUpdate(getContext(), info.getApp_package(), Integer.parseInt(info.getApp_version_code()))) { + if (ApkUtils.checkIsUpdate(mContext, info.getApp_package(), Integer.parseInt(info.getApp_version_code()))) { UpdateAppInfo updateAppInfo = new UpdateAppInfo(); updateAppInfo.setVersionCode(app.getVersionCode()); updateAppInfo.setVersionName(app.getVersion()); diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png index dbafbd0271a278b9b3d82a03f42fe77e04382768..5db22cba3845383cf4a5b8c9c83cb7bcf722f53b 100644 GIT binary patch literal 676 zcmV;V0$crwP)@)K-^y0r z=XY11FKICI(ac;w766L_W=>!Ufteeio+L;_YXJ8E_RRdOwQ*I101-U`c#1@~%*+}P z+yfw@7XY&R@t6mI6XL%BTr>0czjnY0@gD$ITH*zuyAU9va{%uEu96*oW#%*#CY!(& zfYRb!Ilw}^8vsNkc9(3Q+FmW&pNbXp5D4NW<|X#yv0>)j7)Bm2i*-NYR_%*rmk)^gxh4zvKiH2t@&Sgistn1VL_y z6#i6_P18`0WG|;(1L%RE_WGQA00Dx$Dlf0hAIH1^1PIb;mKK|Q zFcE({F!Wd7`+F4*n51xE@&X_y-5SF8#0000< KMNUMnLSTZw1{Ea$ literal 1808 zcmaJ?X;c$u6b%hK6-9yy(K1A%pxGgkL;{k;NYGFWK|nN;Wg-ERiIagO6g1+(Vo|A_ z3Kn++p&XT}t+;_G3bI(WR!eb1i+Dt_Dps*zCkWUdrE|{Ax14+LyYGGPJChq3v2dKT zmoo-~87B%8NYF9B`a0U9-v$%@DLQx}3u2KdNR1ffFo+3NK?)EMY2~Xx2`E>YS2uw{ z7!1}&BaKC3#fv#gNK27hF%*+lkFqhCpb(Q@u1p3IKmo4O=(vR5)3pRZqv8@`m|~h( z&j%AVVd*d!l^!8grY9@eDndvw5M<(@0$LD}114>X&cHEo2}8OZbZ*_I5`ZBHlFTK1 zG!-k31o#jP0!#{%tfbKcfIv2d&ZGyh=p=waqx(~7{#3d@na<$Q*c>_&7=8$7G+3qP zNCd*+Sm=sNNJJ1lhe|aXjTECl1%g*m>1;NeN@GwN3^Ix!8_YUHZX)Xp(?=8ppg{?1 z^oR!10aiu10!l@=1k~xr6twzLS)F0HOlZNVCb^zUr_ih^jR3{s|A%U|qi6#n0YCZu zPho@9tOuzQ&;X^vO7!5=)2*TO96k)n5eSw-P|8RZBNHJ6G9*HJfX@efV>CJyWHk5< z!Np>ZNM}IgIwdF)a0#dYMWa!1`2GSOU%=qAm^2}sz95vvpwWahKA*-86!7Rg<_K2+ zDO0te4jJL9K5+$Oa;=@9)uWLGAgoCPRYDlj0z(;dG-G=S9aC?Zs~X!2Z%i%~HAA(Y z>%Y!vXhh(Zy)rgF3X?VYI8oDG&cbFUv-eAXI8<@7dY9NGiu&I&0k2)pmRK zjQXm4r)&G`9A`HNSFE^Ro*8B*`MGk%95;`R-B8%BeE~femM^m{U`cV3(~TV)L`!Pm zuDf$yUF*#cEV^4(hfLkt;*xE6K`P1qYWL%kS9g<%YV~JebN6kqxu+0A?sH$B6yht9 zox|U<+p(-J=qh%mYY``~xMTv>kv41f)uShbNfgL!@(U#5m#lT2F#-_F0kd*vI4C;m!Q+m&BT>u#%U535M6@uXoD6cOAAWxdOrMw(f~4)M8C zWq<2?dzri;|O<@?sY!RZj_!_>d|oo-P#@yJFmg%^P~nmENhIihY*j`z=dI z(wq-kkN$(zy5oV(Yii#_&uV*VY)QS-yI;-bX7*k#`&v59nN{f^i@V^rSLQP*sSV$J zz>;KNH91iG0k;`RKXT6F3b*o4S8S!IqyN5HHnEz;zb((%=v9zzb93%WyW@F%#N0Ix zZf;*l`o-l)SIxNrN`IEak>?Mjwf(A6FLU_T37ef)2{dv!TyqAXNOS=X5~K51q{PJPJ5&RgYlZxej2CU1RozwEH>A=^aR<7^BT Yvv*KFIRST|-};XdEr<{t<|SnP10(^qA^-pY diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_search.png b/app/src/main/res/drawable-xhdpi/ic_menu_search.png index fcd26fbb9129155084f33e3c8c949707046f8cb2..04571d8d8307043509e132ebbe76a388b21dc498 100644 GIT binary patch literal 1625 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 diff --git a/app/src/main/res/drawable/shap_search_left.xml b/app/src/main/res/drawable/shap_search_left.xml index dbd3ef9..a648f28 100644 --- a/app/src/main/res/drawable/shap_search_left.xml +++ b/app/src/main/res/drawable/shap_search_left.xml @@ -1,7 +1,7 @@ - + - + @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="关于" - android:textColor="#ffffff" + android:textColor="@color/default_text_color" android:textSize="@dimen/activity_font_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -85,7 +85,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="36dp" android:text="版权申明" - android:textColor="#FE6045" + android:textColor="@color/default_color" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_copyright.xml b/app/src/main/res/layout-land/activity_copyright.xml similarity index 100% rename from app/src/main/res/layout/activity_copyright.xml rename to app/src/main/res/layout-land/activity_copyright.xml diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout-land/activity_details.xml similarity index 97% rename from app/src/main/res/layout/activity_details.xml rename to app/src/main/res/layout-land/activity_details.xml index 43e2c6e..d729d30 100644 --- a/app/src/main/res/layout/activity_details.xml +++ b/app/src/main/res/layout-land/activity_details.xml @@ -9,7 +9,7 @@ @@ -42,6 +42,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" + android:overScrollMode="never" android:background="@color/white"> diff --git a/app/src/main/res/layout/activity_kind_detail.xml b/app/src/main/res/layout-land/activity_kind_detail.xml similarity index 96% rename from app/src/main/res/layout/activity_kind_detail.xml rename to app/src/main/res/layout-land/activity_kind_detail.xml index 638c124..9f8424d 100644 --- a/app/src/main/res/layout/activity_kind_detail.xml +++ b/app/src/main/res/layout-land/activity_kind_detail.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/layout/activity_local_manager.xml b/app/src/main/res/layout-land/activity_local_manager.xml similarity index 96% rename from app/src/main/res/layout/activity_local_manager.xml rename to app/src/main/res/layout-land/activity_local_manager.xml index f049bc2..85ed010 100644 --- a/app/src/main/res/layout/activity_local_manager.xml +++ b/app/src/main/res/layout-land/activity_local_manager.xml @@ -10,7 +10,7 @@ android:id="@+id/linearLayout2" android:layout_width="match_parent" android:layout_height="@dimen/activity_title_height" - android:background="@drawable/background_title" + android:background="@color/white" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -33,7 +33,7 @@ android:gravity="center_vertical" android:singleLine="true" android:text="本地管理" - android:textColor="@color/white" + android:textColor="@color/default_text_color" android:textSize="17sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..5c0bfc4 --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_searcher.xml b/app/src/main/res/layout-land/activity_searcher.xml similarity index 95% rename from app/src/main/res/layout/activity_searcher.xml rename to app/src/main/res/layout-land/activity_searcher.xml index 99d63d7..61eb786 100644 --- a/app/src/main/res/layout/activity_searcher.xml +++ b/app/src/main/res/layout-land/activity_searcher.xml @@ -10,7 +10,7 @@ android:id="@+id/linearLayout3" android:layout_width="match_parent" android:layout_height="@dimen/activity_title_height" - android:background="@drawable/background_title" + android:background="@color/white" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -31,7 +31,7 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/dp_40" - android:textColor="@color/white" + android:textColor="@color/default_text_color" app:iconifiedByDefault="false" app:queryHint="@string/search_edit" app:searchIcon="@drawable/ic_menu_search"> diff --git a/app/src/main/res/layout/fragment_collect.xml b/app/src/main/res/layout-land/fragment_collect.xml similarity index 100% rename from app/src/main/res/layout/fragment_collect.xml rename to app/src/main/res/layout-land/fragment_collect.xml diff --git a/app/src/main/res/layout/fragment_download_record.xml b/app/src/main/res/layout-land/fragment_download_record.xml similarity index 100% rename from app/src/main/res/layout/fragment_download_record.xml rename to app/src/main/res/layout-land/fragment_download_record.xml diff --git a/app/src/main/res/layout/fragment_downloadfinish.xml b/app/src/main/res/layout-land/fragment_downloadfinish.xml similarity index 100% rename from app/src/main/res/layout/fragment_downloadfinish.xml rename to app/src/main/res/layout-land/fragment_downloadfinish.xml diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout-land/fragment_downloading.xml similarity index 100% rename from app/src/main/res/layout/fragment_downloading.xml rename to app/src/main/res/layout-land/fragment_downloading.xml diff --git a/app/src/main/res/layout/fragment_featured.xml b/app/src/main/res/layout-land/fragment_featured.xml similarity index 100% rename from app/src/main/res/layout/fragment_featured.xml rename to app/src/main/res/layout-land/fragment_featured.xml diff --git a/app/src/main/res/layout/fragment_kind.xml b/app/src/main/res/layout-land/fragment_kind.xml similarity index 100% rename from app/src/main/res/layout/fragment_kind.xml rename to app/src/main/res/layout-land/fragment_kind.xml diff --git a/app/src/main/res/layout/fragment_kind_detail.xml b/app/src/main/res/layout-land/fragment_kind_detail.xml similarity index 100% rename from app/src/main/res/layout/fragment_kind_detail.xml rename to app/src/main/res/layout-land/fragment_kind_detail.xml diff --git a/app/src/main/res/layout/fragment_localapp.xml b/app/src/main/res/layout-land/fragment_localapp.xml similarity index 100% rename from app/src/main/res/layout/fragment_localapp.xml rename to app/src/main/res/layout-land/fragment_localapp.xml diff --git a/app/src/main/res/layout/fragment_manage.xml b/app/src/main/res/layout-land/fragment_manage.xml similarity index 100% rename from app/src/main/res/layout/fragment_manage.xml rename to app/src/main/res/layout-land/fragment_manage.xml diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout-land/fragment_rank.xml similarity index 100% rename from app/src/main/res/layout/fragment_rank.xml rename to app/src/main/res/layout-land/fragment_rank.xml diff --git a/app/src/main/res/layout/include_line_horizontal.xml b/app/src/main/res/layout-land/include_line_horizontal.xml similarity index 100% rename from app/src/main/res/layout/include_line_horizontal.xml rename to app/src/main/res/layout-land/include_line_horizontal.xml diff --git a/app/src/main/res/layout/include_line_vertical.xml b/app/src/main/res/layout-land/include_line_vertical.xml similarity index 100% rename from app/src/main/res/layout/include_line_vertical.xml rename to app/src/main/res/layout-land/include_line_vertical.xml diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout-land/item_app.xml similarity index 95% rename from app/src/main/res/layout/item_app.xml rename to app/src/main/res/layout-land/item_app.xml index 3f0709d..a983ea0 100644 --- a/app/src/main/res/layout/item_app.xml +++ b/app/src/main/res/layout-land/item_app.xml @@ -72,8 +72,8 @@