提交 49192835 authored 作者: lgd's avatar lgd

1.修改页面样式

2.添加util,华为对象存储引用
3.修改别名问题
上级 e0ca23cf
......@@ -105,4 +105,6 @@ dependencies {
implementation 'cn.jiguang.sdk:jcore:2.1.2'
implementation 'com.huawei.storage:esdk-obs-android:3.1.3'
implementation 'com.blankj:utilcodex:1.29.0'
}
......@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.wd.workoffice">
<uses-permission android:name="com.qdredsoft.ylh.permission.JPUSH_MESSAGE" />
<uses-permission android:name="com.wd.workoffice.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<!-- Optional. Required for location feature -->
......@@ -22,6 +22,7 @@
<uses-permission android:name="com.wd.workoffice.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.GET_TOP_ACTIVITY_INFO" />
<permission
android:name="com.wd.workoffice.permission.JPUSH_MESSAGE"
android:protectionLevel="signature" />
......@@ -38,7 +39,7 @@
android:name=".ui.activity.MainActivity"
android:configChanges="keyboardHidden|orientation"
android:launchMode="singleTask"
android:theme="@style/Work.Base"
android:theme="@style/Work.Base.Main"
android:windowSoftInputMode="adjustPan">
</activity>
<activity
......
......@@ -47,6 +47,7 @@ import butterknife.ButterKnife;
import cn.jpush.android.api.JPushInterface;
import flexible.xd.android_base.base.AppManager;
import flexible.xd.android_base.model.event.LoginEvent;
import flexible.xd.android_base.utils.BarUtils;
import me.jessyan.autosize.internal.CancelAdapt;
public class MainActivity extends WorkBaseActivity implements BottomNavigationBar.OnTabSelectedListener, View.OnClickListener, CancelAdapt {
......@@ -71,9 +72,10 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
startActivity(MainLoginActivity.class);
return;
}
if (!TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()))
WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()), 2);
ButterKnife.bind(this);
QMUIStatusBarHelper.translucent(this);
// QMUIStatusBarHelper.translucent(this);
QMUIStatusBarHelper.setStatusBarLightMode(this);
bnbMainBottomBar.setMode(BottomNavigationBar.MODE_FIXED);
bnbMainBottomBar.setBackgroundStyle(BottomNavigationBar.BACKGROUND_STYLE_STATIC);
......@@ -173,6 +175,24 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
}
oldPosition = position;
mainContent.setCurrentItem(position);
switch (position) {
case 0:
com.blankj.utilcode.util.BarUtils.setStatusBarColor(this, Color.WHITE);
break;
case 1:
com.blankj.utilcode.util.BarUtils.setStatusBarColor(this, Color.parseColor("#fff5a623"));
break;
case 2:
com.blankj.utilcode.util.BarUtils.setStatusBarColor(this, Color.WHITE);
break;
case 3:
com.blankj.utilcode.util.BarUtils.setStatusBarColor(this, Color.WHITE);
break;
case 4:
com.blankj.utilcode.util.BarUtils.setStatusBarColor(this, Color.parseColor("#fff5a623"));
break;
}
}
@Override
......@@ -229,7 +249,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
UserKeeper.getInstance().clearAll();
startActivity(intent);
WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()),1);
WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()), 1);
}
}
......
......@@ -104,6 +104,7 @@ public class UserSettingActivity extends WorkToolBarActivity {
private void logout() {
toast("退出成功");
if (!TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()))
WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()),1);
Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
......
......@@ -14,7 +14,6 @@ import com.wd.workoffice.util.UserKeeper;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
......
......@@ -46,6 +46,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
......
......@@ -7,10 +7,10 @@
android:orientation="vertical">
<!--<View-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="25mm"-->
<!--android:background="@color/white" />-->
<View
android:layout_width="match_parent"
android:layout_height="25mm"
android:background="@color/white" />
......
......@@ -9,7 +9,7 @@
android:id="@+id/tl_tab"
android:layout_width="match_parent"
android:layout_height="48mm"
android:layout_marginTop="20mm"
android:layout_marginTop="25mm"
android:background="@android:color/white"
app:tabBackground="@android:color/white"
app:tabGravity="fill"
......
......@@ -5,9 +5,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -91,11 +93,11 @@
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20mm"
android:layout_marginTop="5mm"
android:textSize="11sp"
android:background="@drawable/shape_circle_red"
android:gravity="center"
android:text="0"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textSize="11sp" />
</FrameLayout>
<FrameLayout
......@@ -132,11 +134,11 @@
android:layout_gravity="center_horizontal"
android:layout_marginLeft="20mm"
android:layout_marginTop="5mm"
android:textSize="11sp"
android:background="@drawable/shape_circle_red"
android:gravity="center"
android:text="0"
android:textColor="@color/white" />
android:textColor="@color/white"
android:textSize="11sp" />
</FrameLayout>
<LinearLayout
......@@ -167,8 +169,6 @@
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
......@@ -17,6 +17,12 @@ buildscript {
allprojects {
repositories {
google()
maven {
url 'http://mirrors.huaweicloud.com/repository/maven/huaweicloudsdk/'
}
maven {
url 'http://mirrors.huaweicloud.com/repository/maven/'
}
maven{ url 'http://maven.aliyun.com/nexus/content/repositories/jcenter'}
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
mavenCentral()
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论