Skip to content

R
RvApp
Commit 97600402 authored by youjj's avatar youjj
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	RvMine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java
parents f8ef4048 7b2f742f
Show whitespace changes
Inline Side-by-side
Showing with 770 additions and 0 deletions
RvHome/src/main/java/com/rv/home/rv/module/ui/main/home/order/TravelOrderDetailsActivity.java 0 → 100644
View file @ 97600402
package com.rv.home.rv.module.ui.main.home.order;
import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.webkit.JavascriptInterface;
import android.webkit.WebChromeClient;
import android.webkit.WebResourceRequest;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.TextView;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.PickerPresenter;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
import butterknife.ButterKnife;
import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
/**
* 旅游详情页面
*/
public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresenter> {
@BindView(R2.id.webView)
WebView mWebView;
@BindView(R2.id.tv_cancel_order)
TextView tvCancelOrder;
@BindView(R2.id.tv_pick_up_the_car)
TextView tvPickUpTheCar;
private String webUrl;
private int type;
private String no;
public static Intent getIntent(Context context, String orderId, int type) {
return new Intent(context, TravelOrderDetailsActivity.class)
.putExtra("no", orderId)
.putExtra("type", type);
}
@Override
protected int setLayout() {
return R.layout.activity_travel_order_details;
}
@Override
protected void onStart() {
super.onStart();
}
@Override
public void onResume() {
super.onResume();
mWebView.onResume();// 生命周期onResume
}
@Override
protected void onPause() {
super.onPause();
mWebView.onPause();//生命周期onPause
}
@Override
public void onDestroy() {
super.onDestroy();
mWebView.stopLoading();// 停止当前加载
mWebView.clearMatches();// 清除网页查找的高亮匹配字符。
mWebView.clearHistory();// 清除当前 WebView 访问的历史记录
mWebView.clearSslPreferences();//清除ssl信息
mWebView.clearCache(true);//清空网页访问留下的缓存数据。需要注意的时，由于缓存是全局的，所以只要是WebView用到的缓存都会被清空，即便其他地方也会使用到。该方法接受一个参数，从命名即可看出作用。若设为false，则只清空内存里的资源缓存，而不清空磁盘里的。
mWebView.loadUrl("about:blank");// 清空当前加载
mWebView.removeAllViews();// 清空子 View
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
mWebView.removeJavascriptInterface("AndroidNative");// 向 Web端注入 java 对象
}
// mWebView.addJavascriptInterface(new AndroidJs(),"AndroidJs");
mWebView.destroy();// 生命周期销毁
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);
type = intent.getIntExtra("type", 0);
no = intent.getStringExtra("no");
switch (type) {
case 3:
tvCancelOrder.setVisibility(View.VISIBLE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
break;
case 4:
tvCancelOrder.setVisibility(View.VISIBLE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("立即上车");
break;
case 5:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
break;
case 6:
tvCancelOrder.setVisibility(View.GONE);
tvPickUpTheCar.setVisibility(View.VISIBLE);
tvPickUpTheCar.setText("去评价");
break;
}
webUrl = ApiConfig.HTTP_URL_CAR_TYPE_TRAVELORDERDETAIL + "?no=" + no;
Log.i("travelorderdetailsactivi", "initView: " + webUrl);
initWeb();
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 1 && resultCode == RESULT_OK) {
setResult(RESULT_OK);
finish();
}
}
// @OnClick({R2.id.iv_back, R2.id.iv_customer_service, R2.id.tv_cancel_order, R2.id.tv_pick_up_the_car})
// public void onViewClicked(View view) {
// int i = view.getId();
// if (i == R.id.iv_back) {
// finish();
//
// } else if (i == R.id.iv_customer_service) {
// } else if (i == R.id.tv_cancel_order) {
// cancelOnclick();
//
// } else if (i == R.id.tv_pick_up_the_car) {
// }
// }
private void cancelOnclick() {
switch (type) {
case 3:
case 4:
startActivityForResult(CancelTheTripActivity.getIntent(mActivity, no), 1);
break;
case 5:
break;
case 6:
break;
}
}
private void initWeb() {
WebSettings webSettings = mWebView.getSettings();
if (webSettings == null) return;
// 支持 Js 使用
webSettings.setJavaScriptEnabled(true);
// 开启DOM缓存,默认状态下是不支持LocalStorage的
webSettings.setDomStorageEnabled(true);
// 开启数据库缓存
webSettings.setDatabaseEnabled(true);
// 支持自动加载图片
webSettings.setLoadsImagesAutomatically(hasKitkat());
// 设置 WebView 的缓存模式
webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
// 支持启用缓存模式
webSettings.setAppCacheEnabled(true);
// 设置 AppCache 最大缓存值(现在官方已经不提倡使用，已废弃)
// webSettings.setAppCacheMaxSize(8 * 1024 * 1024);
// Android 私有缓存存储，如果你不调用setAppCachePath方法，WebView将不会产生这个目录
webSettings.setAppCachePath(getCacheDir().getAbsolutePath());
// 数据库路径
// if (!hasKitkat()) {
// webSettings.setDatabasePath(getDatabasePath("html").getPath());
// }
// 关闭密码保存提醒功能
// webSettings.setSavePassword(false);
// 支持缩放
webSettings.setSupportZoom(true);
// 设置 UserAgent 属性
webSettings.setUserAgentString("");
// 允许加载本地 html 文件/false
webSettings.setAllowFileAccess(true);
// 允许通过 file url 加载的 Javascript 读取其他的本地文件,Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
webSettings.setAllowFileAccessFromFileURLs(true);
// 允许通过 file url 加载的 Javascript 可以访问其他的源，包括其他的文件和 http，https 等其他的源，
// Android 4.1 之前默认是true，在 Android 4.1 及以后默认是false,也就是禁止
// 如果此设置是允许，则 setAllowFileAccessFromFileURLs 不起做用
webSettings.setAllowUniversalAccessFromFileURLs(true);
mWebView.addJavascriptInterface(new AndroidJs(), "AndroidJs");
mWebView.loadUrl(webUrl);
mWebView.setWebViewClient(new WebViewClient() {
@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
return super.shouldOverrideUrlLoading(view, request);
}
});
mWebView.setWebChromeClient(new WebChromeClient() {
@Override
public void onProgressChanged(WebView view, int newProgress) {
super.onProgressChanged(view, newProgress);
if (newProgress == 85) {
onHideLoading();
}
}
});
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
public class AndroidJs {
@JavascriptInterface
public String getToken() {
return OkGoUtil.getToken();
}
@JavascriptInterface
public ClipboardManager getCopy() {
ClipboardManager clip = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
clip.setText(no);
showToast("复制成功！");
return clip;
}
}
}
RvHome/src/main/res/layout/activity_travel_order_details.xml 0 → 100644
View file @ 97600402
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/lay_title"
android:layout_width="match_parent"
android:background="@color/colorAuxiliaryYellow"
android:layout_height="@dimen/size_55">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/size_32"
android:layout_height="@dimen/size_32"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/size_5"
android:padding="@dimen/size_8"
android:src="@drawable/rv_common_icon_back_dark" />
<TextView
android:id="@+id/tv_center"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:ellipsize="end"
android:gravity="center"
android:maxLines="1"
android:maxWidth="320dp"
android:text="订单详情"
android:textColor="@color/textMain"
android:textSize="@dimen/text_18" />
<ImageView
android:id="@+id/iv_customer_service"
android:layout_width="@dimen/size_42"
android:layout_height="@dimen/size_32"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/rv_rentingcar_icon_service_white"
android:layout_marginRight="@dimen/size_5"
android:padding="@dimen/size_8" />
</RelativeLayout>
<include layout="@layout/common_line"/>
<WebView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:id="@+id/webView" />
<include layout="@layout/common_line"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_70"
android:paddingLeft="@dimen/size_12"
android:paddingRight="@dimen/size_12"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_cancel_order"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/size_50"
android:textSize="@dimen/text_14"
android:gravity="center"
android:layout_marginRight="@dimen/size_5"
android:background="@drawable/shape_rv_border_gray"
android:textColor="@color/textGray"
android:text="@string/rv_cancel_order"
/>
<TextView
android:id="@+id/tv_pick_up_the_car"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="@dimen/size_50"
android:textSize="@dimen/text_14"
android:gravity="center"
android:layout_marginLeft="@dimen/size_5"
android:background="@drawable/shape_rv_bg_yellow"
android:textColor="@color/colorWrite"
android:text="立即支付"
/>
</LinearLayout>
</LinearLayout>
RvMine/src/main/java/com/rv/rvmine/traveler/AddAVisitorActivity.java 0 → 100644
View file @ 97600402
package com.rv.rvmine.traveler;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.CheckBox;
import android.widget.EditText;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.rvmine.R;
import com.rv.rvmine.R2;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 添加出游人
*/
public class AddAVisitorActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.cb_adult)
CheckBox cbAdult;
@BindView(R2.id.cb_child)
CheckBox cbChild;
@BindView(R2.id.et_traveler_name)
EditText etTravelerName;
@BindView(R2.id.cb_man)
CheckBox cbMan;
@BindView(R2.id.cb_girl)
CheckBox cbGirl;
@BindView(R2.id.et_id_card)
EditText etIdCard;
@BindView(R2.id.et_phone)
EditText etPhone;
private int identityType = 0;
private int setType = 0;
public static Intent getIntent(Context context) {
return new Intent(context, AddAVisitorActivity.class);
}
@Override
protected int setLayout() {
return R.layout.activity_add_avisitor;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.add_a_visitor_title));
titleView.setText(R.id.tv_title_right,getString(R.string.rv_save));
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
}
});
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
@OnClick({R2.id.cb_adult, R2.id.cb_child, R2.id.cb_man, R2.id.cb_girl})
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.cb_adult) {
//成人
cbAdult.setChecked(true);
cbChild.setChecked(false);
identityType = 0;
} else if (id == R.id.cb_child) {
//儿童
cbAdult.setChecked(false);
cbChild.setChecked(true);
identityType = 1;
} else if (id == R.id.cb_man) {
//男
cbMan.setChecked(true);
cbGirl.setChecked(false);
setType = 0;
} else if (id == R.id.cb_girl) {
//女
cbMan.setChecked(false);
cbGirl.setChecked(true);
setType = 1;
}
}
}
RvMine/src/main/java/com/rv/rvmine/traveler/SettingActivity.java 0 → 100644
View file @ 97600402
package com.rv.rvmine.traveler;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.rvmine.R;
import com.rv.rvmine.R2;
import com.yuyife.okgo.OkGoUtil;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* 设置
*/
public class SettingActivity extends BaseStatusActivity<CommonPresenter> {
@Override
protected int setLayout() {
return R.layout.activity_setting;
}
public static Intent getIntent(Context context) {
return new Intent(context, SettingActivity.class);
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(getString(R.string.setting_title));
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
ButterKnife.bind(this);
}
@OnClick(R2.id.tv_out_sign)
public void onViewClicked(View view) {
int id = view.getId();
if (id == R.id.tv_out_sign) {
//退出登录
UtilsManager.getInstance(mActivity).clearShareData("city_json");
UtilsManager.getInstance(mActivity).setShNull();
OkGoUtil.clearToken();
setResult(201);
showToast("退出成功！");
finish();
}
}
}
RvMine/src/main/res/layout/activity_add_avisitor.xml 0 → 100644
View file @ 97600402
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:id="@+id/tv_id_card2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="身份类型"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<CheckBox
android:id="@+id/cb_adult"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:checked="true"
android:text="@string/cb_adult_hint"
android:textSize="@dimen/text_14" />
<CheckBox
android:id="@+id/cb_child"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_60"
android:layout_marginRight="@dimen/size_8"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/cb_child_hint"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="姓 名"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<EditText
android:id="@+id/et_traveler_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/et_traveler_name_hint"
android:maxLength="10"
android:paddingLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="性 别"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<CheckBox
android:id="@+id/cb_man"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/cb_man_hint"
android:checked="true"
android:textSize="@dimen/text_14" />
<CheckBox
android:id="@+id/cb_girl"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_60"
android:layout_marginRight="@dimen/size_8"
android:button="@drawable/selector_rv_check"
android:paddingLeft="@dimen/size_10"
android:text="@string/cb_girl_hint"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:background="@color/colorWrite"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="证件类型"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="身份证"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="证件号码"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<EditText
android:id="@+id/et_id_card"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/et_id_card_hint"
android:maxLength="10"
android:paddingLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<include layout="@layout/common_line" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="@dimen/size_80"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_travel_phone"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
<EditText
android:id="@+id/et_phone"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/et_phone_hint"
android:maxLength="10"
android:inputType="phone|number"
android:paddingLeft="@dimen/size_5"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
RvMine/src/main/res/layout/activity_setting.xml 0 → 100644
View file @ 97600402
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorLine"
android:orientation="vertical">
<TextView
android:id="@+id/tv_out_sign"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:gravity="center"
android:textColor="@color/text_Main"
android:background="@drawable/shape_rv_bg_yellow"
android:text="退出登录"/>
</LinearLayout>
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