Commit 967d434a by sikang

udpate script

parent 0d189f5f
......@@ -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
......
......@@ -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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment