Commit fb7ca523 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent d6f4d297
......@@ -70,8 +70,6 @@ public class TrackPresenter extends BaseTrackPresenter {
});
}
public void saveTerminalInfo() {
HashMap<String, Object> vo = new HashMap<>();
DeviceInfo deviceInfo = DeviceInfo.Companion.getInstance();
......
......@@ -143,7 +143,8 @@ class SplashActivity : BaseActivity() {
* 跳转到主页面
*/
private fun goToMainActivity() {
if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
// if (UserManager.getInstance().newFlag && !UserManager.getInstance().vipFlag) {
if (!UserManager.getInstance().vipFlag) {
// 匹配用户 且 不是vip
val bundle = Bundle()
bundle.putBoolean(VipActivity.IS_GUIDE, true)
......
......@@ -95,7 +95,8 @@ class SplashAdActivity : BaseActivity() {
* 跳转到主页面
*/
private fun goToMainActivity() {
if (UserManager.getInstance().newFlag&&!UserManager.getInstance().vipFlag) {
// if (UserManager.getInstance().newFlag&&!UserManager.getInstance().vipFlag) {
if (!UserManager.getInstance().vipFlag) {
// 匹配用户 且 不是vip
val bundle = Bundle()
bundle.putBoolean(VipActivity.IS_GUIDE, true)
......
......@@ -108,21 +108,21 @@ class MyFragment : BaseFragment(), MyView, View.OnClickListener {
private fun loginStatus(consumer: UserBean) {
// 1-匹配用户
if (consumer.activiteFlag == 0) {
// 未匹配
ll_my_vip.visibility = View.GONE
ll_my_payrecord.visibility = View.GONE
ll_contactus.visibility = View.GONE
line_my_payrecord.visibility = View.GONE
line_my_contactus.visibility = View.GONE
} else {
// 匹配
ll_my_vip.visibility = View.VISIBLE
ll_my_payrecord.visibility = View.VISIBLE
ll_contactus.visibility = View.VISIBLE
line_my_payrecord.visibility = View.VISIBLE
line_my_contactus.visibility = View.VISIBLE
}
// if (consumer.activiteFlag == 0) {
// // 未匹配
// ll_my_vip.visibility = View.GONE
// ll_my_payrecord.visibility = View.GONE
// ll_contactus.visibility = View.GONE
// line_my_payrecord.visibility = View.GONE
// line_my_contactus.visibility = View.GONE
// } else {
// // 匹配
// ll_my_vip.visibility = View.VISIBLE
// ll_my_payrecord.visibility = View.VISIBLE
// ll_contactus.visibility = View.VISIBLE
// line_my_payrecord.visibility = View.VISIBLE
// line_my_contactus.visibility = View.VISIBLE
// }
// 2-登录
if (userManager.userIsLogin()) {
......
......@@ -64,8 +64,7 @@
android:layout_marginBottom="20dp"
android:background="@mipmap/bg_my_vip"
android:orientation="vertical"
android:paddingLeft="24dp"
android:visibility="gone">
android:paddingLeft="24dp">
<TextView
android:id="@+id/tv_my_vip"
......@@ -174,8 +173,7 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:visibility="gone">
android:paddingEnd="20dp">
<TextView
android:layout_width="0dp"
......@@ -197,8 +195,7 @@
android:id="@+id/line_my_payrecord"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray"
android:visibility="gone" />
android:background="@color/my_color_gray" />
<LinearLayout
android:id="@+id/ll_contactus"
......@@ -207,8 +204,7 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:visibility="gone">
android:paddingEnd="20dp">
<TextView
android:id="@+id/tv_contact"
......@@ -230,8 +226,7 @@
android:id="@+id/line_my_contactus"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray"
android:visibility="gone" />
android:background="@color/my_color_gray" />
<LinearLayout
android:id="@+id/ll_my_setting"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment