Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lib_base
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sikang
lib_base
Commits
5686b29e
Commit
5686b29e
authored
Dec 20, 2019
by
sikang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix
parent
e4645e83
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
20 additions
and
5 deletions
+20
-5
src/main/java/com/common/activity/WebActivity.java
+4
-2
src/main/java/com/common/base/BaseApplication.java
+2
-0
src/main/java/com/common/bean/LatestLoanAppBean.java
+9
-0
src/main/java/tech/starwin/network/FirebaseHeaderInterceptor.java
+1
-0
src/main/java/tech/starwin/network/Gateway.java
+3
-2
src/main/res/drawable-xxhdpi/hotline.png
+0
-0
src/main/res/xml/network_security_config.xml
+1
-1
No files found.
src/main/java/com/common/activity/WebActivity.java
View file @
5686b29e
...
@@ -25,10 +25,11 @@ public class WebActivity extends BaseActivity {
...
@@ -25,10 +25,11 @@ public class WebActivity extends BaseActivity {
.
build
().
start
();
.
build
().
start
();
}
}
public
static
void
startContract
(
Context
context
,
String
title
,
String
contractNo
)
{
public
static
void
startContract
(
Context
context
,
String
title
,
String
contractNo
,
String
companyName
)
{
new
ActivityJumper
.
Builder
(
context
,
WebActivity
.
class
)
new
ActivityJumper
.
Builder
(
context
,
WebActivity
.
class
)
.
put
(
"title"
,
title
)
.
put
(
"title"
,
title
)
.
put
(
"url"
,
"contract"
)
.
put
(
"url"
,
"contract"
)
.
put
(
"companyName"
,
companyName
)
.
put
(
"contractNo"
,
contractNo
)
.
put
(
"contractNo"
,
contractNo
)
.
build
().
start
();
.
build
().
start
();
}
}
...
@@ -99,7 +100,8 @@ public class WebActivity extends BaseActivity {
...
@@ -99,7 +100,8 @@ public class WebActivity extends BaseActivity {
if
(
"getContract"
.
equals
(
action
))
{
if
(
"getContract"
.
equals
(
action
))
{
refreshLayout
.
finishRefresh
();
refreshLayout
.
finishRefresh
();
EventCenterBean
contactBean
=
(
EventCenterBean
)
result
;
EventCenterBean
contactBean
=
(
EventCenterBean
)
result
;
webView
.
loadDataWithBaseURL
(
null
,
contactBean
.
getContent
(),
"text/html"
,
"utf-8"
,
null
);
String
html
=
contactBean
.
getContent
().
replace
(
"${companyName}"
,
getIntent
().
getStringExtra
(
"companyName"
));
webView
.
loadDataWithBaseURL
(
null
,
html
,
"text/html"
,
"utf-8"
,
null
);
}
}
}
}
}
}
src/main/java/com/common/base/BaseApplication.java
View file @
5686b29e
...
@@ -13,6 +13,7 @@ import android.util.Log;
...
@@ -13,6 +13,7 @@ import android.util.Log;
import
com.facebook.FacebookSdk
;
import
com.facebook.FacebookSdk
;
import
com.facebook.accountkit.internal.AccountKitController
;
import
com.facebook.accountkit.internal.AccountKitController
;
import
com.facebook.accountkit.internal.Initializer
;
import
com.facebook.accountkit.internal.Initializer
;
import
com.facebook.libfbref.FbDeepLink
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.Field
;
...
@@ -55,6 +56,7 @@ public abstract class BaseApplication extends MultiDexApplication {
...
@@ -55,6 +56,7 @@ public abstract class BaseApplication extends MultiDexApplication {
@Override
@Override
public
void
onCreate
()
{
public
void
onCreate
()
{
super
.
onCreate
();
super
.
onCreate
();
FbDeepLink
.
getFbReferrer
();
// if (!TextUtils.isEmpty(LibConfig.BUGLY_APPID)) {
// if (!TextUtils.isEmpty(LibConfig.BUGLY_APPID)) {
// CrashReport.initCrashReport(getApplicationContext(), LibConfig.BUGLY_APPID, false);
// CrashReport.initCrashReport(getApplicationContext(), LibConfig.BUGLY_APPID, false);
// }
// }
...
...
src/main/java/com/common/bean/LatestLoanAppBean.java
View file @
5686b29e
...
@@ -102,6 +102,15 @@ public class LatestLoanAppBean implements Parcelable {
...
@@ -102,6 +102,15 @@ public class LatestLoanAppBean implements Parcelable {
private
long
couponId
;
private
long
couponId
;
private
String
contractNo
;
private
String
contractNo
;
private
String
serviceMobile
=
""
;
private
String
serviceMobile
=
""
;
private
String
companyName
;
public
String
getCompanyName
()
{
return
companyName
;
}
public
void
setCompanyName
(
String
companyName
)
{
this
.
companyName
=
companyName
;
}
public
String
getServiceMobile
()
{
public
String
getServiceMobile
()
{
return
serviceMobile
;
return
serviceMobile
;
...
...
src/main/java/tech/starwin/network/FirebaseHeaderInterceptor.java
View file @
5686b29e
...
@@ -41,6 +41,7 @@ public class FirebaseHeaderInterceptor implements Interceptor {
...
@@ -41,6 +41,7 @@ public class FirebaseHeaderInterceptor implements Interceptor {
String
referrer
=
FbDeepLink
.
getFbReferrer
();
String
referrer
=
FbDeepLink
.
getFbReferrer
();
builder
.
addHeader
(
"X-REFERRER"
,
TextUtils
.
isEmpty
(
referrer
)
?
PreferencesManager
.
get
().
getInstallReferrer
()
:
referrer
)
builder
.
addHeader
(
"X-REFERRER"
,
TextUtils
.
isEmpty
(
referrer
)
?
PreferencesManager
.
get
().
getInstallReferrer
()
:
referrer
)
.
addHeader
(
"X-REFERRER-SDK"
,
TextUtils
.
isEmpty
(
referrer
)
?
PreferencesManager
.
get
().
getInstallReferrerFromSDK
()
:
referrer
)
.
addHeader
(
"X-REFERRER-SDK"
,
TextUtils
.
isEmpty
(
referrer
)
?
PreferencesManager
.
get
().
getInstallReferrerFromSDK
()
:
referrer
)
.
addHeader
(
"X-REFERRER-DEEPLINK"
,
TextUtils
.
isEmpty
(
referrer
)
?
""
:
referrer
)
.
addHeader
(
"X-ANDROID-ID"
,
AppInfoUtils
.
getAndroidID
(
LibConfig
.
getContext
()));
.
addHeader
(
"X-ANDROID-ID"
,
AppInfoUtils
.
getAndroidID
(
LibConfig
.
getContext
()));
if
(
PreferencesManager
.
get
().
getCustomerInfo
()
!=
null
)
{
if
(
PreferencesManager
.
get
().
getCustomerInfo
()
!=
null
)
{
...
...
src/main/java/tech/starwin/network/Gateway.java
View file @
5686b29e
...
@@ -50,7 +50,7 @@ public class Gateway {
...
@@ -50,7 +50,7 @@ public class Gateway {
String
permissions
=
BuildConfig
.
NEED_CONTACT
?
"12356"
:
"2356"
;
String
permissions
=
BuildConfig
.
NEED_CONTACT
?
"12356"
:
"2356"
;
return
gatewayInfo
.
privacy
.
get
(
0
)
+
"?name="
+
return
gatewayInfo
.
privacy
.
get
(
0
)
+
"?name="
+
LibConfig
.
APP_NAME
.
replace
(
" "
,
"%20"
)
+
LibConfig
.
APP_NAME
.
replace
(
" "
,
"%20"
)
+
"&list="
+
permissions
;
"&list="
+
permissions
+
"&serviceMobile="
+
LibConfig
.
HOTLINE
;
}
}
...
@@ -106,7 +106,8 @@ public class Gateway {
...
@@ -106,7 +106,8 @@ public class Gateway {
}
}
public
static
String
getRestUrl
()
{
public
static
String
getRestUrl
()
{
return
gatewayInfo
.
rest
.
get
(
0
);
return
"http://149.129.216.37:9904"
;
// return gatewayInfo.rest.get(0);
}
}
}
}
src/main/res/drawable-xxhdpi/hotline.png
0 → 100644
View file @
5686b29e
5.2 KB
src/main/res/xml/network_security_config.xml
View file @
5686b29e
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<network-security-config>
<base-config
cleartextTrafficPermitted=
"
fals
e"
/>
<base-config
cleartextTrafficPermitted=
"
tru
e"
/>
</network-security-config>
</network-security-config>
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