Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
beyond-clouds-android
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
云深项目组
beyond-clouds-android
Commits
55aa642a
Commit
55aa642a
authored
Mar 22, 2020
by
段启岩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
自定义Toast
parent
79eb41d3
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
17 deletions
+26
-17
app/src/main/java/cn/yunliyunwai/beyondclouds/MainActivity.java
+2
-1
app/src/main/java/cn/yunliyunwai/beyondclouds/adapter/DynamicListRecyclerViewAdapter.java
+4
-3
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/ToastUtils.java
+2
-0
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/handler/NavHandlers.java
+2
-1
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/login/LoginActivity.java
+9
-8
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/MyFragment.java
+2
-1
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/popup/PopupAddMenu.java
+2
-1
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/settings/SettingsActivity.java
+3
-2
No files found.
app/src/main/java/cn/yunliyunwai/beyondclouds/MainActivity.java
View file @
55aa642a
...
...
@@ -21,6 +21,7 @@ import javax.inject.Inject;
import
cn.yunliyunwai.beyondclouds.base.BaseActivity
;
import
cn.yunliyunwai.beyondclouds.data.model.AppVersion
;
import
cn.yunliyunwai.beyondclouds.databinding.ActivityMainBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.ui.common.listener.OnNavigationReselectedListener
;
import
cn.yunliyunwai.beyondclouds.ui.dialog.ConfirmDialog
;
import
cn.yunliyunwai.beyondclouds.ui.main.DynamicFragment
;
...
...
@@ -80,7 +81,7 @@ public class MainActivity extends BaseActivity<MainActivityViewModel, ActivityMa
progressDialog
.
dismiss
();
}
else
if
(
progress
==
-
1
)
{
progressDialog
.
dismiss
();
Toast
.
makeText
(
MainActivity
.
this
,
"更新失败!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
MainActivity
.
this
,
"更新失败!"
,
Toast
.
LENGTH_SHORT
);
}
else
{
progressDialog
.
setProgress
(
progress
);
}
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/adapter/DynamicListRecyclerViewAdapter.java
View file @
55aa642a
...
...
@@ -36,6 +36,7 @@ import cn.yunliyunwai.beyondclouds.data.model.Post;
import
cn.yunliyunwai.beyondclouds.data.model.Result
;
import
cn.yunliyunwai.beyondclouds.data.source.IPostRepository
;
import
cn.yunliyunwai.beyondclouds.databinding.PostItemBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.ui.login.LoginActivity
;
import
cn.yunliyunwai.beyondclouds.util.DateUtils
;
import
cn.yunliyunwai.beyondclouds.util.GlideRoundTransform
;
...
...
@@ -151,7 +152,7 @@ public class DynamicListRecyclerViewAdapter extends BaseQuickAdapter<Post,BaseVi
}
if
(
result
.
getCode
()
==
0
)
{
Toast
.
makeText
(
mContext
,
"取消点赞成功"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
mContext
,
"取消点赞成功"
,
Toast
.
LENGTH_SHORT
);
post
.
setPraised
(
false
);
post
.
setPraiseNum
(
post
.
getPraiseNum
()
-
1
);
setPraiseState
(
binding
,
post
);
...
...
@@ -170,7 +171,7 @@ public class DynamicListRecyclerViewAdapter extends BaseQuickAdapter<Post,BaseVi
return
;
}
if
(
result
.
getCode
()
==
0
)
{
Toast
.
makeText
(
mContext
,
"点赞成功"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
mContext
,
"点赞成功"
,
Toast
.
LENGTH_SHORT
);
post
.
setPraised
(
true
);
post
.
setPraiseNum
(
post
.
getPraiseNum
()
+
1
);
setPraiseState
(
binding
,
post
);
...
...
@@ -186,7 +187,7 @@ public class DynamicListRecyclerViewAdapter extends BaseQuickAdapter<Post,BaseVi
static
class
TopicLinkClickable
extends
ClickableSpan
{
@Override
public
void
onClick
(
@NonNull
View
widget
)
{
Toast
.
makeText
(
widget
.
getContext
(),
"点击了链接"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
widget
.
getContext
(),
"点击了链接"
,
Toast
.
LENGTH_SHORT
);
}
@Override
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/ToastUtils.java
View file @
55aa642a
package
cn
.
yunliyunwai
.
beyondclouds
.
ui
;
import
android.content.Context
;
import
android.view.Gravity
;
import
android.widget.Toast
;
public
class
ToastUtils
{
public
static
void
showToastWithoutAppName
(
Context
context
,
String
message
,
int
duration
)
{
Toast
toast
=
Toast
.
makeText
(
context
,
""
,
duration
);
toast
.
setText
(
message
);
toast
.
setGravity
(
Gravity
.
CENTER
,
0
,
0
);
toast
.
show
();
}
}
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/handler/NavHandlers.java
View file @
55aa642a
...
...
@@ -5,6 +5,7 @@ import android.content.Intent;
import
android.view.View
;
import
android.widget.Toast
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.ui.login.LoginActivity
;
import
cn.yunliyunwai.beyondclouds.ui.settings.SettingsActivity
;
import
cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel
;
...
...
@@ -191,7 +192,7 @@ public class NavHandlers {
}
public
static
void
showBuilding
(
View
view
)
{
Toast
.
makeText
(
view
.
getContext
(),
"努力开发中!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
view
.
getContext
(),
"努力开发中!"
,
Toast
.
LENGTH_SHORT
);
}
public
static
void
toSettingsItem
(
View
view
,
AuthenticationViewModel
.
AuthenticationState
authenticationState
)
{
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/login/LoginActivity.java
View file @
55aa642a
...
...
@@ -16,6 +16,7 @@ import javax.inject.Inject;
import
cn.yunliyunwai.beyondclouds.R
;
import
cn.yunliyunwai.beyondclouds.base.BaseActivity
;
import
cn.yunliyunwai.beyondclouds.databinding.ActivityLoginBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.util.ContextUtils
;
import
cn.yunliyunwai.beyondclouds.util.StatusBarUtils
;
import
cn.yunliyunwai.beyondclouds.viewmodel.AuthenticationViewModel
;
...
...
@@ -70,7 +71,7 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
viewModel
.
fetchUserInfo
();
}
else
if
(
authenticationState
==
AuthenticationViewModel
.
AuthenticationState
.
AUTHENTICATE_FAILURE
)
{
// 认证失败
Toast
.
makeText
(
LoginActivity
.
this
,
viewModel
.
getAuthErrorMsg
(),
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
viewModel
.
getAuthErrorMsg
(),
Toast
.
LENGTH_SHORT
);
}
else
if
(
authenticationState
==
AuthenticationViewModel
.
AuthenticationState
.
AUTHENTICATED
)
{
// 认证成功,关闭登录界面
finish
();
...
...
@@ -95,11 +96,11 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
String
account
=
viewModel
.
getAccount
().
getValue
();
String
password
=
viewModel
.
getPassword
().
getValue
();
if
(
TextUtils
.
isEmpty
(
account
))
{
Toast
.
makeText
(
LoginActivity
.
this
,
"请输入账号!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"请输入账号!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
if
(
TextUtils
.
isEmpty
(
password
))
{
Toast
.
makeText
(
LoginActivity
.
this
,
"请输入密码!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"请输入密码!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
viewModel
.
accountLogin
(
account
,
password
);
...
...
@@ -108,11 +109,11 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
String
mobile
=
viewModel
.
getAccount
().
getValue
();
String
verifyCode
=
viewModel
.
getVerifyCode
().
getValue
();
if
(
TextUtils
.
isEmpty
(
mobile
))
{
Toast
.
makeText
(
LoginActivity
.
this
,
"请输入手机号!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"请输入手机号!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
if
(
TextUtils
.
isEmpty
(
verifyCode
))
{
Toast
.
makeText
(
LoginActivity
.
this
,
"请输入验证码!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"请输入验证码!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
viewModel
.
smsLogin
(
mobile
,
verifyCode
);
...
...
@@ -141,12 +142,12 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
}
if
(
verifyCodeState
==
AuthenticationViewModel
.
VerifyCodeState
.
SEND_FAILURE
)
{
Toast
.
makeText
(
LoginActivity
.
this
,
"验证码发送失败!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"验证码发送失败!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
if
(
verifyCodeState
==
AuthenticationViewModel
.
VerifyCodeState
.
SEND_SUCCESS
)
{
Toast
.
makeText
(
LoginActivity
.
this
,
"验证码发送成功!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"验证码发送成功!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
}
...
...
@@ -168,7 +169,7 @@ public class LoginActivity extends BaseActivity<AuthenticationViewModel, Activit
if
(
viewModel
.
getLoginWay
().
getValue
()
==
AuthenticationViewModel
.
LoginWay
.
SMS
)
{
String
mobile
=
viewModel
.
getAccount
().
getValue
();
if
(
TextUtils
.
isEmpty
(
mobile
))
{
Toast
.
makeText
(
LoginActivity
.
this
,
"请输入手机号!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
LoginActivity
.
this
,
"请输入手机号!"
,
Toast
.
LENGTH_SHORT
);
return
;
}
binding
.
btnSendVerifyCode
.
setEnabled
(
false
);
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/main/MyFragment.java
View file @
55aa642a
...
...
@@ -20,6 +20,7 @@ import javax.inject.Inject;
import
cn.yunliyunwai.beyondclouds.R
;
import
cn.yunliyunwai.beyondclouds.base.BaseFragment
;
import
cn.yunliyunwai.beyondclouds.databinding.FragmentMyBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.util.ContextUtils
;
import
cn.yunliyunwai.beyondclouds.util.GlideRoundTransform
;
import
cn.yunliyunwai.beyondclouds.util.ViewModelUtils
;
...
...
@@ -84,7 +85,7 @@ public class MyFragment extends BaseFragment<MyFragmentViewModel, FragmentMyBind
String
userAvatar
=
authenticationViewModel
.
getUserInfo
().
getUserAvatar
();
Glide
.
with
(
getContext
()).
load
(
userAvatar
).
apply
(
glideRequestOptions
).
into
(
binding
.
imgUserAvatar
);
}
else
if
(
authenticationState
==
AuthenticationViewModel
.
AuthenticationState
.
AUTHENTICATE_EXPIRED
)
{
Toast
.
makeText
(
getContext
(),
"您的登录信息已过期,请重新登录!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
getContext
(),
"您的登录信息已过期,请重新登录!"
,
Toast
.
LENGTH_LONG
);
}
}
});
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/popup/PopupAddMenu.java
View file @
55aa642a
...
...
@@ -8,6 +8,7 @@ import android.widget.Toast;
import
cn.yunliyunwai.beyondclouds.R
;
import
cn.yunliyunwai.beyondclouds.databinding.PopupMenuAddBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.util.DimensionUtils
;
public
class
PopupAddMenu
extends
PopupWindow
{
...
...
@@ -22,7 +23,7 @@ public class PopupAddMenu extends PopupWindow {
View
.
OnClickListener
onClickListener
=
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
Toast
.
makeText
(
context
,
"努力开发中!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
context
,
"努力开发中!"
,
Toast
.
LENGTH_SHORT
);
}
};
binding
.
btnScan
.
setOnClickListener
(
onClickListener
);
...
...
app/src/main/java/cn/yunliyunwai/beyondclouds/ui/settings/SettingsActivity.java
View file @
55aa642a
...
...
@@ -17,6 +17,7 @@ import cn.yunliyunwai.beyondclouds.R;
import
cn.yunliyunwai.beyondclouds.base.BaseActivity
;
import
cn.yunliyunwai.beyondclouds.data.model.AppVersion
;
import
cn.yunliyunwai.beyondclouds.databinding.ActivitySettingsBinding
;
import
cn.yunliyunwai.beyondclouds.ui.ToastUtils
;
import
cn.yunliyunwai.beyondclouds.ui.dialog.ConfirmDialog
;
import
cn.yunliyunwai.beyondclouds.util.ContextUtils
;
import
cn.yunliyunwai.beyondclouds.util.StatusBarUtils
;
...
...
@@ -87,7 +88,7 @@ public class SettingsActivity extends BaseActivity<SettingsActivityViewModel, Ac
progressDialog
.
dismiss
();
}
else
if
(
progress
==
-
1
)
{
progressDialog
.
dismiss
();
Toast
.
makeText
(
SettingsActivity
.
this
,
"更新失败!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
SettingsActivity
.
this
,
"更新失败!"
,
Toast
.
LENGTH_SHORT
);
}
else
{
progressDialog
.
setProgress
(
progress
);
}
...
...
@@ -108,7 +109,7 @@ public class SettingsActivity extends BaseActivity<SettingsActivityViewModel, Ac
binding
.
settingsItemCheckUpdate
.
setSubTitleBackground
(
0
);
binding
.
settingsItemCheckUpdate
.
setSubTitleTextAppearance
(
0
);
if
(
updateClicked
)
{
Toast
.
makeText
(
SettingsActivity
.
this
,
"当前版本已是最新版!"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Toast
Utils
.
showToastWithoutAppName
(
SettingsActivity
.
this
,
"当前版本已是最新版!"
,
Toast
.
LENGTH_SHORT
);
updateClicked
=
false
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment