From 2083a140f418edc35f3cab49ead86445a9c4ab20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E4=B9=BE=E5=B3=B0?= Date: Tue, 13 Jul 2021 15:33:04 +0800 Subject: [PATCH] add space page update sign out Pop-up box --- .../app/src/main/AndroidManifest.xml | 16 ++ .../himindspore/ui/gateway/CaseFragment.java | 3 +- .../himindspore/ui/gateway/TrendFragment.java | 8 +- .../himindspore/ui/guide/SplashActivity.java | 4 +- .../himindspore/ui/me/CacheActivity.java | 8 +- .../himindspore/ui/me/MyBuddyActivity.java | 16 ++ .../himindspore/ui/me/MyCoursesActivity.java | 25 ++ .../himindspore/ui/me/MyQRCodeActivity.java | 1 - .../himindspore/ui/me/PersonalActivity.java | 46 +++- .../himindspore/ui/me/SetActivity.java | 19 +- .../himindspore/ui/me/SpaceActivity.java | 78 ++++++ .../himindspore/ui/me/TasksActivity.java | 25 ++ .../me/fragment/SpaceFavoritesFragment.java | 38 +++ .../ui/me/fragment/SpaceHomeFragment.java | 38 +++ .../ui/webview/WebViewUtilsActivity.java | 1 - .../res/drawable-xxhdpi/personal_space_bg.jpg | Bin 0 -> 63221 bytes .../main/res/drawable-xxhdpi/space_back.png | Bin 0 -> 316 bytes .../main/res/drawable-xxhdpi/space_more.png | Bin 0 -> 286 bytes .../main/res/drawable-xxhdpi/space_search.png | Bin 0 -> 1106 bytes .../res/drawable/component_assembly_bg.xml | 66 ----- .../src/main/res/drawable/set_dialog_bg.xml | 2 +- .../src/main/res/drawable/space_bg_radius.xml | 7 + .../main/res/drawable/space_big_member_bg.xml | 11 + .../drawable/space_edit_button_bg_blue.xml | 9 + .../main/res/layout/activity_buddy_layout.xml | 50 ++++ ....xml => activity_refresh_layout_title.xml} | 15 +- .../src/main/res/layout/activity_space.xml | 58 +++++ .../res/layout/fragment_refresh_layout.xml | 2 +- .../res/layout/fragment_space_favorites.xml | 7 + .../main/res/layout/fragment_space_home.xml | 7 + .../res/layout/layout_personal_user_name.xml | 123 ++++++---- .../main/res/layout/layout_signout_dialog.xml | 2 +- .../res/layout/layout_space_information.xml | 232 ++++++++++++++++++ .../main/res/layout/layout_task_personal.xml | 3 +- .../app/src/main/res/values-en/strings.xml | 7 + .../app/src/main/res/values-zh/strings.xml | 7 + .../app/src/main/res/values/colors.xml | 1 + .../app/src/main/res/values/strings.xml | 8 +- .../mindspore/common/utils/ScreenUtils.java | 19 ++ .../mindspore/customview/ui/AppTitleView.java | 4 +- .../modelcamera/ui/CameraResultActivity.java | 1 - .../modelcamera/ui/MainCameraActivity.java | 1 - .../ui/TextTranslationActivity.java | 1 - 43 files changed, 805 insertions(+), 164 deletions(-) create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyBuddyActivity.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyCoursesActivity.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SpaceActivity.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/TasksActivity.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceFavoritesFragment.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceHomeFragment.java create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/personal_space_bg.jpg create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_back.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_more.png create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_search.png delete mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/component_assembly_bg.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_bg_radius.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_big_member_bg.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_edit_button_bg_blue.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_buddy_layout.xml rename model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/{activity_cache.xml => activity_refresh_layout_title.xml} (57%) create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_space.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_favorites.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_home.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_space_information.xml create mode 100644 model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/utils/ScreenUtils.java 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 906bb33a3a..3af3cf4511 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 @@ -24,6 +24,22 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:replace="android:label"> + + + + implements Ca smartRefreshLayout = view.findViewById(R.id.refreshLayout); multipleStatusView = view.findViewById(R.id.multipleStatusView); mRecyclerView = view.findViewById(R.id.recyclerView); - mFrameLayout = view.findViewById(R.id.trend_layout); + mFrameLayout = view.findViewById(R.id.fragmentRefreshLayout); initView(); } private void initView() { + mFrameLayout.setBackgroundColor(getContext().getResources().getColor(R.color.portal_layout_gray_bg)); smartRefreshLayout.setEnableRefresh(true); smartRefreshLayout.setEnableLoadMore(true); smartRefreshLayout.setEnableHeaderTranslationContent(true); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/gateway/TrendFragment.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/gateway/TrendFragment.java index 23e55c25ae..284a5404ff 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/gateway/TrendFragment.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/gateway/TrendFragment.java @@ -16,6 +16,7 @@ package com.mindspore.himindspore.ui.gateway; import android.content.Context; +import android.graphics.Color; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.util.DisplayMetrics; @@ -54,6 +55,8 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; +import static com.mindspore.himindspore.R.color.*; + /** * A simple {@link Fragment} subclass. * Use the {@link TrendFragment#newInstance} factory method to @@ -110,11 +113,12 @@ public class TrendFragment extends BaseFragment implements T smartRefreshLayout = view.findViewById(R.id.refreshLayout); multipleStatusView = view.findViewById(R.id.multipleStatusView); mRecyclerView = view.findViewById(R.id.recyclerView); - mFrameLayout = view.findViewById(R.id.trend_layout); + mFrameLayout = view.findViewById(R.id.fragmentRefreshLayout); initView(); } private void initView() { + mFrameLayout.setBackgroundColor(getContext().getResources().getColor(R.color.portal_layout_gray_bg)); smartRefreshLayout.setEnableRefresh(true); smartRefreshLayout.setEnableLoadMore(true); smartRefreshLayout.setEnableHeaderTranslationContent(true); @@ -138,7 +142,7 @@ public class TrendFragment extends BaseFragment implements T } }); - smartRefreshLayout.setPrimaryColorsId(R.color.gray_divider, R.color.purple_200); + smartRefreshLayout.setPrimaryColorsId(gray_divider, purple_200); trendAdapter = new TrendAdapter(getContext(), mList); LinearLayoutManager manager = new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false); mRecyclerView.setLayoutManager(manager); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/guide/SplashActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/guide/SplashActivity.java index a0a3edb322..99e1cd738b 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/guide/SplashActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/guide/SplashActivity.java @@ -195,9 +195,7 @@ public class SplashActivity extends BaseActivity implements EasyPermissions.Perm private void showPrivacy() { mContentView = LayoutInflater.from(SplashActivity.this).inflate(R.layout.layout_popup_user, null, false); -// mPopupW = new PopupWindow(mContentView, (int) (getWindowManager().getDefaultDisplay().getWidth() * 0.8), (int) (getWindowManager().getDefaultDisplay() -// .getHeight() * 0.8), false); - mPopupW = new PopupWindow(mContentView, (int) (getWindowManager().getDefaultDisplay().getWidth() * 0.8), WindowManager.LayoutParams.WRAP_CONTENT, false); + mPopupW = new PopupWindow(mContentView, getResources().getDisplayMetrics().widthPixels * 8 / 10, WindowManager.LayoutParams.WRAP_CONTENT, false); mPopupW.showAtLocation(getWindow().getDecorView(), Gravity.CENTER, 0, 0); mPopupW.setContentView(mContentView); mPopupW.setTouchable(true); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/CacheActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/CacheActivity.java index 193924803d..db8932bd90 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/CacheActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/CacheActivity.java @@ -18,7 +18,6 @@ package com.mindspore.himindspore.ui.me; import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; -import android.view.View; import com.mindspore.customview.ui.AppTitleView; import com.mindspore.himindspore.R; @@ -30,12 +29,13 @@ public class CacheActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_cache); + setContentView(R.layout.activity_refresh_layout_title); init(); } private void init() { - appTitle = findViewById(R.id.cache_app_title); - appTitle.setNavigationOnClickListener(view -> finish()); + appTitle = findViewById(R.id.refreshLayoutTitle); + appTitle.setTitleThreeImage(R.drawable.cache_edit); + appTitle.setTitleTextName(getResources().getString(R.string.per_cache)); } } \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyBuddyActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyBuddyActivity.java new file mode 100644 index 0000000000..7e5744c0de --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyBuddyActivity.java @@ -0,0 +1,16 @@ +package com.mindspore.himindspore.ui.me; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.mindspore.himindspore.R; + +public class MyBuddyActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_buddy_layout); + } +} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyCoursesActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyCoursesActivity.java new file mode 100644 index 0000000000..d86ab9cfbf --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyCoursesActivity.java @@ -0,0 +1,25 @@ +package com.mindspore.himindspore.ui.me; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.mindspore.customview.ui.AppTitleView; +import com.mindspore.himindspore.R; + +public class MyCoursesActivity extends AppCompatActivity { + + private AppTitleView appTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_refresh_layout_title); + init(); + } + + private void init(){ + appTitle = findViewById(R.id.refreshLayoutTitle); + appTitle.setTitleTextName(getResources().getString(R.string.per_curriculum)); + } +} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyQRCodeActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyQRCodeActivity.java index 3deaafc3ab..471ac5d1ed 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyQRCodeActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/MyQRCodeActivity.java @@ -43,7 +43,6 @@ public class MyQRCodeActivity extends AppCompatActivity { private void init() { appTitle = findViewById(R.id.segmentation_toolbar); - appTitle.setNavigationOnClickListener(view -> finish()); mMy_layout = (RelativeLayout) findViewById(R.id.my_relativelayout); mQr_code_image = findViewById(R.id.img_origin); setOnClickMore(); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/PersonalActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/PersonalActivity.java index d5c35457fd..34561ed275 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/PersonalActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/PersonalActivity.java @@ -21,10 +21,12 @@ import android.content.Intent; import android.os.Bundle; import android.view.View; +import com.mindspore.common.config.MSLinkUtils; import com.mindspore.customview.ui.TopImageBottomTextView; import com.mindspore.himindspore.R; +import com.mindspore.himindspore.ui.webview.WebViewUtilsActivity; -public class PersonalActivity extends AppCompatActivity { +public class PersonalActivity extends AppCompatActivity implements View.OnClickListener { private TopImageBottomTextView mCurriculum; @@ -32,7 +34,45 @@ public class PersonalActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_personal); - findViewById(R.id.per_set_up).setOnClickListener(view -> startActivity(new Intent(PersonalActivity.this, SetActivity.class))); - findViewById(R.id.per_cache_view).setOnClickListener(view -> startActivity(new Intent(PersonalActivity.this, CacheActivity.class))); + findViewById(R.id.per_set_up).setOnClickListener(this); + findViewById(R.id.per_cache_view).setOnClickListener(this); + findViewById(R.id.per_curriculum_view).setOnClickListener(this); + findViewById(R.id.rewarded_tasks_layout).setOnClickListener(this); + findViewById(R.id.per_user_layout).setOnClickListener(this); + findViewById(R.id.per_gitee_view).setOnClickListener(this); + findViewById(R.id.per_official_view).setOnClickListener(this); + findViewById(R.id.per_award_view).setOnClickListener(this); + } + + @Override + public void onClick(View view) { + switch (view.getId()) { + case R.id.per_set_up: + startActivity(new Intent(PersonalActivity.this, SetActivity.class)); + break; + case R.id.per_cache_view: + startActivity(new Intent(PersonalActivity.this, CacheActivity.class)); + break; + case R.id.per_curriculum_view: + startActivity(new Intent(PersonalActivity.this, MyCoursesActivity.class)); + break; + case R.id.rewarded_tasks_layout: + startActivity(new Intent(PersonalActivity.this, TasksActivity.class)); + break; + case R.id.per_user_layout: + startActivity(new Intent(PersonalActivity.this, SpaceActivity.class)); + break; + case R.id.per_award_view: + startActivity(new Intent(PersonalActivity.this, WebViewUtilsActivity.class).putExtra(MSLinkUtils.INTENT_WEB_VIEW, MSLinkUtils.ME_HELP_URL)); + break; + case R.id.per_gitee_view: + startActivity(new Intent(PersonalActivity.this, WebViewUtilsActivity.class).putExtra(MSLinkUtils.INTENT_WEB_VIEW, MSLinkUtils.ME_CODE_URL)); + break; + case R.id.per_official_view: + startActivity(new Intent(PersonalActivity.this, WebViewUtilsActivity.class).putExtra(MSLinkUtils.INTENT_WEB_VIEW, MSLinkUtils.BASE_URL)); + break; + default: + break; + } } } \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SetActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SetActivity.java index 101509929b..67760afed4 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SetActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SetActivity.java @@ -18,21 +18,15 @@ package com.mindspore.himindspore.ui.me; import androidx.appcompat.app.AppCompatActivity; import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; import android.os.Bundle; import android.util.Log; -import android.view.Display; import android.view.Gravity; -import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; -import android.widget.ToggleButton; -import com.mindspore.customview.ui.AppTitleView; +import com.mindspore.common.utils.ScreenUtils; import com.mindspore.himindspore.R; -import com.mindspore.himindspore.ui.main.MainActivity; public class SetActivity extends AppCompatActivity { @@ -49,8 +43,6 @@ public class SetActivity extends AppCompatActivity { } private void init() { - AppTitleView setTitle = findViewById(R.id.setup_title); - setTitle.setNavigationOnClickListener(view -> finish()); mSignOut = findViewById(R.id.sign_out_view); mSignOut.setOnClickListener(view -> signOutDialog()); } @@ -60,14 +52,13 @@ public class SetActivity extends AppCompatActivity { final View view = getLayoutInflater().inflate(R.layout.layout_signout_dialog, null); dialog = builder.create(); dialog.show(); + dialog.getWindow().setBackgroundDrawableResource(R.drawable.set_dialog_bg); WindowManager.LayoutParams params = dialog.getWindow().getAttributes(); params.gravity = Gravity.TOP; - params.y = 714; - params.width = (int) (getWindowManager().getDefaultDisplay().getWidth() * 0.8); - params.height = (int) (getWindowManager().getDefaultDisplay() - .getHeight() * 0.24); + params.y = ScreenUtils.screenHeight(SetActivity.this) * 32 / 100; + params.width = ScreenUtils.screenWidth(SetActivity.this)* 7 / 10; + params.height = ScreenUtils.screenHeight(SetActivity.this) * 20 / 100; dialog.getWindow().setAttributes(params); - WindowManager.LayoutParams layoutParams = dialog.getWindow().getAttributes(); dialog.setContentView(view); dialog.setCancelable(false); view.findViewById(R.id.dialog_cancel).setOnClickListener(view1 -> { diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SpaceActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SpaceActivity.java new file mode 100644 index 0000000000..7defd1dbeb --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/SpaceActivity.java @@ -0,0 +1,78 @@ +package com.mindspore.himindspore.ui.me; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.TableLayout; + +import com.google.android.material.tabs.TabLayout; +import com.mindspore.common.base.adapter.BasePagerAdapter; +import com.mindspore.himindspore.R; +import com.mindspore.himindspore.ui.gateway.CaseFragment; +import com.mindspore.himindspore.ui.gateway.IntroduceFragment; +import com.mindspore.himindspore.ui.gateway.TrendFragment; +import com.mindspore.himindspore.ui.me.fragment.SpaceFavoritesFragment; +import com.mindspore.himindspore.ui.me.fragment.SpaceHomeFragment; + +import java.util.ArrayList; +import java.util.List; + +public class SpaceActivity extends AppCompatActivity { + + private TabLayout spaceTab; + private ViewPager spaceVp; + private final String TAG = SpaceActivity.class.getSimpleName(); + private final static int[] tabs = {R.string.space_home_page, R.string.space_favorites}; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_space); + spaceTab = findViewById(R.id.space_tab); + spaceVp = findViewById(R.id.space_vp); + initTabLayout(); + initViewPager(); + } + + private void initViewPager() { + + List fList = new ArrayList<>(); + fList.add(SpaceHomeFragment.newInstance()); + fList.add(SpaceFavoritesFragment.newInstance()); + + BasePagerAdapter adapter = new BasePagerAdapter(getSupportFragmentManager(), fList); + spaceVp.setAdapter(adapter); + spaceVp.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(spaceTab)); + spaceVp.setOffscreenPageLimit(2); + } + + private void initTabLayout() { + for (int i = 0; i < tabs.length; i++) { + spaceTab.addTab(spaceTab.newTab().setText(getResources().getString(tabs[i]))); + } + spaceTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { + @Override + public void onTabSelected(TabLayout.Tab tab) { + spaceVp.setCurrentItem(tab.getPosition(), true); + + } + + @Override + public void onTabUnselected(TabLayout.Tab tab) { + + } + + @Override + public void onTabReselected(TabLayout.Tab tab) { + + } + }); + } +} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/TasksActivity.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/TasksActivity.java new file mode 100644 index 0000000000..41301eeafe --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/TasksActivity.java @@ -0,0 +1,25 @@ +package com.mindspore.himindspore.ui.me; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +import com.mindspore.customview.ui.AppTitleView; +import com.mindspore.himindspore.R; + +public class TasksActivity extends AppCompatActivity { + + private AppTitleView appTitle; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_refresh_layout_title); + init(); + } + + private void init(){ + appTitle = findViewById(R.id.refreshLayoutTitle); + appTitle.setTitleTextName(getResources().getString(R.string.per_rewarded_tasks)); + } +} \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceFavoritesFragment.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceFavoritesFragment.java new file mode 100644 index 0000000000..a3db83c2c5 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceFavoritesFragment.java @@ -0,0 +1,38 @@ +package com.mindspore.himindspore.ui.me.fragment; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.mindspore.himindspore.R; + +public class SpaceFavoritesFragment extends Fragment { + + public static SpaceFavoritesFragment newInstance() { + SpaceFavoritesFragment fragment = new SpaceFavoritesFragment(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_space_favorites, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + initView(view); + } + + private void initView(View view) { + + } +} diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceHomeFragment.java b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceHomeFragment.java new file mode 100644 index 0000000000..7d1a3eebe6 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/java/com/mindspore/himindspore/ui/me/fragment/SpaceHomeFragment.java @@ -0,0 +1,38 @@ +package com.mindspore.himindspore.ui.me.fragment; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import com.mindspore.himindspore.R; + +public class SpaceHomeFragment extends Fragment { + + public static SpaceHomeFragment newInstance() { + SpaceHomeFragment fragment = new SpaceHomeFragment(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_space_home, container, false); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + initView(view); + } + + private void initView(View view) { + + } +} 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 110a7ed023..d4ab96b498 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 @@ -49,7 +49,6 @@ public class WebViewUtilsActivity extends AppCompatActivity { private void initView() { progressBar = findViewById(R.id.progress); appTitle = findViewById(R.id.mWebView_toolbar); - appTitle.setNavigationOnClickListener(view -> finish()); mWebView = findViewById(R.id.mWebView); mWebView.getSettings().setJavaScriptEnabled(true); mWebView.getSettings().setDomStorageEnabled(true); diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/personal_space_bg.jpg b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/personal_space_bg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f0336a21c46174f087fd46cb72922e52e53e5ca9 GIT binary patch literal 63221 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 T?{tM~kjp(?{an^LB{Ts5L5^f@ literal 0 HcmV?d00001 diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_more.png b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_more.png new file mode 100644 index 0000000000000000000000000000000000000000..5a832487668dbfb93f6705e29d4fa305e3438567 GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^oItG3!3HGnnkR(;DaPU;cPEB*=VV?2IWDOYo@u_m z3|c@o2Loe!CIbsd2@p#GF#`kh0!9XAAk7F8TfhXDr*@*`j_cK|UscvFy;8qz-|a%MIx+GqVx`bVuY%t+@&Yijn)MHW(nONswAZ4nyux!l>_89Pgg&ebxsLQ E0E7EflK=n! literal 0 HcmV?d00001 diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_search.png b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable-xxhdpi/space_search.png new file mode 100644 index 0000000000000000000000000000000000000000..4279b3fcfacc887ae9e5d043fd1b2001e55f1480 GIT binary patch literal 1106 zcmV-Y1g-mtP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91HlPCl1ONa40RR91HUIzs0P{mGqyPW|yh%hsRA>e5n$2nyK@^2ECNT)E z%udV?E)>jGvJA5@Csp{%m)fpK%#_=!Eh+m*pB#K_IH%`AcT!QD}*@TmPe}eB5 zZu5N~ZnavipL{nH2wH#}@H5N6aiU-FIn-+B!&fRh@E&{xwGwJYRDZ3K zm*5R}6`qDZX!V?DL3#|oZBi%mtHO9xGmHVya zHkhLWezm%~pm>yM7Y7CwU6v{P0)v+HqTXdc@xxaJi$(3K-wCL#hYKAZnBQF$vC0zr z4-I=(Tt@T$VhOV{3}qB`;I84sipyx;Uo2rte_T+SR0k|SR$M_b`GhI=s{@vwQo{5+ z`9bt29SSD62lgE0QH$^|--;oPJ^W9k3q!9pVpc|7*FMSevl}YH)lR}HnF=mvMwvC` zJ{s+VihaVgpQ;0vpATi6OPDr!E?jpNR#0a7d0EOAH*Zrjk1J(``EteOQpN{#=0~-1 z#c$LVUJ(!6Vx(!={q2L`%KU+_rtQZrm(kPL7jbp&pmoe(;Xz+uWiRmJJM;KMeXKJN zpQvB>nJ=p)(;uTpeM+^O2`WYb!gQ{v^F1H5onMAQn^3ibTK%kJ0IK%!l+V!^I%Fer zNP}_ZZm~{+_3*t02b~1dWMm!QB=PO(q7opk&a?ad;Yxk%a6Ma&O!@2RJ5`4 z)@snma*YV=LLauNoNlB5Ur+=+0~NdvLo03?RsXd(y_BEw&45PM5p>AN9gAz+=mn14 zYucS_T=0VeO2lc}`7pHNrcf0uP6wt#0Wywv1loqy0q;=gFoR^&tdSeesd!kaLtIAG YU!=5#la>TINB{r;07*qoM6N<$f@>t}9RL6T literal 0 HcmV?d00001 diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/component_assembly_bg.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/component_assembly_bg.xml deleted file mode 100644 index c5e9142d7c..0000000000 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/component_assembly_bg.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/set_dialog_bg.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/set_dialog_bg.xml index f63798c931..fc78e2de6f 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/set_dialog_bg.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/set_dialog_bg.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_bg_radius.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_bg_radius.xml new file mode 100644 index 0000000000..9dc827e844 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_bg_radius.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_big_member_bg.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_big_member_bg.xml new file mode 100644 index 0000000000..03afc8ba9b --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_big_member_bg.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_edit_button_bg_blue.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_edit_button_bg_blue.xml new file mode 100644 index 0000000000..b0006c6f3f --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/drawable/space_edit_button_bg_blue.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_buddy_layout.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_buddy_layout.xml new file mode 100644 index 0000000000..7abcb47c4a --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_buddy_layout.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_cache.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_refresh_layout_title.xml similarity index 57% rename from model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_cache.xml rename to model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_refresh_layout_title.xml index aa0cc5cf18..56fd5f0a13 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_cache.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_refresh_layout_title.xml @@ -5,15 +5,18 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/white" - tools:context=".ui.me.CacheActivity"> + android:background="@color/white"> + app:iconLeftBlack="@drawable/icon_back"/> + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_space.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_space.xml new file mode 100644 index 0000000000..84ecb05195 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/activity_space.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_refresh_layout.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_refresh_layout.xml index 10f8cf741f..1e107ebe81 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_refresh_layout.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_refresh_layout.xml @@ -1,6 +1,6 @@ diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_favorites.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_favorites.xml new file mode 100644 index 0000000000..fc1a508094 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_favorites.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_home.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_home.xml new file mode 100644 index 0000000000..fc1a508094 --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/fragment_space_home.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_personal_user_name.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_personal_user_name.xml index c5985520ba..b8a0af83c5 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_personal_user_name.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_personal_user_name.xml @@ -5,66 +5,76 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + - + + android:textSize="10dp" + app:layout_constraintStart_toEndOf="@id/per_avatar" + app:layout_constraintTop_toBottomOf="@id/user_name" /> - + + + + + + + + - + app:layout_constraintTop_toBottomOf="@id/per_user_layout" /> + app:layout_constraintTop_toBottomOf="@id/per_user_layout" /> + app:layout_constraintTop_toBottomOf="@id/per_user_layout" /> diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_signout_dialog.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_signout_dialog.xml index a81cfa5a94..1a52234ccb 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_signout_dialog.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_signout_dialog.xml @@ -33,7 +33,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_task_personal.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_task_personal.xml index 2e4027aedd..626a75ebdb 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_task_personal.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/layout/layout_task_personal.xml @@ -43,6 +43,7 @@ app:layout_constraintTop_toBottomOf="@id/per_up" /> diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-en/strings.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-en/strings.xml index 86480aafce..2d11830023 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-en/strings.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-en/strings.xml @@ -142,4 +142,11 @@ Remaining to complete the task space More service + Rewarded tasks + my good friend + Edit material + lauded + Home page + Favorites + Big member \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-zh/strings.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-zh/strings.xml index 5dac900a39..315f4b3912 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-zh/strings.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values-zh/strings.xml @@ -129,4 +129,11 @@ 剩余完成任务 空间 更多服务 + 有奖任务 + 我的好友 + 编辑资料 + 获赞 + 主页 + 收藏 + 大会员 \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/colors.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/colors.xml index 0a261f54a7..9315da37e0 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/colors.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/colors.xml @@ -47,6 +47,7 @@ #66000000 #FBFBFB #F0F0F0 + #EFEFEF #E5E5E5 #E6E6E6 #FFE3F8FE diff --git a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/strings.xml b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/strings.xml index db4826c5ed..b4f9a90836 100644 --- a/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/strings.xml +++ b/model_zoo/official/lite/MindSpore_inhand/app/src/main/res/values/strings.xml @@ -186,5 +186,11 @@ 剩余完成任务 空间 更多服务 - + 有奖任务 + 我的好友 + 编辑资料 + 获赞 + 主页 + 收藏 + 大会员 \ No newline at end of file diff --git a/model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/utils/ScreenUtils.java b/model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/utils/ScreenUtils.java new file mode 100644 index 0000000000..2d6ee300ec --- /dev/null +++ b/model_zoo/official/lite/MindSpore_inhand/common/src/main/java/com/mindspore/common/utils/ScreenUtils.java @@ -0,0 +1,19 @@ +package com.mindspore.common.utils; +import android.content.Context; +import android.util.DisplayMetrics; + + +public class ScreenUtils { + + public static int screenWidth(Context context){ + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + int mScreenWidth = metrics.widthPixels; + return mScreenWidth; + } + + public static int screenHeight(Context context){ + DisplayMetrics metrics = context.getResources().getDisplayMetrics(); + int mScreenHeight = metrics.heightPixels; + return mScreenHeight; + } +} diff --git a/model_zoo/official/lite/MindSpore_inhand/customView/src/main/java/com/mindspore/customview/ui/AppTitleView.java b/model_zoo/official/lite/MindSpore_inhand/customView/src/main/java/com/mindspore/customview/ui/AppTitleView.java index 861476f141..211b952be0 100644 --- a/model_zoo/official/lite/MindSpore_inhand/customView/src/main/java/com/mindspore/customview/ui/AppTitleView.java +++ b/model_zoo/official/lite/MindSpore_inhand/customView/src/main/java/com/mindspore/customview/ui/AppTitleView.java @@ -62,8 +62,10 @@ public class AppTitleView extends LinearLayout { public AppTitleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs); + if (context instanceof Activity) { + this.activity = (Activity) context; + } TypedArray ToolbarTile = context.obtainStyledAttributes(attrs, R.styleable.AppTitleView); - nameTitle = ToolbarTile.getText(R.styleable.AppTitleView_nameTitle); iconLeftBlack = ToolbarTile.getDrawable(R.styleable.AppTitleView_iconLeftBlack); iconRightOne = ToolbarTile.getDrawable(R.styleable.AppTitleView_iconRightOne); diff --git a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/CameraResultActivity.java b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/CameraResultActivity.java index 5026057e4a..43a0ca5846 100644 --- a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/CameraResultActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/CameraResultActivity.java @@ -91,7 +91,6 @@ public class CameraResultActivity extends BaseActivity im appTitle = findViewById(R.id.camera_toolbar); titleName = appTitle.findViewById(R.id.title_name); appTitle.setTitleText(CameraConstants.CAMERA_MODEL[model]); - appTitle.setNavigationOnClickListener(view -> finish()); preImage = findViewById(R.id.preIamge); cancleLayout = findViewById(R.id.cancleLayout); diff --git a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/MainCameraActivity.java b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/MainCameraActivity.java index bb1af3f18d..a7d54472f2 100644 --- a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/MainCameraActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/MainCameraActivity.java @@ -108,7 +108,6 @@ public class MainCameraActivity extends AppCompatActivity implements ICameraPrev private void init() { appTitle = findViewById(R.id.camera_toolbar); - appTitle.setNavigationOnClickListener(view -> finish()); appTitle.setTitleText(CameraConstants.CAMERA_MODEL[model]); viewPager = findViewById(R.id.viewPager); diff --git a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/TextTranslationActivity.java b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/TextTranslationActivity.java index d0b976c946..3bdf71493d 100644 --- a/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/TextTranslationActivity.java +++ b/model_zoo/official/lite/MindSpore_inhand/modelcamera/src/main/java/com/mindspore/modelcamera/ui/TextTranslationActivity.java @@ -102,7 +102,6 @@ public class TextTranslationActivity extends AppCompatActivity { private void init() { AppTitleView appTitle = findViewById(R.id.text_online_activity_toolbar); - appTitle.setNavigationOnClickListener(view -> finish()); mEditText = findViewById(R.id.text_edit); mEditText.setMovementMethod(ScrollingMovementMethod.getInstance()); mTextView = findViewById(R.id.text_view); -- Gitee