From cb2fbe307ce8044aa7f327ceafac4bd5dbe99072 Mon Sep 17 00:00:00 2001 From: hukang hwx963878 <252664817@qq.com> Date: Tue, 27 Apr 2021 11:40:51 +0800 Subject: [PATCH] mindsporeInHand 1.2.8 verson add dance mindsporeInHand 1.2.8 verson add dance version 1.2.8 delete some codes --- .../lite/MindSpore_inhand/app/.gitignore | 2 + .../lite/MindSpore_inhand/app/build.gradle | 5 +- .../app/src/main/AndroidManifest.xml | 45 --- .../ui/college/CollegeFragment.java | 17 +- .../ui/experience/VisionFragment.java | 10 +- .../himindspore/ui/guide/SplashActivity.java | 2 +- .../himindspore/ui/main/MainActivity.java | 10 +- ...senter.java => MainActivityPresenter.java} | 14 +- .../himindspore/ui/main/MainContract.java | 4 +- .../himindspore/ui/me/MeFragment.java | 9 +- .../ui/view/IconButtonStyleView.java | 49 +++ .../ui/view/LeftImageRightTextButton.java | 22 -- .../himindspore/ui/view/MyButton.java | 22 -- .../ui/webview/CollegeBrokensideActivity.java | 80 ---- .../ui/webview/CollegeFAQActivity.java | 81 ---- .../ui/webview/CollegeForumActivity.java | 81 ---- .../ui/webview/CollegeOneHourActivity.java | 81 ---- .../CollegePerformReasoningActivity.java | 81 ---- .../CollegeReferencevideoActivity.java | 81 ---- .../webview/CollegeTrainingmodelActivity.java | 84 ----- .../ui/webview/MeCodeRepositoryActivity.java | 80 ---- .../ui/webview/MeOfficialwebsiteActivity.java | 82 ---- .../ui/webview/MeProblemFeedbackActivity.java | 82 ---- .../ui/webview/MeThumbsupActivity.java | 82 ---- .../ui/webview/WebViewUtilsActivity.java | 65 +++- .../res/layout/activity_web_view_utils.xml | 11 +- .../res/layout/btn_left_iamge_right_text.xml | 35 -- ...{my_button.xml => button_style_layout.xml} | 13 +- .../src/main/res/layout/fragment_vision.xml | 15 +- .../image_intelligent_poetry_layout.xml | 36 -- .../app/src/main/res/values-en/strings.xml | 4 +- .../app/src/main/res/values-zh/strings.xml | 4 +- .../app/src/main/res/values/attrs.xml | 6 + .../app/src/main/res/values/strings.xml | 4 +- .../lite/MindSpore_inhand/common/build.gradle | 9 + .../common/base/adapter/BasePagerAdapter.java | 29 +- .../grid/MSGridSpacingItemDecoration.java | 15 + .../common/base/mvp}/BaseActivity.java | 6 +- .../base/mvp/BaseActivityPresenter.java | 21 ++ .../common/base/mvp/BaseFragment.java | 22 ++ .../base/mvp/BaseFragmentPresenter.java} | 7 +- .../common}/net/FileDownLoadObserver.java | 2 +- .../mindspore/common}/net/RetrofitHelper.java | 6 +- .../common}/net/RetrofitService.java | 9 +- .../mindspore/common}/net/UpdateInfoBean.java | 2 +- .../com/mindspore/common/sp/Preferences.java | 15 + .../mindspore/common/utils/DisplayUtil.java | 15 + .../mindspore/common/utils/ImageUtils.java | 15 + .../mindspore/common/utils/StringUtils.java | 15 + .../common/src/main/res/values-en/strings.xml | 2 + .../common/src/main/res/values-zh/strings.xml | 3 + .../common/src/main/res/values/strings.xml | 3 + .../lite/MindSpore_inhand/dance/.gitignore | 1 + .../lite/MindSpore_inhand/dance/build.gradle | 67 ++++ .../MindSpore_inhand/dance/proguard-rules.pro | 21 ++ .../dance/src/main/AndroidManifest.xml | 15 + .../dance/algorithm/ModelDataBean.java | 155 ++++++++ .../dance/algorithm/ModelDataUtils.java | 349 ++++++++++++++++++ .../com/mindspore/dance/global/Constants.java | 26 ++ .../com/mindspore/dance/global/Variables.java | 23 ++ .../dance/present/video/MyVideoView.java | 116 ++++++ .../mindspore/dance/task/GoneViewTask.java | 48 +++ .../com/mindspore/dance/task/SampleTask.java | 134 +++++++ .../java/com/mindspore/dance/util/Tools.java | 206 +++++++++++ .../mindspore/dance/view/DanceActivity.java} | 44 ++- .../dance/view/fragment/PrepareFragment.java | 207 +++++++++++ .../dance/view/fragment/ResultFragment.java | 100 +++++ .../dance/view/fragment/RunFragment.java | 230 ++++++++++++ .../dance/view/mvp/PrepareContract.java | 30 ++ .../dance/view/mvp/PreparePresenter.java | 50 +++ .../main/res/drawable-v24/begin_run_bt.png | Bin 0 -> 25928 bytes .../main/res/drawable-v24/button_begin.png | Bin 0 -> 12255 bytes .../main/res/drawable-v24/button_complete.png | Bin 0 -> 118145 bytes .../src/main/res/drawable-v24/play_again.png | Bin 0 -> 21131 bytes .../dance/src/main/res/drawable-v24/save.png | Bin 0 -> 25589 bytes .../src/main/res/drawable/countdown_one.png | Bin 0 -> 299393 bytes .../src/main/res/drawable/countdown_three.png | Bin 0 -> 303369 bytes .../src/main/res/drawable/countdown_two.png | Bin 0 -> 302089 bytes .../src/main/res/drawable/dance_back.png | Bin 0 -> 16136 bytes .../src/main/res/drawable/prepare_bk.png | Bin 0 -> 199683 bytes .../dance/src/main/res/drawable/result_bk.png | Bin 0 -> 135935 bytes .../dance/src/main/res/drawable/run_bk.png | Bin 0 -> 32652 bytes .../dance/src/main/res/drawable/thumbnail.PNG | Bin 0 -> 903642 bytes .../src/main/res/layout/activity_dance.xml | 8 + .../src/main/res/layout/content_dance.xml | 18 + .../src/main/res/layout/fragment_prepare.xml | 30 ++ .../src/main/res/layout/fragment_result.xml | 79 ++++ .../src/main/res/layout/fragment_run.xml | 15 + .../dance/src/main/res/menu/menu_main.xml | 10 + .../src/main/res/navigation/nav_dance.xml | 38 ++ .../src/main/res/values-night/themes.xml | 16 + .../dance/src/main/res/values/colors.xml | 10 + .../dance/src/main/res/values/dimens.xml | 3 + .../dance/src/main/res/values/strings.xml | 34 ++ .../dance/src/main/res/values/themes.xml | 30 ++ .../lite/MindSpore_inhand/hms/senceDetection | 207 ----------- .../hms/src/main/AndroidManifest.xml | 8 - .../ImageSegmentationLiveAnalyseActivity.java | 3 +- .../hms/camera/MLSegmentGraphic.java | 22 +- .../TextRecognitionActivity.java | 6 - .../VideoTextRecognitionActivity.java | 150 -------- .../TextTranslationActivity.java | 5 - .../res/layout/activity_text_recognition.xml | 38 +- .../res/layout/activity_text_translation.xml | 14 - .../activity_text_translation_real_time.xml | 33 -- .../layout/activity_video_textrecognition.xml | 34 -- .../lite/MindSpore_inhand/settings.gradle | 1 + 107 files changed, 2458 insertions(+), 1671 deletions(-) rename model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/{MainPresenter.java => MainActivityPresenter.java} (88%) create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/IconButtonStyleView.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/LeftImageRightTextButton.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/MyButton.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeBrokensideActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeFAQActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeForumActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeOneHourActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegePerformReasoningActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeReferencevideoActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeTrainingmodelActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeCodeRepositoryActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeOfficialwebsiteActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeProblemFeedbackActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeThumbsupActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/btn_left_iamge_right_text.xml rename model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/{my_button.xml => button_style_layout.xml} (73%) delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/image_intelligent_poetry_layout.xml rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore/base => common/src/main/java/com/mindspore/common/base/mvp}/BaseActivity.java (83%) create mode 100644 model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/base/mvp/BaseActivityPresenter.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/base/mvp/BaseFragment.java rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore/base/BasePresenter.java => common/src/main/java/com/mindspore/common/base/mvp/BaseFragmentPresenter.java} (80%) rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore => common/src/main/java/com/mindspore/common}/net/FileDownLoadObserver.java (98%) rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore => common/src/main/java/com/mindspore/common}/net/RetrofitHelper.java (92%) rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore => common/src/main/java/com/mindspore/common}/net/RetrofitService.java (86%) rename model_zoo/official/lite/MindSpore_inhand/{app/src/main/java/com/mindspore/himindspore => common/src/main/java/com/mindspore/common}/net/UpdateInfoBean.java (98%) create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/.gitignore create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/build.gradle create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/proguard-rules.pro create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/AndroidManifest.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/algorithm/ModelDataBean.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/algorithm/ModelDataUtils.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/global/Constants.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/global/Variables.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/present/video/MyVideoView.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/task/GoneViewTask.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/task/SampleTask.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/util/Tools.java rename model_zoo/official/lite/MindSpore_inhand/{hms/src/main/java/com/mindspore/hms/texttranslation/TextTranslationRealTimeActivity.java => dance/src/main/java/com/mindspore/dance/view/DanceActivity.java} (52%) create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/view/fragment/PrepareFragment.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/view/fragment/ResultFragment.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/view/fragment/RunFragment.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/view/mvp/PrepareContract.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/java/com/mindspore/dance/view/mvp/PreparePresenter.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable-v24/begin_run_bt.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable-v24/button_begin.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable-v24/button_complete.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable-v24/play_again.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable-v24/save.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/countdown_one.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/countdown_three.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/countdown_two.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/dance_back.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/prepare_bk.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/result_bk.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/run_bk.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/drawable/thumbnail.PNG create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/layout/activity_dance.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/layout/content_dance.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/layout/fragment_prepare.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/layout/fragment_result.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/layout/fragment_run.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/menu/menu_main.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/navigation/nav_dance.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/values-night/themes.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/values/colors.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/values/dimens.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/values/strings.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/dance/src/main/res/values/themes.xml delete mode 100644 model_zoo/official/lite/MindSpore_inhand/hms/senceDetection delete mode 100644 model_zoo/official/lite/MindSpore_inhand/hms/src/main/java/com/mindspore/hms/textrecognition/VideoTextRecognitionActivity.java delete mode 100644 model_zoo/official/lite/MindSpore_inhand/hms/src/main/res/layout/activity_text_translation_real_time.xml delete mode 100644 model_zoo/official/lite/MindSpore_inhand/hms/src/main/res/layout/activity_video_textrecognition.xml diff --git a/model_zoo/official/lite/MindSpore_inhand/app/.gitignore b/model_zoo/official/lite/MindSpore_inhand/app/.gitignore index b065306da6..0f384168e5 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/.gitignore +++ b/model_zoo/official/lite/MindSpore_inhand/app/.gitignore @@ -1,2 +1,4 @@ /build /src/main/cpp/mindspore-lite-1.0.0-minddata-arm64-cpu/ +/release/ + diff --git a/model_zoo/official/lite/MindSpore_inhand/app/build.gradle b/model_zoo/official/lite/MindSpore_inhand/app/build.gradle index 2edff3dbc6..b5d4de2e48 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/build.gradle +++ b/model_zoo/official/lite/MindSpore_inhand/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.mindspore.himindspore" minSdkVersion 21 targetSdkVersion 30 - versionCode 14 - versionName "1.2.7" + versionCode 15 + versionName "1.2.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" javaCompileOptions { @@ -80,4 +80,5 @@ dependencies { implementation project(':imageObject') implementation project(':styletransfer') implementation project(':hms') + implementation project(':dance') } diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/AndroidManifest.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/AndroidManifest.xml index ab90d15c58..99b514ad31 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/AndroidManifest.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/AndroidManifest.xml @@ -29,51 +29,6 @@ android:name=".ui.webview.WebViewUtilsActivity" android:screenOrientation="portrait" android:theme="@style/Theme.AppCompat.NoActionBar" /> - - - - - - - - - - - implements MainContract.View { +public class MainActivity extends BaseActivity implements MainContract.View { private static final String TAG = "MainActivity"; private ViewPager mVpHome; @@ -61,7 +61,7 @@ public class MainActivity extends BaseActivity implements MainCon @Override protected void init() { - presenter = new MainPresenter(this); + presenter = new MainActivityPresenter(this); mVpHome = findViewById(R.id.vp_home); mTabLayout = findViewById(R.id.tab_layout); showPackaeInfo(); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainPresenter.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainActivityPresenter.java similarity index 88% rename from model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainPresenter.java rename to model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainActivityPresenter.java index d1e2bf3d18..a296371dbd 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainPresenter.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainActivityPresenter.java @@ -18,13 +18,13 @@ package com.mindspore.himindspore.ui.main; import android.content.res.TypedArray; import android.util.Log; +import com.mindspore.common.base.mvp.BaseActivityPresenter; import com.mindspore.common.utils.Utils; import com.mindspore.himindspore.R; -import com.mindspore.himindspore.base.BasePresenter; import com.mindspore.himindspore.bean.TabEntity; -import com.mindspore.himindspore.net.FileDownLoadObserver; -import com.mindspore.himindspore.net.RetrofitHelper; -import com.mindspore.himindspore.net.UpdateInfoBean; +import com.mindspore.common.net.FileDownLoadObserver; +import com.mindspore.common.net.RetrofitHelper; +import com.mindspore.common.net.UpdateInfoBean; import com.mindspore.himindspore.ui.view.MSTabEntity; import java.io.File; @@ -37,14 +37,14 @@ import retrofit2.Callback; import retrofit2.Response; -public class MainPresenter extends BasePresenter implements MainContract.Presenter { +public class MainActivityPresenter extends BaseActivityPresenter implements MainContract.Presenter { - private static final String TAG = "MainPresenter"; + private static final String TAG = "MainActivityPresenter"; private MainContract.View mView; private RetrofitHelper retrofitHelper; - public MainPresenter(MainContract.View androidView) { + public MainActivityPresenter(MainContract.View androidView) { this.mView = androidView; retrofitHelper = new RetrofitHelper(); } diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainContract.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainContract.java index e6b29ee788..79eb1237e3 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainContract.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/main/MainContract.java @@ -15,8 +15,8 @@ */ package com.mindspore.himindspore.ui.main; -import com.mindspore.himindspore.net.FileDownLoadObserver; -import com.mindspore.himindspore.net.UpdateInfoBean; +import com.mindspore.common.net.FileDownLoadObserver; +import com.mindspore.common.net.UpdateInfoBean; import com.mindspore.himindspore.ui.view.MSTabEntity; import java.io.File; diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MeFragment.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MeFragment.java index b59c0f2502..85a2f019ca 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MeFragment.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MeFragment.java @@ -31,6 +31,7 @@ import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.launcher.ARouter; import com.mindspore.common.config.MSLinkUtils; import com.mindspore.himindspore.R; +import com.mindspore.himindspore.ui.webview.WebViewUtilsActivity; public class MeFragment extends Fragment implements View.OnClickListener { @@ -88,16 +89,16 @@ public class MeFragment extends Fragment implements View.OnClickListener { onClickShare(); break; case R.id.rl_me_thumbsup: - ARouter.getInstance().build("/app/MeThumbsupActivity").navigation(); + startActivity(new Intent(getActivity(), WebViewUtilsActivity.class).putExtra("WebView", MSLinkUtils.ME_STAR_URL)); break; case R.id.rl_me_official: - ARouter.getInstance().build("/app/MeOfficialwebsiteActivity").navigation(); + startActivity(new Intent(getActivity(), WebViewUtilsActivity.class).putExtra("WebView", MSLinkUtils.BASE_URL)); break; case R.id.rl_me_official_code: - ARouter.getInstance().build("/app/MeCodeRepositoryActivity").navigation(); + startActivity(new Intent(getActivity(), WebViewUtilsActivity.class).putExtra("WebView", MSLinkUtils.ME_CODE_URL)); break; case R.id.rl_me_qa: - ARouter.getInstance().build("/app/MeProblemFeedbackActivity").navigation(); + startActivity(new Intent(getActivity(), WebViewUtilsActivity.class).putExtra("WebView", MSLinkUtils.ME_HELP_URL)); break; case R.id.me_user_protocol: ARouter.getInstance().build("/app/PrivacyPolicyActivity").navigation(); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/IconButtonStyleView.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/IconButtonStyleView.java new file mode 100644 index 0000000000..eef02dd69d --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/IconButtonStyleView.java @@ -0,0 +1,49 @@ +package com.mindspore.himindspore.ui.view; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.widget.ImageView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.mindspore.himindspore.R; + +public class IconButtonStyleView extends RelativeLayout { + + private RelativeLayout mBtnView; + private ImageView mBtnImage; + private TextView mBtnTextName, mBtnTextAngle; + private CharSequence text_name, text_angle; + private Drawable btn_icon; + + public IconButtonStyleView(Context context) { + super(context); + } + + public IconButtonStyleView(Context context, AttributeSet attrs) { + super(context, attrs); + TypedArray btnStyle = context.obtainStyledAttributes(attrs, R.styleable.iconButtonStyle); + btn_icon = btnStyle.getDrawable(R.styleable.iconButtonStyle_buttonImage); + text_name = btnStyle.getText(R.styleable.iconButtonStyle_buttonTextName); + text_angle = btnStyle.getText(R.styleable.iconButtonStyle_buttonTextAngle); + + btnStyle.recycle(); + } + + @Override + protected void onFinishInflate() { + super.onFinishInflate(); + mBtnView = (RelativeLayout) LayoutInflater.from(getContext()).inflate(R.layout.button_style_layout, this, true); + + mBtnImage = mBtnView.findViewById(R.id.btnImage); + mBtnTextName = mBtnView.findViewById(R.id.textName); + mBtnTextAngle = mBtnView.findViewById(R.id.textAngle); + + mBtnImage.setImageDrawable(btn_icon); + mBtnTextName.setText(text_name); + mBtnTextAngle.setText(text_angle); + } +} diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/LeftImageRightTextButton.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/LeftImageRightTextButton.java deleted file mode 100644 index d1c83d96f7..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/LeftImageRightTextButton.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mindspore.himindspore.ui.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.widget.RelativeLayout; -import androidx.annotation.Nullable; - -import com.mindspore.himindspore.R; - -public class LeftImageRightTextButton extends RelativeLayout { - - public LeftImageRightTextButton(Context context) - { - super(context, null); - } - - public LeftImageRightTextButton(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - LayoutInflater.from(context).inflate(R.layout.btn_left_iamge_right_text, this,true); - } -} diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/MyButton.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/MyButton.java deleted file mode 100644 index f8ad5563c4..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/view/MyButton.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mindspore.himindspore.ui.view; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.LayoutInflater; -import android.widget.RelativeLayout; -import androidx.annotation.Nullable; - -import com.mindspore.himindspore.R; - -public class MyButton extends RelativeLayout { - - public MyButton(Context context) - { - super(context, null); - } - - public MyButton(Context context, @Nullable AttributeSet attrs) { - super(context, attrs); - LayoutInflater.from(context).inflate(R.layout.my_button, this,true); - } -} diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeBrokensideActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeBrokensideActivity.java deleted file mode 100644 index a4428463f8..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeBrokensideActivity.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - - -@Route(path = "/app/CollegeBrokensideActivity") -public class CollegeBrokensideActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_brokenside); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.brokenside_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - WebSettings wSet = mWebView.getSettings(); - wSet.setJavaScriptEnabled(true); - wSet.setDomStorageEnabled(true); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_QUICK_APP); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeFAQActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeFAQActivity.java deleted file mode 100644 index 5291605a55..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeFAQActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegeFAQActivity") -public class CollegeFAQActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_f_a_q); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.CollegeFAQActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_MAIN_FAQ); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeForumActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeForumActivity.java deleted file mode 100644 index af16211811..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeForumActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegeForumActivity") -public class CollegeForumActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_forum); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.CollegeForumActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_MAIN_ASK); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeOneHourActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeOneHourActivity.java deleted file mode 100644 index 55760c6b8a..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeOneHourActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegeOneHourActivity") -public class CollegeOneHourActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_one_hour); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.OneHour_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_MAIN_CLOUD); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegePerformReasoningActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegePerformReasoningActivity.java deleted file mode 100644 index 39fd05233a..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegePerformReasoningActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegePerformReasoningActivity") -public class CollegePerformReasoningActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_perform_reasoning); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.perform_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient(){ - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if(newProgress==100){ - progressBar.setVisibility(View.GONE); - } - else{ - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_QUICK_EXECUTE); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeReferencevideoActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeReferencevideoActivity.java deleted file mode 100644 index ab9c28c7f0..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeReferencevideoActivity.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegeReferencevideoActivity") -public class CollegeReferencevideoActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_referencevideo); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.referencevideo_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_QUICK_VIDEO); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeTrainingmodelActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeTrainingmodelActivity.java deleted file mode 100644 index 5168163151..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/CollegeTrainingmodelActivity.java +++ /dev/null @@ -1,84 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.CookieManager; -import android.webkit.WebChromeClient; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/CollegeTrainingmodelActivity") -public class CollegeTrainingmodelActivity extends AppCompatActivity { - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_college_trainingmodel); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.Trainingmodel_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - mWebView.setWebChromeClient(new WebChromeClient()); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.getSettings().setJavaScriptEnabled(true); - mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - CookieManager cookieManager = CookieManager.getInstance(); - cookieManager.setAcceptThirdPartyCookies(mWebView, true); - mWebView.setLayerType(View.LAYER_TYPE_SOFTWARE, null); - } - mWebView.loadUrl(MSLinkUtils.COLLEGE_QUICK_TRAIN); - - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeCodeRepositoryActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeCodeRepositoryActivity.java deleted file mode 100644 index 716c76c1e3..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeCodeRepositoryActivity.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/MeCodeRepositoryActivity") -public class MeCodeRepositoryActivity extends AppCompatActivity { - - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_me_code_repository); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.MeCodeRepositoryActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - WebSettings wSet = mWebView.getSettings(); - wSet.setJavaScriptEnabled(true); - wSet.setDomStorageEnabled(true); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.ME_CODE_URL); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeOfficialwebsiteActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeOfficialwebsiteActivity.java deleted file mode 100644 index bc5777a5f4..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeOfficialwebsiteActivity.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/MeOfficialwebsiteActivity") -public class MeOfficialwebsiteActivity extends AppCompatActivity { - - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_me_officialwebsite); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.MeOfficialwebsiteActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - WebSettings wSet = mWebView.getSettings(); - wSet.setJavaScriptEnabled(true); - wSet.setDomStorageEnabled(true); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.BASE_URL); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeProblemFeedbackActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeProblemFeedbackActivity.java deleted file mode 100644 index bf70ef1e75..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeProblemFeedbackActivity.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/MeProblemFeedbackActivity") -public class MeProblemFeedbackActivity extends AppCompatActivity { - - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_me_problem_feedback); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.MeProblemFeedbackActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - WebSettings wSet = mWebView.getSettings(); - wSet.setJavaScriptEnabled(true); - wSet.setDomStorageEnabled(true); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.ME_HELP_URL); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeThumbsupActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeThumbsupActivity.java deleted file mode 100644 index 9e6724b013..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/MeThumbsupActivity.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2021 Huawei Technologies Co., Ltd - *

- * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mindspore.himindspore.ui.webview; - -import android.os.Build; -import android.os.Bundle; -import android.view.View; -import android.webkit.WebChromeClient; -import android.webkit.WebSettings; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import android.widget.ProgressBar; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.mindspore.common.config.MSLinkUtils; -import com.mindspore.himindspore.R; - -@Route(path = "/app/MeThumbsupActivity") -public class MeThumbsupActivity extends AppCompatActivity { - - private WebView mWebView; - private ProgressBar progressBar; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_me_thumbsup); - initView(); - } - - private void initView() { - progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.MeThumbsupActivity_toolbar); - mToolbar.setNavigationOnClickListener(view -> finish()); - mWebView = findViewById(R.id.mWebView); - WebSettings wSet = mWebView.getSettings(); - wSet.setJavaScriptEnabled(true); - wSet.setDomStorageEnabled(true); - mWebView.setWebViewClient(new WebViewClient()); - mWebView.setWebChromeClient(new WebChromeClient() { - @Override - public void onProgressChanged(WebView view, int newProgress) { - - - if (newProgress == 100) { - progressBar.setVisibility(View.GONE); - } else { - progressBar.setVisibility(View.VISIBLE); - progressBar.setProgress(newProgress); - } - - } - }); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); - } - mWebView.loadUrl(MSLinkUtils.ME_STAR_URL); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - mWebView.removeAllViews(); - mWebView.destroy(); - } -} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/WebViewUtilsActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/WebViewUtilsActivity.java index 85988b76c0..42a33cff9e 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/WebViewUtilsActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/webview/WebViewUtilsActivity.java @@ -27,40 +27,39 @@ import android.widget.ProgressBar; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import com.mindspore.common.config.MSLinkUtils; import com.mindspore.himindspore.R; public class WebViewUtilsActivity extends AppCompatActivity { private WebView mWebView; private ProgressBar progressBar; - private final String mWebViewUtil = ""; + private Toolbar mToolbar; + private String mWebViewUrl; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_web_view_utils); + mWebViewUrl = getIntent().getStringExtra("WebView"); initView(); } private void initView() { - String mMeThumbsup = getIntent().getStringExtra("MeThumbsup"); - String mMeOfficial = getIntent().getStringExtra("MeOfficial"); - String mMeCodeRepository = getIntent().getStringExtra("MeCodeRepository"); - String mMeProblemFeedback = getIntent().getStringExtra("MeProblemFeedback"); progressBar = findViewById(R.id.progress); - Toolbar mToolbar = findViewById(R.id.OneHour_toolbar); + mToolbar = findViewById(R.id.mWebView_toolbar); mToolbar.setNavigationOnClickListener(view -> finish()); mWebView = findViewById(R.id.mWebView); mWebView.setWebViewClient(new WebViewClient()); mWebView.getSettings().setJavaScriptEnabled(true); mWebView.getSettings().setDomStorageEnabled(true); - mWebView.setWebChromeClient(new WebChromeClient(){ + mWebView.setWebChromeClient(new WebChromeClient() { @Override public void onProgressChanged(WebView view, int newProgress) { - if(newProgress==100){ + + if (newProgress == 100) { progressBar.setVisibility(View.GONE); - } - else{ + } else { progressBar.setVisibility(View.VISIBLE); progressBar.setProgress(newProgress); } @@ -69,6 +68,52 @@ public class WebViewUtilsActivity extends AppCompatActivity { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); } + showWebViewTitle(mWebViewUrl); + mWebView.loadUrl(mWebViewUrl); + } + + private void showWebViewTitle(String mWebViewUrl) { + switch (mWebViewUrl) { + case MSLinkUtils.ME_STAR_URL: + mToolbar.setTitle(R.string.me_up_title); + break; + case MSLinkUtils.BASE_URL: + mToolbar.setTitle(R.string.me_official_title); + break; + case MSLinkUtils.ME_CODE_URL: + mToolbar.setTitle(R.string.me_official_code_title); + break; + case MSLinkUtils.ME_HELP_URL: + mToolbar.setTitle(R.string.me_qa_title); + break; + case MSLinkUtils.COLLEGE_QUICK_APP: + mToolbar.setTitle(R.string.title_college_broken_side); + break; + case MSLinkUtils.COLLEGE_MAIN_FAQ: + mToolbar.setTitle(R.string.title_college_faq); + break; + case MSLinkUtils.COLLEGE_MAIN_ASK: + mToolbar.setTitle(R.string.title_college_forum); + break; + case MSLinkUtils.COLLEGE_MAIN_CLOUD: + mToolbar.setTitle(R.string.title_college_one_hour); + break; + case MSLinkUtils.COLLEGE_QUICK_EXECUTE: + mToolbar.setTitle(R.string.title_college_perform); + break; + case MSLinkUtils.COLLEGE_QUICK_VIDEO: + mToolbar.setTitle(R.string.title_college_video); + break; + case MSLinkUtils.COLLEGE_QUICK_TRAIN: + mToolbar.setTitle(R.string.title_college_training); + break; + case MSLinkUtils.USER_PRIVACY_RULES: + mToolbar.setTitle(R.string.me_user_agreements); + break; + default: + mToolbar.setTitle(R.string.me_official_title); + break; + } } @Override diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_web_view_utils.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_web_view_utils.xml index 756e1cb6c7..c3a818b8ab 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_web_view_utils.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_web_view_utils.xml @@ -9,7 +9,7 @@ tools:context=".ui.webview.WebViewUtilsActivity"> + + + android:visibility="gone" /> - - - - - - - - - \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/my_button.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/button_style_layout.xml similarity index 73% rename from model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/my_button.xml rename to model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/button_style_layout.xml index 3457ff1d7e..e0c43d3423 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/my_button.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/button_style_layout.xml @@ -4,30 +4,29 @@ android:layout_height="match_parent"> diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_vision.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_vision.xml index 62566efa6e..fe3abe4783 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_vision.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_vision.xml @@ -163,8 +163,8 @@ app:layout_constraintWidth_percent="0.44" /> -