Skip to content
项目
Groups
代码片段
帮助
正在加载...
Sign in / Register
Toggle navigation
W
workoffice
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图表
统计图
Create a new issue
作业
提交
议题看板
Open sidebar
冷广德
workoffice
Commits
49192835
提交
49192835
authored
6月 28, 2020
作者:
lgd
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1.修改页面样式
2.添加util,华为对象存储引用 3.修改别名问题
上级
e0ca23cf
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
42 行增加
和
12 行删除
+42
-12
build.gradle
app/build.gradle
+2
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+3
-2
MainActivity.java
...main/java/com/wd/workoffice/ui/activity/MainActivity.java
+23
-3
UserSettingActivity.java
...m/wd/workoffice/ui/activity/user/UserSettingActivity.java
+2
-1
MsgFragment.java
app/src/main/java/com/wd/workoffice/ui/fg/MsgFragment.java
+0
-1
WorkFragment.java
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
+1
-0
fg_home.xml
app/src/main/res/layout/fg_home.xml
+4
-4
fg_msg.xml
app/src/main/res/layout/fg_msg.xml
+1
-1
fg_work.xml
app/src/main/res/layout/fg_work.xml
+0
-0
build.gradle
build.gradle
+6
-0
没有找到文件。
app/build.gradle
浏览文件 @
49192835
...
...
@@ -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'
}
app/src/main/AndroidManifest.xml
浏览文件 @
49192835
...
...
@@ -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
...
...
app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java
浏览文件 @
49192835
...
...
@@ -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
;
}
WorkUtils
.
handleAlias
(
Integer
.
valueOf
(
UserKeeper
.
getInstance
().
getUserId
()),
2
);
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
);
}
}
...
...
app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java
浏览文件 @
49192835
...
...
@@ -104,7 +104,8 @@ public class UserSettingActivity extends WorkToolBarActivity {
private
void
logout
()
{
toast
(
"退出成功"
);
WorkUtils
.
handleAlias
(
Integer
.
valueOf
(
UserKeeper
.
getInstance
().
getUserId
()),
1
);
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
);
UserKeeper
.
getInstance
().
clearAll
();
...
...
app/src/main/java/com/wd/workoffice/ui/fg/MsgFragment.java
浏览文件 @
49192835
...
...
@@ -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
;
...
...
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
浏览文件 @
49192835
...
...
@@ -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
...
...
app/src/main/res/layout/fg_home.xml
浏览文件 @
49192835
...
...
@@ -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"
/
>
...
...
app/src/main/res/layout/fg_msg.xml
浏览文件 @
49192835
...
...
@@ -9,7 +9,7 @@
android:id=
"@+id/tl_tab"
android:layout_width=
"match_parent"
android:layout_height=
"48mm"
android:layout_marginTop=
"2
0
mm"
android:layout_marginTop=
"2
5
mm"
android:background=
"@android:color/white"
app:tabBackground=
"@android:color/white"
app:tabGravity=
"fill"
...
...
app/src/main/res/layout/fg_work.xml
浏览文件 @
49192835
差异被折叠。
点击展开。
build.gradle
浏览文件 @
49192835
...
...
@@ -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
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论