Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0765eacd
authored
Jan 12, 2018
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
集成友盟事件统计和页面停留时间
parent
8bf2d153
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
71 additions
and
30 deletions
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
app/src/main/res/layout/activity_webview.xml
app/src/main/res/layout/fragment_order_datails.xml
apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java
app/src/main/java/com/dayu/bigfish/InitializeActivity.java
View file @
0765eacd
...
@@ -65,7 +65,7 @@ public class InitializeActivity extends AppCompatActivity {
...
@@ -65,7 +65,7 @@ public class InitializeActivity extends AppCompatActivity {
}
else
{
}
else
{
intent
=
new
Intent
(
InitializeActivity
.
this
,
LoginActivity
.
class
);
intent
=
new
Intent
(
InitializeActivity
.
this
,
LoginActivity
.
class
);
}
}
mDisposable
=
Observable
.
timer
(
2
000
,
TimeUnit
.
MICROSECONDS
).
subscribe
(
mDisposable
=
Observable
.
timer
(
1
000
,
TimeUnit
.
MICROSECONDS
).
subscribe
(
aLong
->
{
aLong
->
{
startActivity
(
intent
);
startActivity
(
intent
);
finish
();
finish
();
...
...
app/src/main/java/com/dayu/bigfish/presenter/homefourtab/HomePersonPresenter.java
View file @
0765eacd
...
@@ -4,6 +4,7 @@ import android.databinding.ObservableField;
...
@@ -4,6 +4,7 @@ import android.databinding.ObservableField;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.bean.AlipayInfo
;
import
com.dayu.bigfish.bean.AlipayInfo
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.dayu.bigfish.bean.OrderRecord
;
import
com.dayu.bigfish.bean.OrderRecord
;
...
@@ -74,7 +75,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
...
@@ -74,7 +75,7 @@ public class HomePersonPresenter extends HomeFourContract.Presenter {
@Override
@Override
public
void
dumpToPersonalInfo
()
{
public
void
dumpToPersonalInfo
()
{
mView
.
startActivity
(
PersonInfoActivity
.
class
);
mView
.
startActivity
(
PersonInfoActivity
.
class
);
MobclickAgent
.
onEvent
(
mActivity
,
"check_personInfo"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"check_personInfo"
);
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/homeorder/HomeOrderPresenter.java
View file @
0765eacd
...
@@ -2,6 +2,7 @@ package com.dayu.bigfish.presenter.homeorder;
...
@@ -2,6 +2,7 @@ package com.dayu.bigfish.presenter.homeorder;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.bean.Tab
;
import
com.dayu.bigfish.bean.Tab
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.ui.OrderRecordActivity
;
import
com.dayu.bigfish.ui.OrderRecordActivity
;
...
@@ -54,7 +55,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
...
@@ -54,7 +55,7 @@ public class HomeOrderPresenter extends HomeOrderContract.Presenter {
@Override
@Override
public
void
dumpToOrderRecordActivity
()
{
public
void
dumpToOrderRecordActivity
()
{
mView
.
startActivity
(
OrderRecordActivity
.
class
);
mView
.
startActivity
(
OrderRecordActivity
.
class
);
MobclickAgent
.
onEvent
(
mActivity
,
"order_history"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"order_history"
);
}
}
...
...
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
View file @
0765eacd
...
@@ -13,8 +13,14 @@ import com.dayu.bigfish.ui.views.CustomDialog;
...
@@ -13,8 +13,14 @@ import com.dayu.bigfish.ui.views.CustomDialog;
public
interface
LoginContract
{
public
interface
LoginContract
{
interface
View
extends
BaseView
{
interface
View
extends
BaseView
{
/**
* 验证码倒计时.
*/
void
changeCodeBtn
();
void
changeCodeBtn
();
/**
* 语音验证码变灰.
*/
void
changeVoiceCodeBtn
();
void
changeVoiceCodeBtn
();
void
showLoginDialog
(
CustomDialog
.
OnCloseListener
listener
);
void
showLoginDialog
(
CustomDialog
.
OnCloseListener
listener
);
...
...
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
View file @
0765eacd
...
@@ -5,6 +5,7 @@ import android.text.TextUtils;
...
@@ -5,6 +5,7 @@ import android.text.TextUtils;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.ui.AgreementActivity
;
import
com.dayu.bigfish.ui.AgreementActivity
;
...
@@ -15,6 +16,7 @@ import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
...
@@ -15,6 +16,7 @@ import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
import
com.dayu.bigfish.utils.managers.UserManager
;
import
com.dayu.bigfish.utils.managers.UserManager
;
import
com.hyphenate.EMCallBack
;
import
com.hyphenate.EMCallBack
;
import
com.hyphenate.chat.EMClient
;
import
com.hyphenate.chat.EMClient
;
import
com.umeng.analytics.MobclickAgent
;
import
io.reactivex.functions.Consumer
;
import
io.reactivex.functions.Consumer
;
...
@@ -123,5 +125,6 @@ public class LoginPresenter extends LoginContract.Presenter {
...
@@ -123,5 +125,6 @@ public class LoginPresenter extends LoginContract.Presenter {
@Override
@Override
public
void
dumpAgreement
()
{
public
void
dumpAgreement
()
{
mView
.
startActivity
(
AgreementActivity
.
class
);
mView
.
startActivity
(
AgreementActivity
.
class
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
(),
"customer_agreement"
);
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/main/MainPresenter.java
View file @
0765eacd
...
@@ -11,6 +11,7 @@ import com.app.annotation.apt.InstanceFactory;
...
@@ -11,6 +11,7 @@ import com.app.annotation.apt.InstanceFactory;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.BuildConfig
;
import
com.dayu.bigfish.BuildConfig
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.api.DownloadService
;
import
com.dayu.bigfish.api.DownloadService
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.base.BasePageBean
;
...
@@ -160,12 +161,12 @@ public class MainPresenter extends MainContract.Presenter {
...
@@ -160,12 +161,12 @@ public class MainPresenter extends MainContract.Presenter {
}
}
});
});
}
}
MobclickAgent
.
onEvent
(
mActivity
,
"sure_update_app"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"sure_update_app"
);
}
else
{
}
else
{
if
(
info
.
getType
()
==
2
)
{
if
(
info
.
getType
()
==
2
)
{
mActivity
.
finish
();
mActivity
.
finish
();
}
}
MobclickAgent
.
onEvent
(
mActivity
,
"cancle_update_app"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"cancle_update_app"
);
}
}
dialog
.
dismiss
();
dialog
.
dismiss
();
});
});
...
...
app/src/main/java/com/dayu/bigfish/presenter/modifyperson/ModifyPersonPresenter.java
View file @
0765eacd
...
@@ -8,6 +8,7 @@ import android.text.TextUtils;
...
@@ -8,6 +8,7 @@ import android.text.TextUtils;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.R
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.umeng.analytics.MobclickAgent
;
import
com.umeng.analytics.MobclickAgent
;
...
@@ -73,9 +74,9 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
...
@@ -73,9 +74,9 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
}
else
{
}
else
{
modifyUserInfo
(
mRealName
.
get
(),
mIdentity
.
get
(),
mIdentityUrl
.
get
());
modifyUserInfo
(
mRealName
.
get
(),
mIdentity
.
get
(),
mIdentityUrl
.
get
());
}
}
MobclickAgent
.
onEvent
(
mActivity
,
"sure_commit_info"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"sure_commit_info"
);
}
else
{
}
else
{
MobclickAgent
.
onEvent
(
mActivity
,
"cancle_commit_info"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"cancle_commit_info"
);
}
}
});
});
}
}
...
...
app/src/main/java/com/dayu/bigfish/presenter/orderdoing/OrderDoingPresenter.java
View file @
0765eacd
...
@@ -6,6 +6,7 @@ import android.databinding.ObservableField;
...
@@ -6,6 +6,7 @@ import android.databinding.ObservableField;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.bean.ErrorOrder
;
import
com.dayu.bigfish.bean.ErrorOrder
;
import
com.dayu.bigfish.bean.Order
;
import
com.dayu.bigfish.bean.Order
;
...
@@ -117,6 +118,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
...
@@ -117,6 +118,6 @@ public class OrderDoingPresenter extends orderDoingContract.Presenter {
Intent
intent
=
new
Intent
(
mActivity
,
OrderDetailsActivity
.
class
);
Intent
intent
=
new
Intent
(
mActivity
,
OrderDetailsActivity
.
class
);
intent
.
putExtra
(
"orderId"
,
orderId
);
intent
.
putExtra
(
"orderId"
,
orderId
);
mActivity
.
startActivity
(
intent
);
mActivity
.
startActivity
(
intent
);
MobclickAgent
.
onEvent
(
mActivity
,
"check_order_detail"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"check_order_detail"
);
}
}
}
}
app/src/main/java/com/dayu/bigfish/presenter/personinfo/PersonInfoPresenter.java
View file @
0765eacd
...
@@ -6,6 +6,7 @@ import android.os.Bundle;
...
@@ -6,6 +6,7 @@ import android.os.Bundle;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.dayu.bigfish.bean.EngineerInfo
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.ui.ModifyPersonInfoActivity
;
import
com.dayu.bigfish.ui.ModifyPersonInfoActivity
;
...
@@ -34,7 +35,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
...
@@ -34,7 +35,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
@Override
@Override
public
void
dumpToHeader
()
{
public
void
dumpToHeader
()
{
mView
.
startActivityForReult
(
MyHeaderIvActivity
.
class
,
1
);
mView
.
startActivityForReult
(
MyHeaderIvActivity
.
class
,
1
);
MobclickAgent
.
onEvent
(
mActivity
,
"check_header_pic"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"check_header_pic"
);
}
}
@Override
@Override
...
@@ -43,7 +44,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
...
@@ -43,7 +44,7 @@ public class PersonInfoPresenter extends PersonInfoContract.Presenter {
Bundle
bundle
=
new
Bundle
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putSerializable
(
Constants
.
ENGINEERINFO
,
info
.
get
());
bundle
.
putSerializable
(
Constants
.
ENGINEERINFO
,
info
.
get
());
mView
.
startActivity
(
ModifyPersonInfoActivity
.
class
,
bundle
);
mView
.
startActivity
(
ModifyPersonInfoActivity
.
class
,
bundle
);
MobclickAgent
.
onEvent
(
mActivity
,
"modify_person_info"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"modify_person_info"
);
}
}
}
}
...
...
app/src/main/java/com/dayu/bigfish/presenter/worksRecord/OrderRecordPresenter.java
View file @
0765eacd
...
@@ -8,6 +8,7 @@ import android.text.TextUtils;
...
@@ -8,6 +8,7 @@ import android.text.TextUtils;
import
com.app.annotation.apt.InstanceFactory
;
import
com.app.annotation.apt.InstanceFactory
;
import
com.apt.ApiFactory
;
import
com.apt.ApiFactory
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.Constants
;
import
com.dayu.bigfish.MyApplication
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.base.BasePageBean
;
import
com.dayu.bigfish.bean.Order
;
import
com.dayu.bigfish.bean.Order
;
import
com.dayu.bigfish.bean.UserInfo
;
import
com.dayu.bigfish.bean.UserInfo
;
...
@@ -91,7 +92,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
...
@@ -91,7 +92,7 @@ public class OrderRecordPresenter extends OrderRecordContract.Presenter {
Intent
intent
=
new
Intent
(
mActivity
,
OrderDetailsActivity
.
class
);
Intent
intent
=
new
Intent
(
mActivity
,
OrderDetailsActivity
.
class
);
intent
.
putExtra
(
"orderId"
,
orderId
);
intent
.
putExtra
(
"orderId"
,
orderId
);
mActivity
.
startActivity
(
intent
);
mActivity
.
startActivity
(
intent
);
MobclickAgent
.
onEvent
(
mActivity
,
"check_order_detail"
);
MobclickAgent
.
onEvent
(
MyApplication
.
getContext
()
,
"check_order_detail"
);
}
}
public
void
doSearch
(
String
str
)
{
public
void
doSearch
(
String
str
)
{
...
...
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
View file @
0765eacd
...
@@ -7,6 +7,7 @@ import com.dayu.bigfish.presenter.login.LoginContract;
...
@@ -7,6 +7,7 @@ import com.dayu.bigfish.presenter.login.LoginContract;
import
com.dayu.bigfish.presenter.login.LoginPresenter
;
import
com.dayu.bigfish.presenter.login.LoginPresenter
;
import
com.dayu.bigfish.ui.views.CustomDialog
;
import
com.dayu.bigfish.ui.views.CustomDialog
;
import
com.dayu.bigfish.utils.TimeCountUtil
;
import
com.dayu.bigfish.utils.TimeCountUtil
;
import
com.umeng.analytics.MobclickAgent
;
/**
/**
...
@@ -29,12 +30,14 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> im
...
@@ -29,12 +30,14 @@ public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> im
public
void
changeCodeBtn
()
{
public
void
changeCodeBtn
()
{
TimeCountUtil
timeCountUtil
=
new
TimeCountUtil
(
mActivity
,
60000
,
1000
,
mBind
.
btnSendCode
);
TimeCountUtil
timeCountUtil
=
new
TimeCountUtil
(
mActivity
,
60000
,
1000
,
mBind
.
btnSendCode
);
timeCountUtil
.
start
();
timeCountUtil
.
start
();
MobclickAgent
.
onEvent
(
mActivity
,
"sms_code"
);
}
}
@Override
@Override
public
void
changeVoiceCodeBtn
()
{
public
void
changeVoiceCodeBtn
()
{
mBind
.
tvVoiceCode
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_text
));
mBind
.
tvVoiceCode
.
setTextColor
(
getResources
().
getColor
(
R
.
color
.
cl_text
));
mBind
.
tvVoiceCode
.
setClickable
(
false
);
mBind
.
tvVoiceCode
.
setClickable
(
false
);
MobclickAgent
.
onEvent
(
mActivity
,
"sms_voice"
);
}
}
@Override
@Override
...
...
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
View file @
0765eacd
...
@@ -27,6 +27,7 @@ import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
...
@@ -27,6 +27,7 @@ import com.dayu.bigfish.ui.fragment.HomeOrderFragment;
import
com.dayu.bigfish.ui.fragment.HomePersonFragment
;
import
com.dayu.bigfish.ui.fragment.HomePersonFragment
;
import
com.dayu.bigfish.ui.views.CustomDialog
;
import
com.dayu.bigfish.ui.views.CustomDialog
;
import
com.dayu.bigfish.utils.LocationUtils
;
import
com.dayu.bigfish.utils.LocationUtils
;
import
com.umeng.analytics.MobclickAgent
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.EventBus
;
import
org.greenrobot.eventbus.Subscribe
;
import
org.greenrobot.eventbus.Subscribe
;
...
@@ -137,7 +138,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
...
@@ -137,7 +138,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
else
{
}
else
{
mBind
.
ivMessage
.
setVisibility
(
View
.
GONE
);
mBind
.
ivMessage
.
setVisibility
(
View
.
GONE
);
}
}
}
}
/**
/**
...
@@ -207,6 +207,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
...
@@ -207,6 +207,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
}
@Override
@Override
public
void
onResume
()
{
super
.
onResume
();
MobclickAgent
.
onResume
(
this
);
}
@Override
public
void
onPause
()
{
super
.
onPause
();
MobclickAgent
.
onPause
(
this
);
}
@Override
protected
void
onDestroy
()
{
protected
void
onDestroy
()
{
super
.
onDestroy
();
super
.
onDestroy
();
LocationUtils
.
destroy
();
LocationUtils
.
destroy
();
...
...
app/src/main/java/com/dayu/bigfish/ui/OrderDetailsActivity.java
View file @
0765eacd
...
@@ -13,6 +13,7 @@ import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
...
@@ -13,6 +13,7 @@ import com.dayu.bigfish.ui.adapter.FragmentBaseAdapter;
import
com.dayu.bigfish.ui.fragment.OrderDetaillsFragment
;
import
com.dayu.bigfish.ui.fragment.OrderDetaillsFragment
;
import
com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment
;
import
com.dayu.bigfish.ui.fragment.OrderDetailsServeFragment
;
import
com.dayu.bigfish.utils.TabLayoutUtils
;
import
com.dayu.bigfish.utils.TabLayoutUtils
;
import
com.umeng.analytics.MobclickAgent
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -55,4 +56,16 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
...
@@ -55,4 +56,16 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
mBind
.
tablayout
.
setTabMode
(
TabLayout
.
MODE_FIXED
);
mBind
.
tablayout
.
setTabMode
(
TabLayout
.
MODE_FIXED
);
TabLayoutUtils
.
setIndicator
(
mBind
.
tablayout
,
60
,
60
,
R
.
color
.
cl_receiving_order_item_data
,
this
);
TabLayoutUtils
.
setIndicator
(
mBind
.
tablayout
,
60
,
60
,
R
.
color
.
cl_receiving_order_item_data
,
this
);
}
}
@Override
public
void
onResume
()
{
super
.
onResume
();
MobclickAgent
.
onResume
(
this
);
}
@Override
public
void
onPause
()
{
super
.
onPause
();
MobclickAgent
.
onPause
(
this
);
}
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/ui/SopWebViewActivity.java
View file @
0765eacd
...
@@ -63,6 +63,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
...
@@ -63,6 +63,7 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
mWebView
.
setLayoutParams
(
new
LinearLayout
.
LayoutParams
(
mWebView
.
setLayoutParams
(
new
LinearLayout
.
LayoutParams
(
LinearLayout
.
LayoutParams
.
MATCH_PARENT
,
LinearLayout
.
LayoutParams
.
MATCH_PARENT
));
LinearLayout
.
LayoutParams
.
MATCH_PARENT
,
LinearLayout
.
LayoutParams
.
MATCH_PARENT
));
mBind
.
llWeb
.
addView
(
mWebView
);
mBind
.
llWeb
.
addView
(
mWebView
);
mBind
.
tvTitle
.
setText
(
"SOP"
);
initWebView
();
initWebView
();
}
}
...
@@ -302,5 +303,4 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
...
@@ -302,5 +303,4 @@ public class SopWebViewActivity extends DataBindingActivity<ActivityWebviewBindi
}
else
{
}
else
{
}
}
}
}
}
}
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDetaillsFragment.java
View file @
0765eacd
...
@@ -50,11 +50,13 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
...
@@ -50,11 +50,13 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
public
void
initDataView
(
OrderDetail
dataBean
)
{
public
void
initDataView
(
OrderDetail
dataBean
)
{
mBind
.
tvOrderState
.
setText
(
getStaus
(
dataBean
.
getStatus
()));
mBind
.
tvOrderState
.
setText
(
getStaus
(
dataBean
.
getStatus
()));
mBind
.
tvLookMore
.
setOnClickListener
(
o
->
lookMore
());
mBind
.
tvLookMore
.
setOnClickListener
(
o
->
lookMore
());
if
(
UIUtils
.
isOverFlowed
(
mBind
.
tvOrderRmark
))
{
mBind
.
tvOrderRmark
.
post
(()
->
{
mBind
.
tvLookMore
.
setVisibility
(
View
.
VISIBLE
);
if
(
UIUtils
.
isOverFlowed
(
mBind
.
tvOrderRmark
))
{
}
else
{
mBind
.
tvLookMore
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
tvLookMore
.
setVisibility
(
View
.
GONE
);
}
else
{
}
mBind
.
tvLookMore
.
setVisibility
(
View
.
GONE
);
}
});
if
(
dataBean
.
getIsPay
()
==
null
||
dataBean
.
getIsPay
()
==
1
)
{
if
(
dataBean
.
getIsPay
()
==
null
||
dataBean
.
getIsPay
()
==
1
)
{
mBind
.
rlNoCharge
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
rlNoCharge
.
setVisibility
(
View
.
VISIBLE
);
mBind
.
rlHaveCharge
.
setVisibility
(
View
.
GONE
);
mBind
.
rlHaveCharge
.
setVisibility
(
View
.
GONE
);
...
...
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
View file @
0765eacd
...
@@ -21,7 +21,6 @@ import org.greenrobot.eventbus.ThreadMode;
...
@@ -21,7 +21,6 @@ import org.greenrobot.eventbus.ThreadMode;
public
class
OrderFirstTabFragment
extends
BaseFragment
<
OrderDoingPresenter
,
FragmentCommomRecycleBinding
>
public
class
OrderFirstTabFragment
extends
BaseFragment
<
OrderDoingPresenter
,
FragmentCommomRecycleBinding
>
implements
orderDoingContract
.
View
{
implements
orderDoingContract
.
View
{
private
static
final
String
TAG
=
"OrderFirstTabFragment"
;
private
OrderAdapter
mAdapter
;
private
OrderAdapter
mAdapter
;
@Override
@Override
...
...
app/src/main/res/layout/activity_webview.xml
View file @
0765eacd
...
@@ -7,14 +7,11 @@
...
@@ -7,14 +7,11 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<RelativeLayout
<RelativeLayout
style=
"@style/title"
>
style=
"@style/title"
>
<TextView
<TextView
style=
"@style/text_title"
android:id=
"@+id/tv_title"
android:text=
"@string/webview_title"
style=
"@style/text_title"
/>
/>
<ImageView
<ImageView
android:id=
"@+id/title_back"
android:id=
"@+id/title_back"
...
@@ -23,9 +20,7 @@
...
@@ -23,9 +20,7 @@
/>
/>
</RelativeLayout>
</RelativeLayout>
<ImageView
<ImageView
style=
"@style/card_line"
/>
style=
"@style/card_line"
/>
</LinearLayout>
</LinearLayout>
</layout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_datails.xml
View file @
0765eacd
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
android:gravity=
"center_vertical"
android:gravity=
"center_vertical"
android:maxEms=
"500"
android:maxEms=
"500"
android:maxLines=
"2"
android:maxLines=
"2"
android:text=
'@{
!TextUtils.isEmpty(item.comment)?item.comment:@string/no_data
}'
android:text=
'@{
TextUtils.isEmpty(item.comment)?@string/no_data:item.comment
}'
android:textColor=
"@color/cl_home_title_text_color"
android:textColor=
"@color/cl_home_title_text_color"
android:textSize=
"13sp"
/>
android:textSize=
"13sp"
/>
...
...
apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java
View file @
0765eacd
...
@@ -44,7 +44,6 @@ public class ApiFactoryProcessor implements IProcessor {
...
@@ -44,7 +44,6 @@ public class ApiFactoryProcessor implements IProcessor {
MethodSpec
.
methodBuilder
(
e
.
getSimpleName
().
toString
())
MethodSpec
.
methodBuilder
(
e
.
getSimpleName
().
toString
())
.
addJavadoc
(
"@此方法由apt自动生成"
)
.
addJavadoc
(
"@此方法由apt自动生成"
)
.
addModifiers
(
PUBLIC
,
STATIC
);
.
addModifiers
(
PUBLIC
,
STATIC
);
// methodBuilder.returns(TypeName.get(executableElement.getReturnType()));
// methodBuilder.returns(TypeName.get(executableElement.getReturnType()));
methodBuilder
.
returns
(
ClassName
.
get
(
"io.reactivex"
,
"Observable"
));
methodBuilder
.
returns
(
ClassName
.
get
(
"io.reactivex"
,
"Observable"
));
String
paramsString
=
""
;
String
paramsString
=
""
;
...
...
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