Skip to content

R
RvApp
Commit 2dcc72ef authored by linfeng's avatar linfeng
Browse files
Options

活动记录、8.0闪退等bug修复和优化

parent 095ceae1
Show whitespace changes
Inline Side-by-side
Showing with 88 additions and 68 deletions
RvClient/src/main/AndroidManifest.xml
View file @ 2dcc72ef
......@@ -166,7 +166,8 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="tencent100424468" />
<!--<data android:scheme="tencent100424468" />-->
<data android:scheme="tencent1109685555" />
</intent-filter>
</activity>
<activity
......@@ -177,8 +178,7 @@
<activity
android:name=".MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
android:launchMode="singleTask" />
<activity
android:name="com.rv.home.rv.module.ui.login.LoginRvActivity"
android:screenOrientation="portrait" />
......
RvClient/src/main/java/com/xxfc/rv/RvClientApplication.java
View file @ 2dcc72ef
......@@ -156,7 +156,7 @@ public class RvClientApplication extends FrameApp {
// PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "088effbd5e5c5340779d512f87fab15e");
PlatformConfig.setWeixin(RvFrameConfig.APP_ID, "128cf4ad74b73c16ae5c5b3601da3f27");
PlatformConfig.setQQZone("100424468", "c7394704798a158208a74ab60104f0ba");
PlatformConfig.setQQZone("1109685555", "c7394704798a158208a74ab60104f0ba");
}
......
RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java
View file @ 2dcc72ef
......@@ -47,7 +47,7 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
mPresenter.saveOnclick("8", "");
}
@Override
......
RvWrapper/src/main/res/values/styles.xml
View file @ 2dcc72ef
......@@ -51,7 +51,7 @@
<item name="android:backgroundDimAmount">0.6</item>
</style>
<style name="AppTheme.NoActionBar.SwipeBack">
<item name="android:windowIsTranslucent">true</item>
<!--<item name="android:windowIsTranslucent">false</item>-->
</style>
......
component_resource/src/main/res/drawable/selector_rv_icon_mark2.xml 0 → 100644
View file @ 2dcc72ef
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/common_icon_select_dark" android:state_selected="true"/>
<item android:drawable="@drawable/common_icon_unselect_dark" android:state_selected="false"/>
</selector>
\ No newline at end of file
module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java
View file @ 2dcc72ef
......@@ -3,8 +3,8 @@ package com.xxfc.discovery.api;
import com.frame.rv.config.RvFrameConfig;
public interface DiscoveryApi extends RvFrameConfig {
// String IMA_BASEUSRL = "https://imapi.dfangche.com";
String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
String IMA_BASEUSRL = "https://imapi.dfangche.com";
// String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
//问题列表
String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 2dcc72ef
......@@ -182,14 +182,10 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
private ArrayList<String> images = new ArrayList<>(); //图片(默认采用网络地址)
private List<String> titles = new ArrayList<>(); //图片标题
Unbinder unbinder1;
private final int TYPE_REQUEST_CITY = 1;//城市列表
private final int REQUEST_GET_CODE = 10001; // 取车地址选择请求码
private final int REQUEST_RETURN_CODE = 10002; // 换车地址选择请求码
Unbinder unbinder2;
Unbinder unbinder3;
private String nowCity = "";
private int getSwitchType;//取车开关类型
......@@ -306,6 +302,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
SelectedActivitiesBean.SelectedActivityItem item = (SelectedActivitiesBean.SelectedActivityItem) adapter.getItem(position);
mPresenter.saveOnclick("3", String.valueOf(item.getId()));
if (item != null && !TextUtils.isEmpty(item.getUrl()) && !TextUtils.isEmpty(item.getName())) {
mPresenter.toTarget(getActivity(), item.getUrl(), item.getName());
}
......@@ -1261,15 +1258,15 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
//没有检索到结果
} else {
latLatitude = result.getLocation().latitude;
lonLongitude = result.getLocation().longitude;
getLatitude = result.getLocation().latitude;
getLongitude = result.getLocation().longitude;
outLatitude = result.getLocation().latitude;
outLongitude = result.getLocation().longitude;
// latLatitude = result.getLocation().latitude;
// lonLongitude = result.getLocation().longitude;
// getLatitude = result.getLocation().latitude;
// getLongitude = result.getLocation().longitude;
// outLatitude = result.getLocation().latitude;
// outLongitude = result.getLocation().longitude;
rvTourLatitude = result.getLocation().latitude;
rvTourLongitude = result.getLocation().longitude;
getShopList(false);
// getShopList(false);
}
//获取地理编码结果
}
......@@ -1279,15 +1276,15 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
if (result == null || result.error != SearchResult.ERRORNO.NO_ERROR) {
//没有找到检索结果
} else {
latLatitude = result.getLocation().latitude;
lonLongitude = result.getLocation().longitude;
getLatitude = result.getLocation().latitude;
getLongitude = result.getLocation().longitude;
outLatitude = result.getLocation().latitude;
outLongitude = result.getLocation().longitude;
// latLatitude = result.getLocation().latitude;
// lonLongitude = result.getLocation().longitude;
// getLatitude = result.getLocation().latitude;
// getLongitude = result.getLocation().longitude;
// outLatitude = result.getLocation().latitude;
// outLongitude = result.getLocation().longitude;
rvTourLatitude = result.getLocation().latitude;
rvTourLongitude = result.getLocation().longitude;
getShopList(false);
// getShopList(false);
}
}
});
......
module_home/src/main/res/values/styles.xml
View file @ 2dcc72ef
......@@ -46,7 +46,7 @@
<item name="android:backgroundDimAmount">0.6</item>
</style>
<style name="AppTheme.NoActionBar.SwipeBack">
<item name="android:windowIsTranslucent">true</item>
<!--<item name="android:windowIsTranslucent">true</item>-->
</style>
......@@ -62,7 +62,7 @@
<item name="windowNoTitle">true</item>
</style>
<style name="RvTheme.NoActionBar.SwipeBack">
<item name="android:windowIsTranslucent">true</item>
<!--<item name="android:windowIsTranslucent">true</item>-->
</style>
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 2dcc72ef
......@@ -377,6 +377,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvIntegral.setText("0");
tvWallet.setText("0");
tvCoupon.setText("0");
mSimpleRefreshLayout.setPullDownEnable(false);
}
}
......
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ 2dcc72ef
......@@ -117,13 +117,15 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
ivAvatarUrl = info.getHeadimgurl();
mWXOpenid = info.getWxOpenid();
mUnionid = info.getUnionid();
mQQOpenid =info.getOpenid() ;
mQQOpenid = info.getOpenid();
GlideManager.getInstance(mActivity).loadImage(info.getHeadimgurl(), ivAvatar);
if (info.getNickname() != null) {
etNickname.setText(info.getNickname());
if (!TextUtils.isEmpty(info.getNickname())) {
etNickname.setSelection(info.getNickname().length());
}
}
if (info.getRealname() != null) {
etName.setText(info.getRealname());
}
......@@ -364,7 +366,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
showToast("生日不为空！");
return;
}
mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex,mWXOpenid,mUnionid,mQQOpenid), getHeadMap(), true);
mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex, mWXOpenid, mUnionid, mQQOpenid), getHeadMap(), true);
}
private Map<String, Object> getHeadMap() {
......@@ -391,7 +393,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
mUnionid = data.get("unionid");
mWXOpenid = data.get("openid");
tvBindingWx.setText("已绑定");
}else {
} else {
mQQOpenid = data.get("openid");
tvBindingQq.setText("已绑定");
}
......
plugin_coupon/src/main/res/layout/activity_car_coupon.xml
View file @ 2dcc72ef
......@@ -58,7 +58,7 @@
android:layout_height="@dimen/size_50"
android:layout_gravity="bottom"
android:layout_margin="@dimen/dp_10"
android:background="@drawable/shape_rv_bg_yellow"
android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle"
android:gravity="center"
android:text="确定"
android:textColor="@color/white"
......
plugin_coupon/src/main/res/layout/rv_item_carcoupon.xml
View file @ 2dcc72ef
......@@ -9,7 +9,7 @@
<LinearLayout
android:id="@+id/ll_item_select"
android:layout_width="match_parent"
android:layout_height="@dimen/size_100"
android:layout_height="@dimen/size_120"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
......@@ -20,14 +20,21 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingLeft="@dimen/size_20">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_marginRight="@dimen/size_20"
android:orientation="vertical">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:text="租车券"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18"
......@@ -37,10 +44,11 @@
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_2"
android:layout_marginTop="@dimen/size_5"
android:text="不限车型"
android:textColor="@color/textGray"
android:textSize="@dimen/text_14" />
</LinearLayout>
<TextView
android:id="@+id/tv_date"
......@@ -49,6 +57,7 @@
android:layout_marginTop="@dimen/size_8"
android:text="有效期至2019.12.31"
android:textColor="@color/text_Gray"
android:layout_marginBottom="@dimen/size_15"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -61,18 +70,15 @@
android:orientation="horizontal"
android:paddingLeft="@dimen/size_10">
<LinearLayout
<RelativeLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="match_parent"
android:layout_weight="1">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:orientation="horizontal">
<TextView
......@@ -96,29 +102,31 @@
android:id="@+id/tv_condition"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="无门槛"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/size_15"
android:layout_gravity="center_horizontal"
android:text="无门槛"
android:textColor="@color/text_Gray"
android:textSize="@dimen/text_10" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/iv_select"
android:layout_width="@dimen/size_20"
android:layout_height="@dimen/size_20"
android:layout_gravity="center_vertical|right"
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_20"
android:layout_gravity="center_vertical|right"
android:src="@drawable/selector_rv_icon_mark"/>
android:src="@drawable/selector_rv_icon_mark2" />
</LinearLayout>
</LinearLayout>
<TextView
android:visibility="visible"
android:id="@+id/tv_layout_gray"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/size_15"
android:layout_height="@dimen/size_100"
android:background="@color/gray_50ffffff"/>
android:layout_marginTop="@dimen/size_15"
android:background="@color/gray_50ffffff"
android:visibility="visible" />
</RelativeLayout>
\ No newline at end of file
plugin_coupon/src/main/res/layout/rv_item_carcoupon_type_title.xml
View file @ 2dcc72ef
......@@ -10,7 +10,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/text_16"
android:layout_margin="@dimen/size_15"
android:textStyle="bold"
android:layout_marginTop="@dimen/size_15"
android:layout_marginLeft="@dimen/size_15"
android:textColor="@color/colorMain"
android:text="通用券"/>
......
plugin_share/src/main/java/com/rv/share/view/RvWebView.java
View file @ 2dcc72ef
......@@ -206,6 +206,11 @@ public class RvWebView extends WebView {
listener.finish();
}
@JavascriptInterface
public String getUkID() {
return OkGoUtil.getYkId();
}
}
public interface WebViewListener {
......
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