Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lify
RvApp
Commits
3c657219
Commit
3c657219
authored
Jun 12, 2019
by
youjj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化Module处理器。旅游登录结束后返回旅游
parent
34e3bc7e
Changes
55
Hide whitespace changes
Inline
Side-by-side
Showing
55 changed files
with
212 additions
and
158 deletions
+212
-158
ModuleUtil.java
RvClient/src/main/java/com/test/rv/ModuleUtil.java
+48
-21
RvClientApplication.java
RvClient/src/main/java/com/test/rv/RvClientApplication.java
+1
-1
ModuleEventUtil.java
RvFrame/src/main/java/com/frame/rv/ModuleEventUtil.java
+20
-0
OnModuleEventListener.java
...ame/src/main/java/com/frame/rv/OnModuleEventListener.java
+26
-0
RvFrameTestActivity.java
RvFrame/src/main/java/com/frame/rv/RvFrameTestActivity.java
+0
-13
RvFrameConfig.java
RvFrame/src/main/java/com/frame/rv/config/RvFrameConfig.java
+1
-1
RvFrameConstant.java
...me/src/main/java/com/frame/rv/config/RvFrameConstant.java
+1
-1
BaseTabLayout.java
RvFrame/src/main/java/com/frame/rv/widget/BaseTabLayout.java
+21
-17
BaseTipsLayout.java
...ame/src/main/java/com/frame/rv/widget/BaseTipsLayout.java
+3
-1
BaseTitleBarLayout.java
...src/main/java/com/frame/rv/widget/BaseTitleBarLayout.java
+3
-1
frame_test_main.xml
RvFrame/src/main/res/layout/frame_test_main.xml
+0
-18
ApiConfig.java
RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java
+1
-1
BaseLoginActivity.java
...n/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
+6
-1
BaseStatusActivity.java
.../java/com/rv/home/rv/module/basic/BaseStatusActivity.java
+1
-1
CommonPresenter.java
...om/rv/home/rv/module/basic/presenter/CommonPresenter.java
+1
-1
LoginRvActivity.java
.../java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
+1
-1
HomeActivity.java
...main/java/com/rv/home/rv/module/ui/main/HomeActivity.java
+13
-13
CarDetailActivity.java
...com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
+1
-1
CarRentalActivity.java
...com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
+1
-1
CarRentalListActivity.java
...rv/home/rv/module/ui/main/home/CarRentalListActivity.java
+1
-1
ConfirmOrderActivity.java
.../rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
+1
-1
DrivingListActivity.java
...m/rv/home/rv/module/ui/main/home/DrivingListActivity.java
+1
-1
DrivingUploadActivity.java
...rv/home/rv/module/ui/main/home/DrivingUploadActivity.java
+1
-1
HomePageFragment.java
.../com/rv/home/rv/module/ui/main/home/HomePageFragment.java
+1
-1
PayForActivity.java
...va/com/rv/home/rv/module/ui/main/home/PayForActivity.java
+1
-1
SelectShopActivity.java
...om/rv/home/rv/module/ui/main/home/SelectShopActivity.java
+1
-1
ShopShowActivity.java
.../com/rv/home/rv/module/ui/main/home/ShopShowActivity.java
+1
-1
AllOrderFragment.java
...v/home/rv/module/ui/main/home/order/AllOrderFragment.java
+1
-1
CancelTheTripActivity.java
...e/rv/module/ui/main/home/order/CancelTheTripActivity.java
+1
-2
CompletedFragment.java
.../home/rv/module/ui/main/home/order/CompletedFragment.java
+1
-1
EvaluationActivity.java
...home/rv/module/ui/main/home/order/EvaluationActivity.java
+1
-1
ForPaymentFragment.java
...home/rv/module/ui/main/home/order/ForPaymentFragment.java
+1
-2
HaveToTravelFragment.java
...me/rv/module/ui/main/home/order/HaveToTravelFragment.java
+1
-1
OrderDetailActivity.java
...ome/rv/module/ui/main/home/order/OrderDetailActivity.java
+1
-1
ToTravelFragment.java
...v/home/rv/module/ui/main/home/order/ToTravelFragment.java
+1
-1
TravelOrderDetailsActivity.java
...module/ui/main/home/order/TravelOrderDetailsActivity.java
+1
-1
WXPayEntryActivity.java
...rc/main/java/com/rv/home/rv/wxapi/WXPayEntryActivity.java
+1
-1
MineActivity.java
RvMine/src/main/java/com/rv/rvmine/MineActivity.java
+8
-9
activity_mine.xml
RvMine/src/main/res/layout/activity_mine.xml
+1
-1
GoOtherUtil.java
RvTravel/src/main/java/com/rv/travel/GoOtherUtil.java
+6
-5
TravelActivity.java
RvTravel/src/main/java/com/rv/travel/TravelActivity.java
+9
-8
TravelApi.java
RvTravel/src/main/java/com/rv/travel/api/TravelApi.java
+1
-1
AndroidInterface.java
...rc/main/java/com/rv/travel/fragment/AndroidInterface.java
+1
-1
TravelFragmentHotMore.java
...in/java/com/rv/travel/fragment/TravelFragmentHotMore.java
+1
-1
TravelFragmentHotType.java
...in/java/com/rv/travel/fragment/TravelFragmentHotType.java
+2
-2
TravelFragmentMain.java
.../main/java/com/rv/travel/fragment/TravelFragmentMain.java
+2
-2
TravelWebFragment.java
...c/main/java/com/rv/travel/fragment/TravelWebFragment.java
+5
-4
TravelFragmentActivity.java
...main/java/com/rv/travel/other/TravelFragmentActivity.java
+1
-2
activity_fragment_other.xml
RvTravel/src/main/res/layout/activity_fragment_other.xml
+1
-1
activity_travel.xml
RvTravel/src/main/res/layout/activity_travel.xml
+1
-1
fragment_travel_hot_more.xml
RvTravel/src/main/res/layout/fragment_travel_hot_more.xml
+1
-1
fragment_travel_hot_type.xml
RvTravel/src/main/res/layout/fragment_travel_hot_type.xml
+1
-1
fragment_travel_mian.xml
RvTravel/src/main/res/layout/fragment_travel_mian.xml
+2
-2
BaseStatusActivity.java
...n/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java
+1
-1
RxRequestResult.java
...main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
+1
-1
No files found.
RvClient/src/main/java/com/test/rv/ModuleUtil.java
View file @
3c657219
...
@@ -2,54 +2,55 @@ package com.test.rv;
...
@@ -2,54 +2,55 @@ package com.test.rv;
import
com.base.utils.tools.android.IntentUtil
;
import
com.base.utils.tools.android.IntentUtil
;
import
com.frame.base.FrameApp
;
import
com.frame.base.FrameApp
;
import
com.frame.rv.Module
Change
Util
;
import
com.frame.rv.Module
Event
Util
;
import
com.frame.rv.OnModule
Changed
Listener
;
import
com.frame.rv.OnModule
Event
Listener
;
import
com.rv.home.rv.module.ui.login.LoginRvActivity
;
import
com.rv.home.rv.module.ui.login.LoginRvActivity
;
import
com.rv.home.rv.module.ui.main.HomeActivity
;
import
com.rv.home.rv.module.ui.main.HomeActivity
;
import
com.rv.rvmine.MineActivity
;
import
com.rv.rvmine.MineActivity
;
import
com.rv.travel.GoOtherUtil
;
import
com.rv.travel.TravelActivity
;
import
com.rv.travel.TravelActivity
;
public
class
ModuleUtil
{
public
class
ModuleUtil
{
private
static
int
currentModule
=
-
1
;
private
static
int
currentModule
=
-
1
;
public
static
void
register
()
{
public
static
void
register
()
{
Module
ChangeUtil
.
setOnModuleChangedListener
(
new
OnModuleChanged
Listener
()
{
Module
EventUtil
.
setOnModuleEventListener
(
new
OnModuleEvent
Listener
()
{
@Override
@Override
public
void
onChanged
(
int
module
)
{
public
void
onChanged
(
int
module
)
{
switch
(
module
)
{
switch
(
module
)
{
case
OnModule
Changed
Listener
.
MODULE_HOME
:
case
OnModule
Event
Listener
.
MODULE_HOME
:
if
(
currentModule
==
OnModule
Changed
Listener
.
MODULE_HOME
)
return
;
if
(
currentModule
==
OnModule
Event
Listener
.
MODULE_HOME
)
return
;
if
(
Module
Change
Util
.
currentActivity
!=
null
)
{
if
(
Module
Event
Util
.
currentActivity
!=
null
)
{
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Change
Util
.
currentActivity
,
HomeActivity
.
class
);
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Event
Util
.
currentActivity
,
HomeActivity
.
class
);
}
else
{
}
else
{
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
HomeActivity
.
class
);
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
HomeActivity
.
class
);
}
}
break
;
break
;
case
OnModule
Changed
Listener
.
MODULE_TRAVEL
:
case
OnModule
Event
Listener
.
MODULE_TRAVEL
:
if
(
currentModule
==
OnModule
Changed
Listener
.
MODULE_TRAVEL
)
return
;
if
(
currentModule
==
OnModule
Event
Listener
.
MODULE_TRAVEL
)
return
;
if
(
Module
Change
Util
.
currentActivity
!=
null
)
{
if
(
Module
Event
Util
.
currentActivity
!=
null
)
{
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Change
Util
.
currentActivity
,
TravelActivity
.
class
);
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Event
Util
.
currentActivity
,
TravelActivity
.
class
);
}
else
{
}
else
{
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
TravelActivity
.
class
);
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
TravelActivity
.
class
);
}
}
break
;
break
;
case
OnModule
Changed
Listener
.
MODULE_CAMP
:
case
OnModule
Event
Listener
.
MODULE_CAMP
:
if
(
currentModule
==
OnModule
Changed
Listener
.
MODULE_CAMP
)
return
;
if
(
currentModule
==
OnModule
Event
Listener
.
MODULE_CAMP
)
return
;
//Toast.makeText(FrameApp.getInstance(), "营地", Toast.LENGTH_SHORT).show();
//Toast.makeText(FrameApp.getInstance(), "营地", Toast.LENGTH_SHORT).show();
break
;
break
;
case
OnModule
Changed
Listener
.
MODULE_FIND
:
case
OnModule
Event
Listener
.
MODULE_FIND
:
if
(
currentModule
==
OnModule
Changed
Listener
.
MODULE_FIND
)
return
;
if
(
currentModule
==
OnModule
Event
Listener
.
MODULE_FIND
)
return
;
//Toast.makeText(FrameApp.getInstance(), "发现", Toast.LENGTH_SHORT).show();
//Toast.makeText(FrameApp.getInstance(), "发现", Toast.LENGTH_SHORT).show();
break
;
break
;
case
OnModule
Changed
Listener
.
MODULE_MINE
:
case
OnModule
Event
Listener
.
MODULE_MINE
:
if
(
currentModule
==
OnModule
Changed
Listener
.
MODULE_MINE
)
return
;
if
(
currentModule
==
OnModule
Event
Listener
.
MODULE_MINE
)
return
;
if
(
Module
Change
Util
.
currentActivity
!=
null
)
{
if
(
Module
Event
Util
.
currentActivity
!=
null
)
{
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Change
Util
.
currentActivity
,
MineActivity
.
class
);
IntentUtil
.
goActivityWithAnimationAlpha
(
Module
Event
Util
.
currentActivity
,
MineActivity
.
class
);
}
else
{
}
else
{
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
MineActivity
.
class
);
IntentUtil
.
startActivity
(
FrameApp
.
getInstance
(),
MineActivity
.
class
);
}
}
...
@@ -64,8 +65,34 @@ public class ModuleUtil {
...
@@ -64,8 +65,34 @@ public class ModuleUtil {
}
}
@Override
@Override
public
void
onLogin
()
{
public
void
onLogin
(
int
type
)
{
FrameApp
.
getInstance
().
startActivity
(
LoginRvActivity
.
getIntent
(
FrameApp
.
getInstance
()));
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
)
{
}
}
});
});
}
}
...
...
RvClient/src/main/java/com/test/rv/RvClientApplication.java
View file @
3c657219
...
@@ -13,7 +13,7 @@ import com.base.utils.eventbusmodel.EventRestartApp;
...
@@ -13,7 +13,7 @@ import com.base.utils.eventbusmodel.EventRestartApp;
import
com.frame.base.FrameApp
;
import
com.frame.base.FrameApp
;
import
com.frame.base.bean.BeanHeartbeat
;
import
com.frame.base.bean.BeanHeartbeat
;
import
com.frame.base.manager.MyFrameManager
;
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.ruiwenliu.wrapper.util.LogUtils
;
import
com.tencent.bugly.crashreport.CrashReport
;
import
com.tencent.bugly.crashreport.CrashReport
;
import
com.umeng.commonsdk.UMConfigure
;
import
com.umeng.commonsdk.UMConfigure
;
...
...
RvFrame/src/main/java/com/frame/rv/Module
Change
Util.java
→
RvFrame/src/main/java/com/frame/rv/Module
Event
Util.java
View file @
3c657219
...
@@ -3,18 +3,18 @@ package com.frame.rv;
...
@@ -3,18 +3,18 @@ package com.frame.rv;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.app.Activity
;
import
android.app.Activity
;
public
class
Module
Change
Util
{
public
class
Module
Event
Util
{
@SuppressLint
(
"StaticFieldLeak"
)
@SuppressLint
(
"StaticFieldLeak"
)
public
static
Activity
currentActivity
=
null
;
public
static
Activity
currentActivity
=
null
;
public
static
OnModule
ChangedListener
getOnModuleChanged
Listener
()
{
public
static
OnModule
EventListener
getOnModuleEvent
Listener
()
{
return
onModule
Changed
Listener
;
return
onModule
Event
Listener
;
}
}
public
static
void
setOnModule
ChangedListener
(
OnModuleChangedListener
onModuleChanged
Listener
)
{
public
static
void
setOnModule
EventListener
(
OnModuleEventListener
onModuleEvent
Listener
)
{
Module
ChangeUtil
.
onModuleChangedListener
=
onModuleChanged
Listener
;
Module
EventUtil
.
onModuleEventListener
=
onModuleEvent
Listener
;
}
}
private
static
OnModule
ChangedListener
onModuleChanged
Listener
;
private
static
OnModule
EventListener
onModuleEvent
Listener
;
}
}
RvFrame/src/main/java/com/frame/rv/OnModule
Changed
Listener.java
→
RvFrame/src/main/java/com/frame/rv/OnModule
Event
Listener.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
;
public
interface
OnModule
Changed
Listener
{
public
interface
OnModule
Event
Listener
{
int
MODULE_HOME
=
0
;
int
MODULE_HOME
=
0
;
int
MODULE_TRAVEL
=
1
;
int
MODULE_TRAVEL
=
1
;
int
MODULE_CAMP
=
2
;
int
MODULE_CAMP
=
2
;
...
@@ -13,6 +13,14 @@ public interface OnModuleChangedListener {
...
@@ -13,6 +13,14 @@ public interface OnModuleChangedListener {
//当前模块首页的Activity被销毁
//当前模块首页的Activity被销毁
void
onClear
();
void
onClear
();
//需要登录
int
MODULE_LOGIN_START
=
10
;
//开始登录
void
onLogin
();
int
MODULE_LOGIN_FINISH
=
11
;
//登录结束
//需要登录、登录结束
void
onLogin
(
int
type
);
int
MODULE_PAY_START
=
20
;
//开始支付
int
MODULE_PAY_FINISH
=
21
;
//支付结束
//需要支付、支付结束
void
onPay
(
int
type
);
}
}
RvFrame/src/main/java/com/frame/rv/RvFrameTestActivity.java
deleted
100644 → 0
View file @
34e3bc7e
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
);
}
}
RvFrame/src/main/java/com/frame/rv/RvFrameConfig.java
→
RvFrame/src/main/java/com/frame/rv/
config/
RvFrameConfig.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
.
config
;
/**
/**
...
...
RvFrame/src/main/java/com/frame/rv/RvFrameConstant.java
→
RvFrame/src/main/java/com/frame/rv/
config/
RvFrameConstant.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
.
config
;
/**
/**
* Created by Amuse
* Created by Amuse
...
...
RvFrame/src/main/java/com/frame/rv/BaseTabLayout.java
→
RvFrame/src/main/java/com/frame/rv/
widget/
BaseTabLayout.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
.
widget
;
import
android.content.Context
;
import
android.content.Context
;
import
android.support.v4.content.ContextCompat
;
import
android.support.v4.content.ContextCompat
;
...
@@ -9,6 +9,10 @@ import android.widget.FrameLayout;
...
@@ -9,6 +9,10 @@ import android.widget.FrameLayout;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
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
class
BaseTabLayout
extends
FrameLayout
{
public
BaseTabLayout
(
Context
context
)
{
public
BaseTabLayout
(
Context
context
)
{
super
(
context
);
super
(
context
);
...
@@ -44,25 +48,25 @@ public class BaseTabLayout extends FrameLayout {
...
@@ -44,25 +48,25 @@ public class BaseTabLayout extends FrameLayout {
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
int
i
=
v
.
getId
();
int
i
=
v
.
getId
();
if
(
i
==
R
.
id
.
rl_home
)
{
if
(
i
==
R
.
id
.
rl_home
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_HOME
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_HOME
);
}
}
}
else
if
(
i
==
R
.
id
.
rl_travel
)
{
}
else
if
(
i
==
R
.
id
.
rl_travel
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_TRAVEL
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_TRAVEL
);
}
}
}
else
if
(
i
==
R
.
id
.
rl_camp
)
{
}
else
if
(
i
==
R
.
id
.
rl_camp
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_CAMP
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_CAMP
);
}
}
}
else
if
(
i
==
R
.
id
.
rl_found
)
{
}
else
if
(
i
==
R
.
id
.
rl_found
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_FIND
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_FIND
);
}
}
}
else
if
(
i
==
R
.
id
.
rl_mine
)
{
}
else
if
(
i
==
R
.
id
.
rl_mine
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_MINE
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_MINE
);
}
}
}
}
}
}
...
@@ -91,7 +95,7 @@ public class BaseTabLayout extends FrameLayout {
...
@@ -91,7 +95,7 @@ public class BaseTabLayout extends FrameLayout {
}
}
private
int
currentTab
=
OnModule
Changed
Listener
.
MODULE_HOME
;
private
int
currentTab
=
OnModule
Event
Listener
.
MODULE_HOME
;
public
void
setCurrent
(
int
tab
)
{
public
void
setCurrent
(
int
tab
)
{
currentTab
=
tab
;
currentTab
=
tab
;
...
@@ -103,11 +107,11 @@ public class BaseTabLayout extends FrameLayout {
...
@@ -103,11 +107,11 @@ public class BaseTabLayout extends FrameLayout {
* 设置切换
* 设置切换
*/
*/
private
void
setCurrentTab
()
{
private
void
setCurrentTab
()
{
setViewStyle
(
ivHome
,
tvHome
,
currentTab
==
OnModule
Changed
Listener
.
MODULE_HOME
);
setViewStyle
(
ivHome
,
tvHome
,
currentTab
==
OnModule
Event
Listener
.
MODULE_HOME
);
setViewStyle
(
ivTravel
,
tvTravel
,
currentTab
==
OnModule
Changed
Listener
.
MODULE_TRAVEL
);
setViewStyle
(
ivTravel
,
tvTravel
,
currentTab
==
OnModule
Event
Listener
.
MODULE_TRAVEL
);
setViewStyle
(
ivCamp
,
tvCamp
,
currentTab
==
OnModule
Changed
Listener
.
MODULE_CAMP
);
setViewStyle
(
ivCamp
,
tvCamp
,
currentTab
==
OnModule
Event
Listener
.
MODULE_CAMP
);
setViewStyle
(
ivFound
,
tvFound
,
currentTab
==
OnModule
Changed
Listener
.
MODULE_FIND
);
setViewStyle
(
ivFound
,
tvFound
,
currentTab
==
OnModule
Event
Listener
.
MODULE_FIND
);
setViewStyle
(
ivMine
,
tvMine
,
currentTab
==
OnModule
Changed
Listener
.
MODULE_MINE
);
setViewStyle
(
ivMine
,
tvMine
,
currentTab
==
OnModule
Event
Listener
.
MODULE_MINE
);
}
}
/**
/**
...
...
RvFrame/src/main/java/com/frame/rv/BaseTipsLayout.java
→
RvFrame/src/main/java/com/frame/rv/
widget/
BaseTipsLayout.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
.
widget
;
import
android.content.Context
;
import
android.content.Context
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
...
@@ -9,6 +9,8 @@ import android.widget.ProgressBar;
...
@@ -9,6 +9,8 @@ import android.widget.ProgressBar;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.frame.rv.R
;
import
java.util.List
;
import
java.util.List
;
public
class
BaseTipsLayout
extends
RelativeLayout
{
public
class
BaseTipsLayout
extends
RelativeLayout
{
...
...
RvFrame/src/main/java/com/frame/rv/BaseTitleBarLayout.java
→
RvFrame/src/main/java/com/frame/rv/
widget/
BaseTitleBarLayout.java
View file @
3c657219
package
com
.
frame
.
rv
;
package
com
.
frame
.
rv
.
widget
;
import
android.content.Context
;
import
android.content.Context
;
import
android.util.AttributeSet
;
import
android.util.AttributeSet
;
...
@@ -8,6 +8,8 @@ import android.widget.ImageView;
...
@@ -8,6 +8,8 @@ import android.widget.ImageView;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.frame.rv.R
;
public
class
BaseTitleBarLayout
extends
RelativeLayout
{
public
class
BaseTitleBarLayout
extends
RelativeLayout
{
public
BaseTitleBarLayout
(
Context
context
)
{
public
BaseTitleBarLayout
(
Context
context
)
{
super
(
context
);
super
(
context
);
...
...
RvFrame/src/main/res/layout/frame_test_main.xml
deleted
100644 → 0
View file @
34e3bc7e
<?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
RvHome/src/main/java/com/rv/home/rv/module/ApiConfig.java
View file @
3c657219
package
com
.
rv
.
home
.
rv
.
module
;
package
com
.
rv
.
home
.
rv
.
module
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
/**
/**
* Created :Auser
* Created :Auser
...
...
RvHome/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java
View file @
3c657219
...
@@ -5,7 +5,9 @@ import android.content.Intent;
...
@@ -5,7 +5,9 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
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.presenter.MvpPresenter
;
import
com.ruiwenliu.wrapper.util.UtilsManager
;
import
com.ruiwenliu.wrapper.util.UtilsManager
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
...
@@ -117,6 +119,9 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
...
@@ -117,6 +119,9 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
break
;
break
;
default
:
default
:
startActivity
(
HomeActivity
.
getIntent
(
mActivity
));
startActivity
(
HomeActivity
.
getIntent
(
mActivity
));
if
(
ModuleEventUtil
.
getOnModuleEventListener
()
!=
null
)
{
ModuleEventUtil
.
getOnModuleEventListener
().
onLogin
(
OnModuleEventListener
.
MODULE_LOGIN_FINISH
);
}
break
;
break
;
}
}
finish
();
finish
();
...
...
RvHome/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java
View file @
3c657219
...
@@ -7,7 +7,7 @@ import android.text.TextUtils;
...
@@ -7,7 +7,7 @@ import android.text.TextUtils;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
import
com.ruiwenliu.wrapper.R
;
import
com.ruiwenliu.wrapper.R
;
import
com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity
;
import
com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity
;
import
com.ruiwenliu.wrapper.inter.OnViewHolder
;
import
com.ruiwenliu.wrapper.inter.OnViewHolder
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/basic/presenter/CommonPresenter.java
View file @
3c657219
package
com
.
rv
.
home
.
rv
.
module
.
basic
.
presenter
;
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
;
import
com.ruiwenliu.wrapper.presenter.MvpPresenter
;
/**
/**
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java
View file @
3c657219
...
@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
...
@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.weight.TitleView;
import
com.rv.home.R
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
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.ApiConfig
;
import
com.rv.home.rv.module.basic.BaseLoginActivity
;
import
com.rv.home.rv.module.basic.BaseLoginActivity
;
import
com.rv.home.rv.module.basic.presenter.CommonPresenter
;
import
com.rv.home.rv.module.basic.presenter.CommonPresenter
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/HomeActivity.java
View file @
3c657219
...
@@ -9,8 +9,8 @@ import android.view.View;
...
@@ -9,8 +9,8 @@ import android.view.View;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.frame.rv.Module
Change
Util
;
import
com.frame.rv.Module
Event
Util
;
import
com.frame.rv.OnModule
Changed
Listener
;
import
com.frame.rv.OnModule
Event
Listener
;
import
com.ruiwenliu.wrapper.base.BaseActivity
;
import
com.ruiwenliu.wrapper.base.BaseActivity
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseWrapperFragment
;
import
com.ruiwenliu.wrapper.base.BaseWrapperFragment
;
...
@@ -99,35 +99,35 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
...
@@ -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
})
@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
)
{
public
void
onViewClicked
(
View
view
)
{
Module
Change
Util
.
currentActivity
=
this
;
Module
Event
Util
.
currentActivity
=
this
;
int
i
=
view
.
getId
();
int
i
=
view
.
getId
();
if
(
i
==
R
.
id
.
rl_home
)
{
if
(
i
==
R
.
id
.
rl_home
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_HOME
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_HOME
);
return
;
return
;
}
}
setCurrent
(
TYPE_HOME_PAGE
);
setCurrent
(
TYPE_HOME_PAGE
);
}
else
if
(
i
==
R
.
id
.
rl_travel
)
{
}
else
if
(
i
==
R
.
id
.
rl_travel
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_TRAVEL
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_TRAVEL
);
return
;
return
;
}
}
setCurrent
(
TYPE_TRAVEL
);
setCurrent
(
TYPE_TRAVEL
);
}
else
if
(
i
==
R
.
id
.
rl_camp
)
{
}
else
if
(
i
==
R
.
id
.
rl_camp
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_CAMP
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_CAMP
);
return
;
return
;
}
}
setCurrent
(
TYPE_CAMP
);
setCurrent
(
TYPE_CAMP
);
}
else
if
(
i
==
R
.
id
.
rl_found
)
{
}
else
if
(
i
==
R
.
id
.
rl_found
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_FIND
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_FIND
);
return
;
return
;
}
}
...
@@ -135,8 +135,8 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
...
@@ -135,8 +135,8 @@ public class HomeActivity extends BaseActivity<CommonPresenter> {
}
else
if
(
i
==
R
.
id
.
rl_mine
)
{
}
else
if
(
i
==
R
.
id
.
rl_mine
)
{
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChangedListener
().
onChanged
(
OnModuleChanged
Listener
.
MODULE_MINE
);
Module
EventUtil
.
getOnModuleEventListener
().
onChanged
(
OnModuleEvent
Listener
.
MODULE_MINE
);
return
;
return
;
}
}
if
(
TextUtils
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
if
(
TextUtils
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java
View file @
3c657219
...
@@ -16,7 +16,7 @@ import android.webkit.WebView;
...
@@ -16,7 +16,7 @@ import android.webkit.WebView;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.util.um.CustomShareListener
;
import
com.ruiwenliu.wrapper.util.um.CustomShareListener
;
import
com.ruiwenliu.wrapper.util.um.ShareManager
;
import
com.ruiwenliu.wrapper.util.um.ShareManager
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalActivity.java
View file @
3c657219
...
@@ -24,7 +24,7 @@ import android.widget.TimePicker;
...
@@ -24,7 +24,7 @@ import android.widget.TimePicker;
import
com.baidu.location.BDAbstractLocationListener
;
import
com.baidu.location.BDAbstractLocationListener
;
import
com.baidu.location.BDLocation
;
import
com.baidu.location.BDLocation
;
import
com.baidu.mapapi.model.LatLng
;
import
com.baidu.mapapi.model.LatLng
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.util.LocationManager
;
import
com.ruiwenliu.wrapper.util.LocationManager
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java
View file @
3c657219
...
@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
...
@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.base.BaseBean
;
import
com.rv.home.R
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.R2
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java
View file @
3c657219
...
@@ -17,7 +17,7 @@ import android.widget.RatingBar;
...
@@ -17,7 +17,7 @@ import android.widget.RatingBar;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.frame.base.glide.GlideManager
;
import
com.frame.base.glide.GlideManager
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
...
@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
import
android.view.View
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.base.BaseBean
;
import
com.rv.home.R
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.R2
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java
View file @
3c657219
...
@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
...
@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.frame.base.glide.GlideManager
;
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.ruiwenliu.wrapper.base.BaseBean
;
import
com.rv.home.R
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.R2
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/HomePageFragment.java
View file @
3c657219
...
@@ -24,7 +24,7 @@ import android.widget.TimePicker;
...
@@ -24,7 +24,7 @@ import android.widget.TimePicker;
import
com.baidu.location.BDAbstractLocationListener
;
import
com.baidu.location.BDAbstractLocationListener
;
import
com.baidu.location.BDLocation
;
import
com.baidu.location.BDLocation
;
import
com.baidu.mapapi.model.LatLng
;
import
com.baidu.mapapi.model.LatLng
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/PayForActivity.java
View file @
3c657219
...
@@ -6,7 +6,7 @@ import android.os.Bundle;
...
@@ -6,7 +6,7 @@ import android.os.Bundle;
import
android.view.View
;
import
android.view.View
;
import
android.widget.Button
;
import
android.widget.Button
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
import
com.google.gson.annotations.SerializedName
;
import
com.google.gson.annotations.SerializedName
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.rv.home.R
;
import
com.rv.home.R
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/SelectShopActivity.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
...
@@ -8,7 +8,7 @@ import android.support.v7.widget.RecyclerView;
import
android.view.View
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.base.BaseBean
;
import
com.rv.home.R
;
import
com.rv.home.R
;
import
com.rv.home.R2
;
import
com.rv.home.R2
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/ShopShowActivity.java
View file @
3c657219
...
@@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MarkerOptions;
...
@@ -22,7 +22,7 @@ import com.baidu.mapapi.map.MarkerOptions;
import
com.baidu.mapapi.map.MyLocationData
;
import
com.baidu.mapapi.map.MyLocationData
;
import
com.baidu.mapapi.map.OverlayOptions
;
import
com.baidu.mapapi.map.OverlayOptions
;
import
com.baidu.mapapi.model.LatLng
;
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.base.BaseBean
;
import
com.ruiwenliu.wrapper.util.LocationManager
;
import
com.ruiwenliu.wrapper.util.LocationManager
;
import
com.ruiwenliu.wrapper.util.MapUtil
;
import
com.ruiwenliu.wrapper.util.MapUtil
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/AllOrderFragment.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.view.View;
...
@@ -8,7 +8,7 @@ import android.view.View;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CancelTheTripActivity.java
View file @
3c657219
...
@@ -9,7 +9,7 @@ import android.text.TextUtils;
...
@@ -9,7 +9,7 @@ import android.text.TextUtils;
import
android.view.View
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.base.BaseBean
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
...
@@ -25,7 +25,6 @@ import com.yuyife.okgo.OkGoUtil;
...
@@ -25,7 +25,6 @@ import com.yuyife.okgo.OkGoUtil;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
butterknife.BindView
;
import
butterknife.BindView
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/CompletedFragment.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.view.View;
...
@@ -8,7 +8,7 @@ import android.view.View;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java
View file @
3c657219
...
@@ -16,7 +16,7 @@ import android.widget.RatingBar;
...
@@ -16,7 +16,7 @@ import android.widget.RatingBar;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
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.base.BaseBean
;
import
com.ruiwenliu.wrapper.util.listener.TextChangedListener
;
import
com.ruiwenliu.wrapper.util.listener.TextChangedListener
;
import
com.rv.home.R
;
import
com.rv.home.R
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java
View file @
3c657219
...
@@ -5,12 +5,11 @@ import android.os.Bundle;
...
@@ -5,12 +5,11 @@ import android.os.Bundle;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.util.Log
;
import
android.view.View
;
import
android.view.View
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/HaveToTravelFragment.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.view.View;
...
@@ -8,7 +8,7 @@ import android.view.View;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderDetailActivity.java
View file @
3c657219
...
@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
...
@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @
3c657219
...
@@ -8,7 +8,7 @@ import android.view.View;
...
@@ -8,7 +8,7 @@ import android.view.View;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.BaseQuickAdapter
;
import
com.chad.library.adapter.base.entity.MultiItemEntity
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.base.BaseFragment
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
import
com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
;
...
...
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java
View file @
3c657219
...
@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
...
@@ -15,7 +15,7 @@ import android.webkit.WebViewClient;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
import
android.widget.TextView
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
import
com.ruiwenliu.wrapper.util.ViewHolder
;
...
...
RvHome/src/main/java/com/rv/home/rv/wxapi/WXPayEntryActivity.java
View file @
3c657219
...
@@ -6,7 +6,7 @@ import android.os.Bundle;
...
@@ -6,7 +6,7 @@ import android.os.Bundle;
import
android.util.Log
;
import
android.util.Log
;
import
android.widget.TextView
;
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.BaseBean
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.ruiwenliu.wrapper.weight.TitleView
;
import
com.rv.home.R
;
import
com.rv.home.R
;
...
...
RvMine/src/main/java/com/rv/rvmine/MineActivity.java
View file @
3c657219
...
@@ -5,7 +5,6 @@ import android.content.Intent;
...
@@ -5,7 +5,6 @@ import android.content.Intent;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.LinearLayout
;
import
android.widget.LinearLayout
;
...
@@ -16,9 +15,9 @@ import com.base.utils.tools.android.IntentUtil;
...
@@ -16,9 +15,9 @@ import com.base.utils.tools.android.IntentUtil;
import
com.base.utils.ui.image.round.RoundImageView
;
import
com.base.utils.ui.image.round.RoundImageView
;
import
com.frame.base.browse.ActivityImageBrowseInt
;
import
com.frame.base.browse.ActivityImageBrowseInt
;
import
com.frame.base.glide.GlideManager
;
import
com.frame.base.glide.GlideManager
;
import
com.frame.rv.BaseTabLayout
;
import
com.frame.rv.
widget.
BaseTabLayout
;
import
com.frame.rv.Module
Change
Util
;
import
com.frame.rv.Module
Event
Util
;
import
com.frame.rv.OnModule
Changed
Listener
;
import
com.frame.rv.OnModule
Event
Listener
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.base.BaseStatusActivity
;
import
com.ruiwenliu.wrapper.util.UtilsManager
;
import
com.ruiwenliu.wrapper.util.UtilsManager
;
...
@@ -92,10 +91,10 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -92,10 +91,10 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
@Override
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
protected
void
initView
(
Bundle
savedInstanceState
,
TitleView
titleView
,
Intent
intent
)
{
Module
Change
Util
.
currentActivity
=
this
;
Module
Event
Util
.
currentActivity
=
this
;
showTitle
(
false
);
showTitle
(
false
);
travelTabLayout
.
setCurrent
(
OnModule
Changed
Listener
.
MODULE_MINE
);
travelTabLayout
.
setCurrent
(
OnModule
Event
Listener
.
MODULE_MINE
);
setBanner
();
setBanner
();
if
(
TextUtils
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
if
(
TextUtils
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
tvNickname
.
setVisibility
(
View
.
GONE
);
tvNickname
.
setVisibility
(
View
.
GONE
);
...
@@ -116,7 +115,7 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -116,7 +115,7 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
@Override
protected
void
onNewIntent
(
Intent
intent
)
{
protected
void
onNewIntent
(
Intent
intent
)
{
super
.
onNewIntent
(
intent
);
super
.
onNewIntent
(
intent
);
Module
Change
Util
.
currentActivity
=
this
;
Module
Event
Util
.
currentActivity
=
this
;
}
}
...
@@ -249,8 +248,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
...
@@ -249,8 +248,8 @@ public class MineActivity extends BaseStatusActivity<CommonPresenter> {
@Override
@Override
public
void
onDestroy
()
{
public
void
onDestroy
()
{
super
.
onDestroy
();
super
.
onDestroy
();
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChanged
Listener
().
onClear
();
Module
EventUtil
.
getOnModuleEvent
Listener
().
onClear
();
}
}
}
}
}
}
RvMine/src/main/res/layout/activity_mine.xml
View file @
3c657219
...
@@ -421,7 +421,7 @@
...
@@ -421,7 +421,7 @@
</LinearLayout>
</LinearLayout>
<com.frame.rv.BaseTabLayout
<com.frame.rv.
widget.
BaseTabLayout
android:id=
"@+id/travel_tab_layout"
android:id=
"@+id/travel_tab_layout"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvTravel/src/main/java/com/rv/travel/GoOtherUtil.java
View file @
3c657219
package
com
.
rv
.
travel
;
package
com
.
rv
.
travel
;
import
android.app.Activity
;
import
android.app.Activity
;
import
android.content.Context
;
import
com.base.utils.tools.android.IntentUtil
;
import
com.base.utils.tools.android.IntentUtil
;
import
com.rv.travel.fragment.TravelFragmentCommitOrder
;
import
com.rv.travel.fragment.TravelFragmentCommitOrder
;
...
@@ -13,7 +14,7 @@ public class GoOtherUtil {
...
@@ -13,7 +14,7 @@ public class GoOtherUtil {
public
static
String
travelDetailId
=
"0"
;
public
static
String
travelDetailId
=
"0"
;
//去旅游详情
//去旅游详情
public
static
void
goTravelDetailWeb
(
String
id
,
Activity
activity
)
{
public
static
void
goTravelDetailWeb
(
String
id
,
Context
context
)
{
GoOtherUtil
.
travelDetailId
=
id
;
GoOtherUtil
.
travelDetailId
=
id
;
String
url
=
"https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id="
+
id
;
String
url
=
"https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id="
+
id
;
//TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
//TravelFragmentActivity.currentFragment = TravelWebFragment.getInstance(url);
...
@@ -33,18 +34,18 @@ public class GoOtherUtil {
...
@@ -33,18 +34,18 @@ public class GoOtherUtil {
}
}
});
});
TravelFragmentActivity
.
option
=
otherOption
;
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
);
TravelFragmentActivity
.
currentFragment
=
TravelFragmentCommitOrder
.
getInstance
(
data
);
OtherOption
otherOption
=
new
OtherOption
();
OtherOption
otherOption
=
new
OtherOption
();
otherOption
.
setTitle
(
"确认下单"
);
otherOption
.
setTitle
(
"确认下单"
);
otherOption
.
setClickListener
(
new
OtherClickListener
()
{
otherOption
.
setClickListener
(
new
OtherClickListener
()
{
@Override
@Override
public
void
onBack
()
{
public
void
onBack
()
{
GoOtherUtil
.
goTravelDetailWeb
(
GoOtherUtil
.
travelDetailId
,
activity
);
GoOtherUtil
.
goTravelDetailWeb
(
GoOtherUtil
.
travelDetailId
,
context
);
}
}
@Override
@Override
...
@@ -53,6 +54,6 @@ public class GoOtherUtil {
...
@@ -53,6 +54,6 @@ public class GoOtherUtil {
}
}
});
});
TravelFragmentActivity
.
option
=
otherOption
;
TravelFragmentActivity
.
option
=
otherOption
;
IntentUtil
.
goActivityWithAnimationAlpha
(
activity
,
TravelFragmentActivity
.
class
);
IntentUtil
.
startActivity
(
context
,
TravelFragmentActivity
.
class
);
}
}
}
}
RvTravel/src/main/java/com/rv/travel/TravelActivity.java
View file @
3c657219
...
@@ -14,9 +14,9 @@ import android.widget.LinearLayout;
...
@@ -14,9 +14,9 @@ import android.widget.LinearLayout;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.base.utils.base.BaseActivity
;
import
com.base.utils.base.BaseActivity
;
import
com.frame.rv.BaseTabLayout
;
import
com.frame.rv.
widget.
BaseTabLayout
;
import
com.frame.rv.Module
Change
Util
;
import
com.frame.rv.Module
Event
Util
;
import
com.frame.rv.OnModule
Changed
Listener
;
import
com.frame.rv.OnModule
Event
Listener
;
import
com.rv.travel.api.ApiUtil
;
import
com.rv.travel.api.ApiUtil
;
import
com.rv.travel.api.OnApiResponseCallback
;
import
com.rv.travel.api.OnApiResponseCallback
;
import
com.rv.travel.bean.BeanHot
;
import
com.rv.travel.bean.BeanHot
;
...
@@ -32,6 +32,7 @@ import butterknife.ButterKnife;
...
@@ -32,6 +32,7 @@ import butterknife.ButterKnife;
import
butterknife.OnClick
;
import
butterknife.OnClick
;
public
class
TravelActivity
extends
BaseActivity
{
public
class
TravelActivity
extends
BaseActivity
{
public
static
boolean
isNeedLogin
=
false
;
//是否需要登录
@SuppressLint
(
"StaticFieldLeak"
)
@SuppressLint
(
"StaticFieldLeak"
)
private
static
TravelActivity
instance
;
private
static
TravelActivity
instance
;
...
@@ -95,7 +96,7 @@ public class TravelActivity extends BaseActivity {
...
@@ -95,7 +96,7 @@ public class TravelActivity extends BaseActivity {
setContentView
(
R
.
layout
.
activity_travel
);
setContentView
(
R
.
layout
.
activity_travel
);
ButterKnife
.
bind
(
this
);
ButterKnife
.
bind
(
this
);
instance
=
this
;
instance
=
this
;
Module
Change
Util
.
currentActivity
=
this
;
Module
Event
Util
.
currentActivity
=
this
;
hotMoreTitleLayoutStatic
=
hotMoreTitleLayout
;
hotMoreTitleLayoutStatic
=
hotMoreTitleLayout
;
onData
();
onData
();
onView
();
onView
();
...
@@ -103,7 +104,7 @@ public class TravelActivity extends BaseActivity {
...
@@ -103,7 +104,7 @@ public class TravelActivity extends BaseActivity {
@Override
@Override
public
void
onData
()
{
public
void
onData
()
{
tabLayout
.
setCurrent
(
OnModule
Changed
Listener
.
MODULE_TRAVEL
);
tabLayout
.
setCurrent
(
OnModule
Event
Listener
.
MODULE_TRAVEL
);
//13766666666 12345678
//13766666666 12345678
//13612688539 12345678
//13612688539 12345678
...
@@ -161,7 +162,7 @@ public class TravelActivity extends BaseActivity {
...
@@ -161,7 +162,7 @@ public class TravelActivity extends BaseActivity {
@Override
@Override
protected
void
onNewIntent
(
Intent
intent
)
{
protected
void
onNewIntent
(
Intent
intent
)
{
super
.
onNewIntent
(
intent
);
super
.
onNewIntent
(
intent
);
Module
Change
Util
.
currentActivity
=
this
;
Module
Event
Util
.
currentActivity
=
this
;
}
}
...
@@ -197,8 +198,8 @@ public class TravelActivity extends BaseActivity {
...
@@ -197,8 +198,8 @@ public class TravelActivity extends BaseActivity {
super
.
onDestroy
();
super
.
onDestroy
();
instance
=
null
;
instance
=
null
;
hotMoreTitleLayoutStatic
=
null
;
hotMoreTitleLayoutStatic
=
null
;
if
(
Module
ChangeUtil
.
getOnModuleChanged
Listener
()
!=
null
)
{
if
(
Module
EventUtil
.
getOnModuleEvent
Listener
()
!=
null
)
{
Module
ChangeUtil
.
getOnModuleChanged
Listener
().
onClear
();
Module
EventUtil
.
getOnModuleEvent
Listener
().
onClear
();
}
}
}
}
}
}
RvTravel/src/main/java/com/rv/travel/api/TravelApi.java
View file @
3c657219
package
com
.
rv
.
travel
.
api
;
package
com
.
rv
.
travel
.
api
;
import
com.frame.rv.RvFrameConfig
;
import
com.frame.rv.
config.
RvFrameConfig
;
public
interface
TravelApi
extends
RvFrameConfig
{
public
interface
TravelApi
extends
RvFrameConfig
{
//登录 参数拼接在url上然后 post 请求
//登录 参数拼接在url上然后 post 请求
...
...
RvTravel/src/main/java/com/rv/travel/fragment/AndroidInterface.java
View file @
3c657219
...
@@ -24,7 +24,7 @@ public class AndroidInterface {
...
@@ -24,7 +24,7 @@ public class AndroidInterface {
@JavascriptInterface
@JavascriptInterface
public
void
readyOrder
(
String
orderJson
)
{
public
void
readyOrder
(
String
orderJson
)
{
GoOtherUtil
.
goTravelCommitOrder
(
orderJson
,
travelWebFragment
.
get
Activity
());
GoOtherUtil
.
goTravelCommitOrder
(
orderJson
,
travelWebFragment
.
get
Context
());
}
}
...
...
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotMore.java
View file @
3c657219
...
@@ -11,7 +11,7 @@ import android.view.ViewGroup;
...
@@ -11,7 +11,7 @@ import android.view.ViewGroup;
import
com.base.animset.util.NiftyEffects
;
import
com.base.animset.util.NiftyEffects
;
import
com.base.utils.base.BaseFragment
;
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.R
;
import
com.rv.travel.R2
;
import
com.rv.travel.R2
;
import
com.rv.travel.TravelActivity
;
import
com.rv.travel.TravelActivity
;
...
...
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentHotType.java
View file @
3c657219
...
@@ -17,7 +17,7 @@ import com.base.utils.base.BaseFragment;
...
@@ -17,7 +17,7 @@ import com.base.utils.base.BaseFragment;
import
com.base.utils.tools.android.IntentUtil
;
import
com.base.utils.tools.android.IntentUtil
;
import
com.frame.base.browse.ActivityImageBrowseUrl
;
import
com.frame.base.browse.ActivityImageBrowseUrl
;
import
com.frame.base.glide.GlideManager
;
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.GoOtherUtil
;
import
com.rv.travel.R
;
import
com.rv.travel.R
;
import
com.rv.travel.R2
;
import
com.rv.travel.R2
;
...
@@ -131,7 +131,7 @@ public class TravelFragmentHotType extends BaseFragment {
...
@@ -131,7 +131,7 @@ public class TravelFragmentHotType extends BaseFragment {
adapterRim
.
setItemRootClickListener
(
new
AdapterRim
.
OnItemRootClickListener
()
{
adapterRim
.
setItemRootClickListener
(
new
AdapterRim
.
OnItemRootClickListener
()
{
@Override
@Override
public
void
onItemClick
(
BeanRim
bean
)
{
public
void
onItemClick
(
BeanRim
bean
)
{
GoOtherUtil
.
goTravelDetailWeb
(
bean
.
getId
(),
getActivity
()
);
GoOtherUtil
.
goTravelDetailWeb
(
bean
.
getId
(),
baseContext
);
}
}
});
});
final
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
baseContext
);
final
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
baseContext
);
...
...
RvTravel/src/main/java/com/rv/travel/fragment/TravelFragmentMain.java
View file @
3c657219
...
@@ -21,7 +21,7 @@ import com.base.utils.tools.android.KeyboardUtil;
...
@@ -21,7 +21,7 @@ import com.base.utils.tools.android.KeyboardUtil;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
import
com.frame.base.browse.ActivityImageBrowseUrl
;
import
com.frame.base.browse.ActivityImageBrowseUrl
;
import
com.frame.base.glide.GlideManager
;
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.GoOtherUtil
;
import
com.rv.travel.R
;
import
com.rv.travel.R
;
import
com.rv.travel.R2
;
import
com.rv.travel.R2
;
...
@@ -159,7 +159,7 @@ public class TravelFragmentMain extends BaseFragment {
...
@@ -159,7 +159,7 @@ public class TravelFragmentMain extends BaseFragment {
adapterRim
.
setItemRootClickListener
(
new
AdapterRim
.
OnItemRootClickListener
()
{
adapterRim
.
setItemRootClickListener
(
new
AdapterRim
.
OnItemRootClickListener
()
{
@Override
@Override
public
void
onItemClick
(
BeanRim
bean
)
{
public
void
onItemClick
(
BeanRim
bean
)
{
GoOtherUtil
.
goTravelDetailWeb
(
bean
.
getId
(),
getActivity
()
);
GoOtherUtil
.
goTravelDetailWeb
(
bean
.
getId
(),
baseContext
);
}
}
});
});
final
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
baseContext
);
final
LinearLayoutManager
linearLayoutManager
=
new
LinearLayoutManager
(
baseContext
);
...
...
RvTravel/src/main/java/com/rv/travel/fragment/TravelWebFragment.java
View file @
3c657219
...
@@ -12,12 +12,12 @@ import android.widget.LinearLayout;
...
@@ -12,12 +12,12 @@ import android.widget.LinearLayout;
import
com.base.utils.base.BaseFragment
;
import
com.base.utils.base.BaseFragment
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
import
com.frame.base.FrameApp
;
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.just.agentweb.AgentWeb
;
import
com.rv.travel.R
;
import
com.rv.travel.R
;
import
com.rv.travel.R2
;
import
com.rv.travel.R2
;
import
com.rv.travel.TravelActivity
;
import
com.rv.travel.TravelActivity
;
import
com.rv.travel.other.TravelFragmentActivity
;
import
com.yuyife.okgo.OkGoUtil
;
import
com.yuyife.okgo.OkGoUtil
;
import
butterknife.BindView
;
import
butterknife.BindView
;
...
@@ -65,8 +65,9 @@ public class TravelWebFragment extends BaseFragment {
...
@@ -65,8 +65,9 @@ public class TravelWebFragment extends BaseFragment {
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
if
(
TextUtil
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
if
(
TextUtil
.
isEmpty
(
OkGoUtil
.
getToken
()))
{
showToastShort
(
"请先登录"
);
showToastShort
(
"请先登录"
);
if
(
ModuleChangeUtil
.
getOnModuleChangedListener
()
!=
null
)
{
TravelActivity
.
isNeedLogin
=
true
;
ModuleChangeUtil
.
getOnModuleChangedListener
().
onLogin
();
if
(
ModuleEventUtil
.
getOnModuleEventListener
()
!=
null
)
{
ModuleEventUtil
.
getOnModuleEventListener
().
onLogin
(
OnModuleEventListener
.
MODULE_LOGIN_START
);
}
}
return
;
return
;
}
}
...
...
RvTravel/src/main/java/com/rv/travel/other/TravelFragmentActivity.java
View file @
3c657219
...
@@ -6,11 +6,10 @@ import android.os.Bundle;
...
@@ -6,11 +6,10 @@ import android.os.Bundle;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.Button
;
import
com.base.utils.base.BaseActivity
;
import
com.base.utils.base.BaseActivity
;
import
com.base.utils.ui.datetime.selector.util.TextUtil
;
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.R
;
import
com.rv.travel.R2
;
import
com.rv.travel.R2
;
...
...
RvTravel/src/main/res/layout/activity_fragment_other.xml
View file @
3c657219
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<com.frame.rv.BaseTitleBarLayout
<com.frame.rv.
widget.
BaseTitleBarLayout
android:id=
"@+id/other_title_bar_layout"
android:id=
"@+id/other_title_bar_layout"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvTravel/src/main/res/layout/activity_travel.xml
View file @
3c657219
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
android:layout_height=
"0dp"
android:layout_height=
"0dp"
android:layout_weight=
"1"
/>
android:layout_weight=
"1"
/>
<com.frame.rv.BaseTabLayout
<com.frame.rv.
widget.
BaseTabLayout
android:id=
"@+id/travel_tab_layout"
android:id=
"@+id/travel_tab_layout"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvTravel/src/main/res/layout/fragment_travel_hot_more.xml
View file @
3c657219
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<com.frame.rv.BaseTipsLayout
<com.frame.rv.
widget.
BaseTipsLayout
android:id=
"@+id/travel_hot_tips"
android:id=
"@+id/travel_hot_tips"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvTravel/src/main/res/layout/fragment_travel_hot_type.xml
View file @
3c657219
...
@@ -57,7 +57,7 @@
...
@@ -57,7 +57,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<com.frame.rv.BaseTipsLayout
<com.frame.rv.
widget.
BaseTipsLayout
android:id=
"@+id/travel_rim_tips"
android:id=
"@+id/travel_rim_tips"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvTravel/src/main/res/layout/fragment_travel_mian.xml
View file @
3c657219
...
@@ -70,7 +70,7 @@
...
@@ -70,7 +70,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<com.frame.rv.BaseTipsLayout
<com.frame.rv.
widget.
BaseTipsLayout
android:id=
"@+id/travel_hot_tips"
android:id=
"@+id/travel_hot_tips"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<com.frame.rv.BaseTipsLayout
<com.frame.rv.
widget.
BaseTipsLayout
android:id=
"@+id/travel_rim_tips"
android:id=
"@+id/travel_rim_tips"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
...
...
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseStatusActivity.java
View file @
3c657219
...
@@ -7,7 +7,7 @@ import android.text.TextUtils;
...
@@ -7,7 +7,7 @@ import android.text.TextUtils;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.frame.rv.RvFrameConstant
;
import
com.frame.rv.
config.
RvFrameConstant
;
import
com.ruiwenliu.wrapper.R
;
import
com.ruiwenliu.wrapper.R
;
import
com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity
;
import
com.ruiwenliu.wrapper.base.swipe.SwipeBackActivity
;
import
com.ruiwenliu.wrapper.inter.OnViewHolder
;
import
com.ruiwenliu.wrapper.inter.OnViewHolder
;
...
...
RvWrapper/src/main/java/com/ruiwenliu/wrapper/http/RxRequestResult.java
View file @
3c657219
...
@@ -2,7 +2,7 @@ package com.ruiwenliu.wrapper.http;
...
@@ -2,7 +2,7 @@ package com.ruiwenliu.wrapper.http;
import
android.util.Log
;
import
android.util.Log
;
import
com.frame.rv.RvFrameConstant
;
import
com.frame.rv.
config.
RvFrameConstant
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseBean
;
import
com.ruiwenliu.wrapper.base.BaseView
;
import
com.ruiwenliu.wrapper.base.BaseView
;
...
...
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