Commit 3c657219 authored by youjj's avatar youjj

优化Module处理器。旅游登录结束后返回旅游

parent 34e3bc7e
......@@ -2,54 +2,55 @@ package com.test.rv;
import com.base.utils.tools.android.IntentUtil;
import com.frame.base.FrameApp;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.OnModuleChangedListener;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.rv.home.rv.module.ui.login.LoginRvActivity;
import com.rv.home.rv.module.ui.main.HomeActivity;
import com.rv.rvmine.MineActivity;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.TravelActivity;
public class ModuleUtil {
private static int currentModule = -1;
public static void register() {
ModuleChangeUtil.setOnModuleChangedListener(new OnModuleChangedListener() {
ModuleEventUtil.setOnModuleEventListener(new OnModuleEventListener() {
@Override
public void onChanged(int module) {
switch (module) {
case OnModuleChangedListener.MODULE_HOME:
if (currentModule == OnModuleChangedListener.MODULE_HOME) return;
if (ModuleChangeUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleChangeUtil.currentActivity, HomeActivity.class);
case OnModuleEventListener.MODULE_HOME:
if (currentModule == OnModuleEventListener.MODULE_HOME) return;
if (ModuleEventUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleEventUtil.currentActivity, HomeActivity.class);
} else {
IntentUtil.startActivity(FrameApp.getInstance(), HomeActivity.class);
}
break;
case OnModuleChangedListener.MODULE_TRAVEL:
if (currentModule == OnModuleChangedListener.MODULE_TRAVEL) return;
if (ModuleChangeUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleChangeUtil.currentActivity, TravelActivity.class);
case OnModuleEventListener.MODULE_TRAVEL:
if (currentModule == OnModuleEventListener.MODULE_TRAVEL) return;
if (ModuleEventUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleEventUtil.currentActivity, TravelActivity.class);
} else {
IntentUtil.startActivity(FrameApp.getInstance(), TravelActivity.class);
}
break;
case OnModuleChangedListener.MODULE_CAMP:
if (currentModule == OnModuleChangedListener.MODULE_CAMP) return;
case OnModuleEventListener.MODULE_CAMP:
if (currentModule == OnModuleEventListener.MODULE_CAMP) return;
//Toast.makeText(FrameApp.getInstance(), "营地", Toast.LENGTH_SHORT).show();
break;
case OnModuleChangedListener.MODULE_FIND:
if (currentModule == OnModuleChangedListener.MODULE_FIND) return;
case OnModuleEventListener.MODULE_FIND:
if (currentModule == OnModuleEventListener.MODULE_FIND) return;
//Toast.makeText(FrameApp.getInstance(), "发现", Toast.LENGTH_SHORT).show();
break;
case OnModuleChangedListener.MODULE_MINE:
if (currentModule == OnModuleChangedListener.MODULE_MINE) return;
if (ModuleChangeUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleChangeUtil.currentActivity, MineActivity.class);
case OnModuleEventListener.MODULE_MINE:
if (currentModule == OnModuleEventListener.MODULE_MINE) return;
if (ModuleEventUtil.currentActivity != null) {
IntentUtil.goActivityWithAnimationAlpha(ModuleEventUtil.currentActivity, MineActivity.class);
} else {
IntentUtil.startActivity(FrameApp.getInstance(), MineActivity.class);
}
......@@ -64,8 +65,34 @@ public class ModuleUtil {
}
@Override
public void onLogin() {
FrameApp.getInstance().startActivity(LoginRvActivity.getIntent(FrameApp.getInstance()));
public void onLogin(int type) {
switch (type) {
case OnModuleEventListener.MODULE_LOGIN_START:
//需要登录
if (TravelActivity.isNeedLogin) {
FrameApp.getInstance().startActivity(LoginRvActivity.getIntent(FrameApp.getInstance()));
}
break;
case OnModuleEventListener.MODULE_LOGIN_FINISH:
//登录完成
if (TravelActivity.isNeedLogin) {
TravelActivity.isNeedLogin = false;
IntentUtil.startActivity(FrameApp.getInstance(), TravelActivity.class);
FrameApp.getMainHandler().postDelayed(new Runnable() {
@Override
public void run() {
GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, FrameApp.getInstance());
}
}, 500);
}
break;
}
}
@Override
public void onPay(int type) {
}
});
}
......
......@@ -13,7 +13,7 @@ import com.base.utils.eventbusmodel.EventRestartApp;
import com.frame.base.FrameApp;
import com.frame.base.bean.BeanHeartbeat;
import com.frame.base.manager.MyFrameManager;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.util.LogUtils;
import com.tencent.bugly.crashreport.CrashReport;
import com.umeng.commonsdk.UMConfigure;
......
......@@ -3,18 +3,18 @@ package com.frame.rv;
import android.annotation.SuppressLint;
import android.app.Activity;
public class ModuleChangeUtil {
public class ModuleEventUtil {
@SuppressLint("StaticFieldLeak")
public static Activity currentActivity = null;
public static OnModuleChangedListener getOnModuleChangedListener() {
return onModuleChangedListener;
public static OnModuleEventListener getOnModuleEventListener() {
return onModuleEventListener;
}
public static void setOnModuleChangedListener(OnModuleChangedListener onModuleChangedListener) {
ModuleChangeUtil.onModuleChangedListener = onModuleChangedListener;
public static void setOnModuleEventListener(OnModuleEventListener onModuleEventListener) {
ModuleEventUtil.onModuleEventListener = onModuleEventListener;
}
private static OnModuleChangedListener onModuleChangedListener;
private static OnModuleEventListener onModuleEventListener;
}
package com.frame.rv;
public interface OnModuleChangedListener {
public interface OnModuleEventListener {
int MODULE_HOME = 0;
int MODULE_TRAVEL = 1;
int MODULE_CAMP = 2;
......@@ -13,6 +13,14 @@ public interface OnModuleChangedListener {
//当前模块首页的Activity被销毁
void onClear();
//需要登录
void onLogin();
int MODULE_LOGIN_START = 10; //开始登录
int MODULE_LOGIN_FINISH = 11; //登录结束
//需要登录、登录结束
void onLogin(int type);
int MODULE_PAY_START = 20; //开始支付
int MODULE_PAY_FINISH = 21; //支付结束
//需要支付、支付结束
void onPay(int type);
}
package com.frame.rv;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class RvFrameTestActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.frame_test_main);
}
}
package com.frame.rv;
package com.frame.rv.widget;
import android.content.Context;
import android.support.v4.content.ContextCompat;
......@@ -9,6 +9,10 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.frame.rv.R;
public class BaseTabLayout extends FrameLayout {
public BaseTabLayout(Context context) {
super(context);
......@@ -44,25 +48,25 @@ public class BaseTabLayout extends FrameLayout {
public void onClick(View v) {
int i = v.getId();
if (i == R.id.rl_home) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_HOME);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_HOME);
}
} else if (i == R.id.rl_travel) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_TRAVEL);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_TRAVEL);
}
} else if (i == R.id.rl_camp) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_CAMP);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_CAMP);
}
} else if (i == R.id.rl_found) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_FIND);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_FIND);
}
} else if (i == R.id.rl_mine) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_MINE);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_MINE);
}
}
}
......@@ -91,7 +95,7 @@ public class BaseTabLayout extends FrameLayout {
}
private int currentTab = OnModuleChangedListener.MODULE_HOME;
private int currentTab = OnModuleEventListener.MODULE_HOME;
public void setCurrent(int tab) {
currentTab = tab;
......@@ -103,11 +107,11 @@ public class BaseTabLayout extends FrameLayout {
* 设置切换
*/
private void setCurrentTab() {
setViewStyle(ivHome, tvHome, currentTab == OnModuleChangedListener.MODULE_HOME);
setViewStyle(ivTravel, tvTravel, currentTab == OnModuleChangedListener.MODULE_TRAVEL);
setViewStyle(ivCamp, tvCamp, currentTab == OnModuleChangedListener.MODULE_CAMP);
setViewStyle(ivFound, tvFound, currentTab == OnModuleChangedListener.MODULE_FIND);
setViewStyle(ivMine, tvMine, currentTab == OnModuleChangedListener.MODULE_MINE);
setViewStyle(ivHome, tvHome, currentTab == OnModuleEventListener.MODULE_HOME);
setViewStyle(ivTravel, tvTravel, currentTab == OnModuleEventListener.MODULE_TRAVEL);
setViewStyle(ivCamp, tvCamp, currentTab == OnModuleEventListener.MODULE_CAMP);
setViewStyle(ivFound, tvFound, currentTab == OnModuleEventListener.MODULE_FIND);
setViewStyle(ivMine, tvMine, currentTab == OnModuleEventListener.MODULE_MINE);
}
/**
......
package com.frame.rv;
package com.frame.rv.widget;
import android.content.Context;
import android.util.AttributeSet;
......@@ -9,6 +9,8 @@ import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.frame.rv.R;
import java.util.List;
public class BaseTipsLayout extends RelativeLayout {
......
package com.frame.rv;
package com.frame.rv.widget;
import android.content.Context;
import android.util.AttributeSet;
......@@ -8,6 +8,8 @@ import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.frame.rv.R;
public class BaseTitleBarLayout extends RelativeLayout {
public BaseTitleBarLayout(Context context) {
super(context);
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".RvFrameTestActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
package com.rv.home.rv.module;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
/**
* Created :Auser
......
......@@ -5,7 +5,9 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -117,6 +119,9 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
break;
default:
startActivity(HomeActivity.getIntent(mActivity));
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onLogin(OnModuleEventListener.MODULE_LOGIN_FINISH);
}
break;
}
finish();
......
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.R;
import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
import com.ruiwenliu.wrapper.inter.OnViewHolder;
......
package com.rv.home.rv.module.basic.presenter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.presenter.MvpPresenter;
/**
......
......@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.BaseLoginActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
......
......@@ -9,8 +9,8 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.OnModuleChangedListener;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseWrapperFragment;
......@@ -99,35 +99,35 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
@OnClick({R2.id.rl_home, R2.id.rl_travel, R2.id.rl_camp, R2.id.rl_found, R2.id.rl_mine})
public void onViewClicked(View view) {
ModuleChangeUtil.currentActivity = this;
ModuleEventUtil.currentActivity = this;
int i = view.getId();
if (i == R.id.rl_home) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_HOME);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_HOME);
return;
}
setCurrent(TYPE_HOME_PAGE);
} else if (i == R.id.rl_travel) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_TRAVEL);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_TRAVEL);
return;
}
setCurrent(TYPE_TRAVEL);
} else if (i == R.id.rl_camp) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_CAMP);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_CAMP);
return;
}
setCurrent(TYPE_CAMP);
} else if (i == R.id.rl_found) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_FIND);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_FIND);
return;
}
......@@ -135,8 +135,8 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
} else if (i == R.id.rl_mine) {
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onChanged(OnModuleChangedListener.MODULE_MINE);
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onChanged(OnModuleEventListener.MODULE_MINE);
return;
}
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
......
......@@ -16,7 +16,7 @@ import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.um.CustomShareListener;
import com.ruiwenliu.wrapper.util.um.ShareManager;
......
......@@ -24,7 +24,7 @@ import android.widget.TimePicker;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.mapapi.model.LatLng;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.LocationManager;
......
......@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
import com.rv.home.R2;
......
......@@ -17,7 +17,7 @@ import android.widget.RatingBar;
import android.widget.TextView;
import com.frame.base.glide.GlideManager;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
......
......@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
import com.rv.home.R2;
......
......@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.base.glide.GlideManager;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
import com.rv.home.R2;
......
......@@ -24,7 +24,7 @@ import android.widget.TimePicker;
import com.baidu.location.BDAbstractLocationListener;
import com.baidu.location.BDLocation;
import com.baidu.mapapi.model.LatLng;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
......
......@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.google.gson.annotations.SerializedName;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
......
......@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.rv.home.R;
import com.rv.home.R2;
......
......@@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MarkerOptions;
import com.baidu.mapapi.map.MyLocationData;
import com.baidu.mapapi.map.OverlayOptions;
import com.baidu.mapapi.model.LatLng;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.LocationManager;
import com.ruiwenliu.wrapper.util.MapUtil;
......
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......
......@@ -9,7 +9,7 @@ import android.text.TextUtils;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
......@@ -25,7 +25,6 @@ import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
......
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......
......@@ -16,7 +16,7 @@ import android.widget.RatingBar;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
import com.rv.home.R;
......
......@@ -5,12 +5,11 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.util.ViewHolder;
......
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......
......@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.ViewHolder;
import com.ruiwenliu.wrapper.weight.TitleView;
......
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseFragment;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
......
......@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.ViewHolder;
......
......@@ -6,7 +6,7 @@ import android.os.Bundle;
import android.util.Log;
import android.widget.TextView;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
......
......@@ -5,7 +5,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
......@@ -16,9 +15,9 @@ import com.base.utils.tools.android.IntentUtil;
import com.base.utils.ui.image.round.RoundImageView;
import com.frame.base.browse.ActivityImageBrowseInt;
import com.frame.base.glide.GlideManager;
import com.frame.rv.BaseTabLayout;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.OnModuleChangedListener;
import com.frame.rv.widget.BaseTabLayout;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.UtilsManager;
......@@ -92,10 +91,10 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
ModuleChangeUtil.currentActivity = this;
ModuleEventUtil.currentActivity = this;
showTitle(false);
travelTabLayout.setCurrent(OnModuleChangedListener.MODULE_MINE);
travelTabLayout.setCurrent(OnModuleEventListener.MODULE_MINE);
setBanner();
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
......@@ -116,7 +115,7 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
ModuleChangeUtil.currentActivity = this;
ModuleEventUtil.currentActivity = this;
}
......@@ -249,8 +248,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
public void onDestroy() {
super.onDestroy();
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onClear();
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onClear();
}
}
}
......@@ -421,7 +421,7 @@
</LinearLayout>
<com.frame.rv.BaseTabLayout
<com.frame.rv.widget.BaseTabLayout
android:id="@+id/travel_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
package com.rv.travel;
import android.app.Activity;
import android.content.Context;
import com.base.utils.tools.android.IntentUtil;
import com.rv.travel.fragment.TravelFragmentCommitOrder;
......@@ -13,7 +14,7 @@ public class GoOtherUtil {
public static String travelDetailId = "0";
//去旅游详情
public static void goTravelDetailWeb(String id, Activity activity) {
public static void goTravelDetailWeb(String id, Context context) {
GoOtherUtil.travelDetailId = id;
String url = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
//TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
......@@ -33,18 +34,18 @@ public class GoOtherUtil {
}
});
TravelFragmentActivity.option = otherOption;
IntentUtil.goActivityWithAnimationAlpha(activity, TravelFragmentActivity.class);
IntentUtil.startActivity(context, TravelFragmentActivity.class);
}
//去确认订单
public static void goTravelCommitOrder(String data,final Activity activity) {
public static void goTravelCommitOrder(String data,final Context context) {
TravelFragmentActivity.currentFragment = TravelFragmentCommitOrder.getInstance(data);
OtherOption otherOption = new OtherOption();
otherOption.setTitle("确认下单");
otherOption.setClickListener(new OtherClickListener() {
@Override
public void onBack() {
GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, activity);
GoOtherUtil.goTravelDetailWeb(GoOtherUtil.travelDetailId, context);
}
@Override
......@@ -53,6 +54,6 @@ public class GoOtherUtil {
}
});
TravelFragmentActivity.option = otherOption;
IntentUtil.goActivityWithAnimationAlpha(activity, TravelFragmentActivity.class);
IntentUtil.startActivity(context, TravelFragmentActivity.class);
}
}
......@@ -14,9 +14,9 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.base.utils.base.BaseActivity;
import com.frame.rv.BaseTabLayout;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.OnModuleChangedListener;
import com.frame.rv.widget.BaseTabLayout;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.rv.travel.api.ApiUtil;
import com.rv.travel.api.OnApiResponseCallback;
import com.rv.travel.bean.BeanHot;
......@@ -32,6 +32,7 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
public class TravelActivity extends BaseActivity {
public static boolean isNeedLogin = false; //是否需要登录
@SuppressLint("StaticFieldLeak")
private static TravelActivity instance;
......@@ -95,7 +96,7 @@ public class TravelActivity extends BaseActivity {
setContentView(R.layout.activity_travel);
ButterKnife.bind(this);
instance = this;
ModuleChangeUtil.currentActivity = this;
ModuleEventUtil.currentActivity = this;
hotMoreTitleLayoutStatic = hotMoreTitleLayout;
onData();
onView();
......@@ -103,7 +104,7 @@ public class TravelActivity extends BaseActivity {
@Override
public void onData() {
tabLayout.setCurrent(OnModuleChangedListener.MODULE_TRAVEL);
tabLayout.setCurrent(OnModuleEventListener.MODULE_TRAVEL);
//13766666666 12345678
//13612688539 12345678
......@@ -161,7 +162,7 @@ public class TravelActivity extends BaseActivity {
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
ModuleChangeUtil.currentActivity = this;
ModuleEventUtil.currentActivity = this;
}
......@@ -197,8 +198,8 @@ public class TravelActivity extends BaseActivity {
super.onDestroy();
instance = null;
hotMoreTitleLayoutStatic = null;
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onClear();
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onClear();
}
}
}
package com.rv.travel.api;
import com.frame.rv.RvFrameConfig;
import com.frame.rv.config.RvFrameConfig;
public interface TravelApi extends RvFrameConfig {
//登录 参数拼接在url上然后 post 请求
......
......@@ -24,7 +24,7 @@ public class AndroidInterface {
@JavascriptInterface
public void readyOrder(String orderJson) {
GoOtherUtil.goTravelCommitOrder(orderJson, travelWebFragment.getActivity());
GoOtherUtil.goTravelCommitOrder(orderJson, travelWebFragment.getContext());
}
......
......@@ -11,7 +11,7 @@ import android.view.ViewGroup;
import com.base.animset.util.NiftyEffects;
import com.base.utils.base.BaseFragment;
import com.frame.rv.BaseTipsLayout;
import com.frame.rv.widget.BaseTipsLayout;
import com.rv.travel.R;
import com.rv.travel.R2;
import com.rv.travel.TravelActivity;
......
......@@ -17,7 +17,7 @@ import com.base.utils.base.BaseFragment;
import com.base.utils.tools.android.IntentUtil;
import com.frame.base.browse.ActivityImageBrowseUrl;
import com.frame.base.glide.GlideManager;
import com.frame.rv.BaseTipsLayout;
import com.frame.rv.widget.BaseTipsLayout;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.R;
import com.rv.travel.R2;
......@@ -131,7 +131,7 @@ public class TravelFragmentHotType extends BaseFragment {
adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@Override
public void onItemClick(BeanRim bean) {
GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
GoOtherUtil.goTravelDetailWeb(bean.getId(), baseContext);
}
});
final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
......
......@@ -21,7 +21,7 @@ import com.base.utils.tools.android.KeyboardUtil;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.browse.ActivityImageBrowseUrl;
import com.frame.base.glide.GlideManager;
import com.frame.rv.BaseTipsLayout;
import com.frame.rv.widget.BaseTipsLayout;
import com.rv.travel.GoOtherUtil;
import com.rv.travel.R;
import com.rv.travel.R2;
......@@ -159,7 +159,7 @@ public class TravelFragmentMain extends BaseFragment {
adapterRim.setItemRootClickListener(new AdapterRim.OnItemRootClickListener() {
@Override
public void onItemClick(BeanRim bean) {
GoOtherUtil.goTravelDetailWeb(bean.getId(), getActivity());
GoOtherUtil.goTravelDetailWeb(bean.getId(),baseContext);
}
});
final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseContext);
......
......@@ -12,12 +12,12 @@ import android.widget.LinearLayout;
import com.base.utils.base.BaseFragment;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.FrameApp;
import com.frame.rv.ModuleChangeUtil;
import com.frame.rv.ModuleEventUtil;
import com.frame.rv.OnModuleEventListener;
import com.just.agentweb.AgentWeb;
import com.rv.travel.R;
import com.rv.travel.R2;
import com.rv.travel.TravelActivity;
import com.rv.travel.other.TravelFragmentActivity;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
......@@ -65,8 +65,9 @@ public class TravelWebFragment extends BaseFragment {
public void onClick(View v) {
if (TextUtil.isEmpty(OkGoUtil.getToken())) {
showToastShort("请先登录");
if (ModuleChangeUtil.getOnModuleChangedListener() != null) {
ModuleChangeUtil.getOnModuleChangedListener().onLogin();
TravelActivity.isNeedLogin = true;
if (ModuleEventUtil.getOnModuleEventListener() != null) {
ModuleEventUtil.getOnModuleEventListener().onLogin(OnModuleEventListener.MODULE_LOGIN_START);
}
return;
}
......
......@@ -6,11 +6,10 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.View;
import android.widget.Button;
import com.base.utils.base.BaseActivity;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.rv.BaseTitleBarLayout;
import com.frame.rv.widget.BaseTitleBarLayout;
import com.rv.travel.R;
import com.rv.travel.R2;
......
......@@ -4,7 +4,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<com.frame.rv.BaseTitleBarLayout
<com.frame.rv.widget.BaseTitleBarLayout
android:id="@+id/other_title_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
......@@ -172,7 +172,7 @@
android:layout_height="0dp"
android:layout_weight="1" />
<com.frame.rv.BaseTabLayout
<com.frame.rv.widget.BaseTabLayout
android:id="@+id/travel_tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
......@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.frame.rv.BaseTipsLayout
<com.frame.rv.widget.BaseTipsLayout
android:id="@+id/travel_hot_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
......@@ -57,7 +57,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.frame.rv.BaseTipsLayout
<com.frame.rv.widget.BaseTipsLayout
android:id="@+id/travel_rim_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
......@@ -70,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.frame.rv.BaseTipsLayout
<com.frame.rv.widget.BaseTipsLayout
android:id="@+id/travel_hot_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......@@ -113,7 +113,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.frame.rv.BaseTipsLayout
<com.frame.rv.widget.BaseTipsLayout
android:id="@+id/travel_rim_tips"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
......
......@@ -7,7 +7,7 @@ import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import com.frame.rv.RvFrameConstant;
import com.frame.rv.config.RvFrameConstant;
import com.ruiwenliu.wrapper.R;
import com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity;
import com.ruiwenliu.wrapper.inter.OnViewHolder;
......
......@@ -2,7 +2,7 @@ package com.ruiwenliu.wrapper.http;
import android.util.Log;
import com.frame.rv.RvFrameConstant;
import com.frame.rv.config.RvFrameConstant;
import com.google.gson.Gson;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseView;
......
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