diff --git a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java index f9421fa..d779870 100755 --- a/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java +++ b/baselib/src/main/java/com/tenlionsoft/baselib/constant/PathConfig.java @@ -111,7 +111,7 @@ public class PathConfig { public static final String PATH_MODULE_MAIN_FRAGMENT_GRID = "/modulemain/fragment/grid";//网格员模块 public static final String PATH_MODULE_MAIN_FRAGMENT_SUPERVISION = "/modulemain/fragment/supervision";//监管模块 public static final String PATH_MODULE_MAIN_FRAGMENT_LEADER = "/modulemain/fragment/leader";//领导l模块 - public static final String PATH_MODULE_MAIN_FRAGMENT_USER = "/modulemain/fragment/user"; + //====================Player======================= diff --git a/baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png new file mode 100644 index 0000000..f9fd8fd Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_about_us_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_del_tong.png b/baselib/src/main/res/drawable-xhdpi/ic_del_tong.png index c17cbac..710db95 100644 Binary files a/baselib/src/main/res/drawable-xhdpi/ic_del_tong.png and b/baselib/src/main/res/drawable-xhdpi/ic_del_tong.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_dept_mine_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_dept_mine_icon.png new file mode 100644 index 0000000..61052ac Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_dept_mine_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png new file mode 100644 index 0000000..eea3592 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_draft_title_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png new file mode 100644 index 0000000..6937e90 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_inbox_title_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png new file mode 100644 index 0000000..3db8a06 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_login_out_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_recycle_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_recycle_title_icon.png new file mode 100644 index 0000000..6418eaa Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_recycle_title_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png new file mode 100644 index 0000000..56d1a92 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_schedule_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_send_title_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_send_title_icon.png new file mode 100644 index 0000000..144120c Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_send_title_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_share.png b/baselib/src/main/res/drawable-xhdpi/ic_share.png index e53b930..0a8a5c0 100644 Binary files a/baselib/src/main/res/drawable-xhdpi/ic_share.png and b/baselib/src/main/res/drawable-xhdpi/ic_share.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png new file mode 100644 index 0000000..18885f9 Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_team_mine_icon.png differ diff --git a/baselib/src/main/res/drawable-xhdpi/ic_work_day_icon.png b/baselib/src/main/res/drawable-xhdpi/ic_work_day_icon.png new file mode 100644 index 0000000..48af9be Binary files /dev/null and b/baselib/src/main/res/drawable-xhdpi/ic_work_day_icon.png differ diff --git a/baselib/src/main/res/layout/layout_base_search_cancel_gray.xml b/baselib/src/main/res/layout/layout_base_search_cancel_gray.xml index 5014098..79b050d 100644 --- a/baselib/src/main/res/layout/layout_base_search_cancel_gray.xml +++ b/baselib/src/main/res/layout/layout_base_search_cancel_gray.xml @@ -3,8 +3,9 @@ android:id="@+id/ll_base_search_cancel" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="10dp"> + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:orientation="horizontal"> @@ -29,5 +30,6 @@ android:clickable="true" android:focusable="true" android:text="取消" - android:textColor="@color/gray_text" /> + android:textColor="@color/gray_text" + android:textSize="@dimen/text_16" /> \ No newline at end of file diff --git a/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml b/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml new file mode 100644 index 0000000..ab73155 --- /dev/null +++ b/baselib/src/main/res/layout/layout_base_search_cancel_gray_btn.xml @@ -0,0 +1,25 @@ + + + + + + + \ No newline at end of file diff --git a/mainmodule/src/main/AndroidManifest.xml b/mainmodule/src/main/AndroidManifest.xml index d1644a8..20c04f8 100644 --- a/mainmodule/src/main/AndroidManifest.xml +++ b/mainmodule/src/main/AndroidManifest.xml @@ -57,6 +57,7 @@ android:name=".base.SplashActivity" android:launchMode="singleTop" android:screenOrientation="portrait" + android:theme="@style/FadeAnimActivity" android:windowSoftInputMode="adjustPan|stateHidden"> diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java index c4796af..6e6e4d7 100644 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java +++ b/mainmodule/src/main/java/com/tengshisoft/mainmodule/base/MainTabActivity.java @@ -123,7 +123,7 @@ public class MainTabActivity extends BaseActivity { BaseFragment homeFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_HOME); BaseFragment docFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_DOC); BaseFragment emailFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_EMAIL); - BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER); + BaseFragment userFragment = FragmentUtils.getFragment(PathConfig.PATH_MODULE_OA_FRAGMENT_MINE); mFragments.add(homeFragment); mFragments.add(docFragment); mFragments.add(emailFragment); diff --git a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java b/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java deleted file mode 100644 index 9882f59..0000000 --- a/mainmodule/src/main/java/com/tengshisoft/mainmodule/fragments/MineFragment.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.tengshisoft.mainmodule.fragments; - -import android.view.View; -import android.widget.Button; - -import com.alibaba.android.arouter.facade.annotation.Route; -import com.alibaba.android.arouter.launcher.ARouter; -import com.tengshisoft.mainmodule.R; -import com.tengshisoft.mainmodule.R2; -import com.tenlionsoft.baselib.constant.PathConfig; -import com.tenlionsoft.baselib.core.widget.base.BaseFragment; -import com.tenlionsoft.baselib.utils.LogUtils; - -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.Unbinder; - -/** - * 作者: adam - * 日期: 2022/3/31 - 9:26 上午 - * 邮箱: itgaojian@163.com - * 描述: 个人中心 - */ -@Route(path = PathConfig.PATH_MODULE_MAIN_FRAGMENT_USER) -public class MineFragment extends BaseFragment { - - @BindView(R2.id.btn_login_out) - Button mBtnLoginOut; - @BindView(R2.id.btn_user_record) - Button mBtnUserRecord; - private Unbinder mBind; - - @Override - protected void setDataToView(View dataView) { - mBind = ButterKnife.bind(this, dataView); - LogUtils.e("MineFragment"); - doSync(); - setStateView(STATE_SUCCESS); - mSrlView.setEnableLoadMore(false); - mSrlView.setEnableRefresh(false); - mBtnLoginOut.setOnClickListener(v -> doLoginOut()); - mBtnUserRecord.setOnClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_OA_ACTIVITY_RECORD_USER_DETAIL) - .navigation()); - } - - private void doLoginOut() { - this.mActivity.reStartApp(); - } - - /** - * 同步数据 需要更新9张表 - */ - private void doSync() { - - } - - @Override - protected void refreshView() { - - } - - @Override - protected void loadMoreData() { - - } - - @Override - protected int getContentViewId() { - return R.layout.fragment_mine; - } -} diff --git a/mainmodule/src/main/res/layout/fragment_mine.xml b/mainmodule/src/main/res/layout/fragment_mine.xml deleted file mode 100644 index 5c20a8d..0000000 --- a/mainmodule/src/main/res/layout/fragment_mine.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - -