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
967d434a
Commit
967d434a
authored
Jul 03, 2019
by
sikang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
udpate script
parent
0d189f5f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
script/script_help.sh
+2
-0
src/main/java/com/common/activity/AgreementPolicyActivity.java
+4
-2
No files found.
script/script_help.sh
View file @
967d434a
...
...
@@ -220,6 +220,7 @@ then
sed
-i
""
"s#^app_name=.*#app_name=
${
main_name
}
#g"
gradle.properties
sed
-i
""
"s#^gateway_url=.*#gateway_url=
\"
${
gateway_main
}
\"
#g"
gradle.properties
sed
-i
""
"s#^host_app=.*#host_app=true#g"
gradle.properties
#更新gw
cd
lib_base/script/res
chmod a+x update_gateway.py
...
...
@@ -236,6 +237,7 @@ then
#APP名替换
sed
-i
""
"s#^app_name=.*#app_name=
${
majia_name
}
#g"
gradle.properties
sed
-i
""
"s#^gateway_url=.*#gateway_url=
\"
${
gateway_mj
}
\"
#g"
gradle.properties
sed
-i
""
"s#^host_app=.*#host_app=false#g"
gradle.properties
#更新gw
cd
lib_base/script/res
chmod a+x update_gateway.py
...
...
src/main/java/com/common/activity/AgreementPolicyActivity.java
View file @
967d434a
...
...
@@ -48,7 +48,9 @@ public class AgreementPolicyActivity extends BaseActivity {
public
static
void
startForResult
(
FragmentActivity
activity
,
Type
type
,
int
requestCode
,
EasyActivityResult
.
OnResultListener
listener
)
{
Intent
intent
=
new
Intent
(
activity
,
AgreementPolicyActivity
.
class
);
intent
.
putExtra
(
"agreementType"
,
type
);
if
(
type
!=
null
)
{
intent
.
putExtra
(
"agreementType"
,
type
);
}
new
EasyActivityResult
(
activity
).
startForResult
(
intent
,
requestCode
,
listener
);
}
...
...
@@ -79,7 +81,7 @@ public class AgreementPolicyActivity extends BaseActivity {
EventBus
.
getDefault
().
register
(
this
);
mCheckBox
=
findViewById
(
R
.
id
.
activity_policy_checkbox
);
webView
=
findViewById
(
R
.
id
.
activity_policy_webview
);
WebSettings
settings
=
webView
.
getSettings
();
WebSettings
settings
=
webView
.
getSettings
();
settings
.
setJavaScriptEnabled
(
true
);
UIHelper
.
bindClickListener
(
getContentView
(),
new
OnEventClickListener
()
{
...
...
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