Skip to content

R
RvApp
Commit 558d86c3 authored by jianglx's avatar jianglx
Browse files
Options

Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im 

# Conflicts:
#	RvClient/build.gradle
parents 0bd532de 5ae074e0
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 117 deletions
MyFrame/src/main/java/com/frame/base/activity/FrameOfflineActivity.java
View file @ 558d86c3
......@@ -20,7 +20,7 @@ import cn.pedant.SweetAlert.SweetAlertDialog;
* 流程 在服务当中收到MIMC消息，传递过来了Code
* 1. 用户在其他设备上登录 206
* 2. 管理控制台中在使用了强制下线 207
* 2. 管理控制台中删除了账户 208
* 2. 管理控制台中删除了帐户 208
*/
public class FrameOfflineActivity extends BaseActivity {
......@@ -87,7 +87,7 @@ public class FrameOfflineActivity extends BaseActivity {
.show();
break;
case USER_REMOVED:
//用户被后台被删除账户
//用户被后台被删除帐户
sweetAlertDialog = SweetDialogUtil.getErrorDialog(baseContext);
sweetAlertDialog.setCancelable(false);
sweetAlertDialog.setTitleText(getString(com.base.utils.R.string.resource_prompt_user_removed_title))
......
Resource/src/main/res/values-zh/resources_strings_hint.xml
View file @ 558d86c3
......@@ -2,7 +2,7 @@
<!--暗示-->
<string name="resource_hint_mobile">手机</string>
<string name="resource_hint_account">账户（手机、邮箱）</string>
<string name="resource_hint_account">帐户（手机、邮箱）</string>
<string name="resource_hint_password">密码</string>
<string name="resource_hint_nickname">昵称(用于展示)</string>
</resources>
Resource/src/main/res/values-zh/resources_strings_promtp.xml
View file @ 558d86c3
<resources>
<!--提示-->
<!--验证账户、密码-->
<string name="resource_prompt_verify_account_valid">请输入有效账户（手机、邮箱）</string>
<!--验证帐户、密码-->
<string name="resource_prompt_verify_account_valid">请输入有效帐户（手机、邮箱）</string>
<string name="resource_prompt_verify_mobile_valid">请输入正确的手机号码</string>
<string name="resource_prompt_verify_mobile_empty">请输入手机号</string>
<string name="resource_prompt_verify_account_empty">请输入账户</string>
<string name="resource_prompt_verify_account_empty">请输入帐户</string>
<string name="resource_prompt_verify_nickname_empty">请输入昵称</string>
<string name="resource_prompt_verify_password_empty">请输入密码</string>
<string name="resource_prompt_verify_password_length">密码长度最少6位</string>
......@@ -13,27 +13,27 @@
<string name="resource_prompt_user_login_success">登录成功</string>
<string name="resource_prompt_user_login_progress">登录中..</string>
<string name="resource_prompt_user_login_another_device_title">强制下线</string>
<string name="resource_prompt_user_login_another_device_content">您的账户在其他设备上登录</string>
<string name="resource_prompt_user_login_another_device_content">您的帐户在其他设备上登录</string>
<string name="resource_prompt_user_login_another_device_anew_login">重新登录</string>
<!--退出-->
<string name="resource_prompt_user_logout_progress">登出中..</string>
<string name="resource_prompt_user_logout_success">登出成功..</string>
<string name="resource_prompt_user_logout_title">登出提示</string>
<string name="resource_prompt_user_logout_content">真的要登出此账户，并返回到登录吗？</string>
<string name="resource_prompt_user_logout_content">真的要登出此帐户，并返回到登录吗？</string>
<!--在被强制下线-->
<string name="resource_prompt_user_forced_title">强制下线</string>
<string name="resource_prompt_user_forced_offline_content">您的账户已经被强制下线！</string>
<string name="resource_prompt_user_forced_content">您的账户已经被强制下线！</string>
<string name="resource_prompt_user_forced_offline_content">您的帐户已经被强制下线！</string>
<string name="resource_prompt_user_forced_content">您的帐户已经被强制下线！</string>
<!--被手动删除-->
<string name="resource_prompt_user_removed_title">删除下线</string>
<string name="resource_prompt_user_remove_offline_content">您的账户已经被强制下线！</string>
<string name="resource_prompt_user_removed_content">您的账户已经被强制下线！</string>
<string name="resource_prompt_user_remove_offline_content">您的帐户已经被强制下线！</string>
<string name="resource_prompt_user_removed_content">您的帐户已经被强制下线！</string>
<!--账户开设-->
<string name="resource_prompt_register_progress">账户注册中..</string>
<!--帐户开设-->
<string name="resource_prompt_register_progress">帐户注册中..</string>
<string name="resource_prompt_register_success">恭喜您，注册成功！</string>
<string name="resource_prompt_login_error">登录时遇到问题！</string>
<string name="resource_prompt_register_error">注册账户时遇到问题！</string>
<string name="resource_prompt_register_error">注册帐户时遇到问题！</string>
</resources>
Resource/src/main/res/values/resources_strings_promtp.xml
View file @ 558d86c3
<resources>
<!--提示-->
<!--验证账户、密码-->
<string name="resource_prompt_verify_account_valid">请输入有效账户（手机、邮箱）</string>
<!--验证帐户、密码-->
<string name="resource_prompt_verify_account_valid">请输入有效帐户（手机、邮箱）</string>
<string name="resource_prompt_verify_mobile_valid">请输入正确的手机号码</string>
<string name="resource_prompt_verify_mobile_empty">No input account</string>
<string name="resource_prompt_verify_account_empty">No input account</string>
......@@ -28,9 +28,9 @@
<string name="resource_prompt_user_removed_title">Remove offline</string>
<string name="resource_prompt_user_remove_offline_content">Your account has already been Remove offline！</string>
<string name="resource_prompt_user_removed_content">Your account has already been deleted！</string>
<!--账户开设-->
<!--帐户开设-->
<string name="resource_prompt_register_progress">Account opening..</string>
<string name="resource_prompt_register_success">Congratulations, success at a lower level！</string>
<string name="resource_prompt_login_error">登录时遇到问题！</string>
<string name="resource_prompt_register_error">注册账户时遇到问题！</string>
<string name="resource_prompt_register_error">注册帐户时遇到问题！</string>
</resources>
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 558d86c3
......@@ -696,7 +696,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
@Subscribe(threadMode = ThreadMode.MAIN)
public void remoteLogin(MessageEventRemoteLogin remoteLogin) {
//退出登录
Toast.makeText(getApplicationContext(), "账号远程登录", Toast.LENGTH_SHORT).show();
Toast.makeText(getApplicationContext(), "帐号远程登录", Toast.LENGTH_SHORT).show();
hasBindService = false;
UtilsManager.getInstance(getApplicationContext()).clearShareData("city_json");
UtilsManager.getInstance(getApplicationContext()).setShNull();
......@@ -716,7 +716,7 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements EasyP
private void showLogoutDialog() {
new android.support.v7.app.AlertDialog.Builder(mActivity)
.setTitle("提示")
.setMessage("该账号在其他移动端登录，程序即将退出")
.setMessage("该帐号在其他移动端登录，程序即将退出")
.setCancelable(false)
.setPositiveButton("确定", (dialog1, which) -> {
dialog1.dismiss();
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/presenter/PickerPresenter.java
View file @ 558d86c3
......@@ -10,6 +10,7 @@ import android.net.Uri;
import android.os.Build;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import com.ruiwenliu.wrapper.util.FileStorage;
......@@ -74,8 +75,10 @@ public class PickerPresenter extends CommonPresenter {
* @return
*/
public String gerCameraStoreUrl() {
if (new File(cameraUrl).exists()) {
return cameraUrl;
if (cameraUrl != null && !TextUtils.isEmpty(cameraUrl)) {
if (new File(cameraUrl).exists()) {
return cameraUrl;
}
}
return "";
}
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/BeanUserInfo.java
View file @ 558d86c3
......@@ -34,7 +34,7 @@ public class BeanUserInfo extends BaseBean {
private Integer userid;
//imid
private Integer imUserid;
///账号（手机号）
///帐号（手机号）
private String username;
//微信openid
private String wxOpenid;
......
RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/UserInfoBean.java
View file @ 558d86c3
......@@ -38,7 +38,7 @@ public class UserInfoBean extends BaseBean implements Serializable {
private Integer userid;
//imid
private Integer imUserid;
///账号（手机号）
///帐号（手机号）
private String username;
//微信openid
private String wxOpenid;
......
RvWrapper/src/main/res/values/dimens.xml
View file @ 558d86c3
......@@ -52,6 +52,7 @@
<dimen name="size_240">240dp</dimen>
<dimen name="size_245">245dp</dimen>
<dimen name="size_250">250dp</dimen>
<dimen name="size_410">410dp</dimen>
<dimen name="size_420">420dp</dimen>
<dimen name="size_440">440dp</dimen>
<dimen name="size_500">500dp</dimen>
......
Utils/src/main/java/com/base/utils/tools/android/IntentUtil.java
View file @ 558d86c3
......@@ -58,7 +58,7 @@ import java.io.File;
* // 25. ACTION_SECURITY_SETTINGS ： // 跳转到安全设置界面
* // 26. ACTION_SETTINGS ： // 跳转到设置界面
* // 27. ACTION_SOUND_SETTINGS // 跳转到声音设置界面
* // 28. ACTION_SYNC_SETTINGS ： // 跳转账户同步界面
* // 28. ACTION_SYNC_SETTINGS ： // 跳转帐户同步界面
* // 29. ACTION_USER_DICTIONARY_SETTINGS ： // 跳转用户字典界面
* // 30. ACTION_WIFI_IP_SETTINGS ： // 跳转到IP设定界面
* // 31. ACTION_WIFI_SETTINGS ： // 跳转Wifi列表设置
......
Utils/src/main/java/com/base/utils/tools/android/KDNiaoHttpUtil.java
View file @ 558d86c3
......@@ -18,7 +18,7 @@ import java.util.Map;
* @see: http://www.kdniao.com/YundanChaxunAPI.aspx
* @copyright: 深圳市快金数据技术服务有限公司
*
* DEMO中的电商ID与私钥仅限测试使用，正式环境请单独注册账号
* DEMO中的电商ID与私钥仅限测试使用，正式环境请单独注册帐号
* 单日超过500单查询量，建议接入我方物流轨迹订阅推送接口
*
* ID和Key请到官网申请：http://www.kdniao.com/ServiceApply.aspx
......
component_dialog/src/main/java/com/rv/component/dialog/TipsDialog.java
View file @ 558d86c3
......@@ -17,6 +17,7 @@ public class TipsDialog extends BaseDialog {
setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
}
@Override
public int getViewLayout() {
return R.layout.rv_dialog_tips;
......
component_dialog/src/main/res/layout/rv_dialog_tips.xml
View file @ 558d86c3
......@@ -35,7 +35,7 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:layout_marginBottom="@dimen/size_26"
android:text="取消将从您的押金里扣除20元手续费，确认要取消吗？"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/size_16" />
......
component_utils/src/main/java/com/rv/component/utils/MyTextWatcher.java 0 → 100644
View file @ 558d86c3
package com.rv.component.utils;
import android.content.Context;
import android.text.Editable;
import android.text.Selection;
import android.text.TextWatcher;
import android.util.Log;
import android.widget.EditText;
import android.widget.Toast;
public class MyTextWatcher implements TextWatcher {
private Context context;
private EditText editText;
private int len; //允许输入的字节长度(一个中文占3个字节)
public MyTextWatcher(Context context, EditText editText, int len) {
this.context = context;
this.editText = editText;
this.len = len;
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable editable) {
String inputStr = editable.toString().trim();
byte[] bytes = inputStr.getBytes();
if (bytes.length > len) {
Toast.makeText(context, "超过规定字符数", Toast.LENGTH_SHORT).show();
Log.i("str", inputStr);
//取前15个字节
byte[] newBytes = new byte[len];
for (int i = 0; i < len; i++) {
newBytes[i] = bytes[i];
}
String newStr = new String(newBytes);
editText.setText(newStr);
//将光标定位到最后
Selection.setSelection(editText.getEditableText(), newStr.length());
}
}
}
module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java
View file @ 558d86c3
......@@ -242,6 +242,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
}
@Override
public void onRefresh() {
onFresh();
......
module_discovery/src/main/java/com/xxfc/discovery/other/PostPatActivity.java
View file @ 558d86c3
......@@ -368,43 +368,43 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
// 多张图片压缩 相册
private void album(ArrayList<String> stringArrayListExtra, boolean isOriginal) {
if (isOriginal) {// 原图发送，不压缩
Log.e("zq", "原图上传，不压缩，选择原文件路径");
for (int i = 0; i < stringArrayListExtra.size(); i++) {
mPhotoList.add(stringArrayListExtra.get(i));
mAdapter.notifyDataSetInvalidated();
}
return;
}
List<File> fileList = new ArrayList<>();
for (int i = 0; i < stringArrayListExtra.size(); i++) {
// Luban只处理特定后缀的图片，不满足的不处理也不走回调，
// 只能挑出来不压缩，
List<String> lubanSupportFormatList = Arrays.asList("jpg", "jpeg", "png", "webp", "gif");
boolean support = false;
for (int j = 0; j < lubanSupportFormatList.size(); j++) {
if (stringArrayListExtra.get(i).endsWith(lubanSupportFormatList.get(j))) {
support = true;
break;
}
}
if (!support) {
fileList.add(new File(stringArrayListExtra.get(i)));
stringArrayListExtra.remove(i);
}
}
if (fileList.size() > 0) {
for (File file : fileList) {// 不压缩的部分，直接发送
mPhotoList.add(file.getPath());
mAdapter.notifyDataSetInvalidated();
}
}
// if (isOriginal) {// 原图发送，不压缩
// Log.e("zq", "原图上传，不压缩，选择原文件路径");
// for (int i = 0; i < stringArrayListExtra.size(); i++) {
// mPhotoList.add(stringArrayListExtra.get(i));
// mAdapter.notifyDataSetInvalidated();
// }
// return;
// }
// List<File> fileList = new ArrayList<>();
// for (int i = 0; i < stringArrayListExtra.size(); i++) {
// // Luban只处理特定后缀的图片，不满足的不处理也不走回调，
// // 只能挑出来不压缩，
// List<String> lubanSupportFormatList = Arrays.asList("jpg", "jpeg", "png", "webp", "gif");
// boolean support = false;
// for (int j = 0; j < lubanSupportFormatList.size(); j++) {
// if (stringArrayListExtra.get(i).endsWith(lubanSupportFormatList.get(j))) {
// support = true;
// break;
// }
// }
// if (!support) {
// fileList.add(new File(stringArrayListExtra.get(i)));
// stringArrayListExtra.remove(i);
// }
// }
//
// if (fileList.size() > 0) {
// for (File file : fileList) {// 不压缩的部分，直接发送
// mPhotoList.add(file.getPath());
// mAdapter.notifyDataSetInvalidated();
// }
// }
Luban.with(this)
.load(stringArrayListExtra)
.ignoreBy(100)// 原图小于100kb 不压缩
.ignoreBy(70)// 原图小于70kb 不压缩
.setCompressListener(new OnCompressListener() {
@Override
public void onStart() {
......@@ -413,6 +413,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
@Override
public void onSuccess(File file) {
Log.e("zq", "压缩成功，压缩后图片位置:" + file.getPath() + "压缩后图片大小:" + file.length() / 1024 + "KB");
mPhotoList.add(file.getPath());
mAdapter.notifyDataSetInvalidated();
}
......@@ -431,7 +432,7 @@ public class PostPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
// 拍照出来的图片Luban一定支持，
Luban.with(this)
.load(file)
.ignoreBy(100) // 原图小于100kb 不压缩
.ignoreBy(70) // 原图小于70kb 不压缩
// .putGear(2) // 设定压缩档次，默认三挡
// .setTargetDir() // 指定压缩后的图片路径
.setCompressListener(new OnCompressListener() { //设置回调
......
module_discovery/src/main/res/layout/activity_pat_generate_poster.xml
View file @ 558d86c3
......@@ -47,7 +47,7 @@
android:layout_marginBottom="@dimen/size_10"
android:maxLines="1"
android:singleLine="true"
android:text="落霞与孤叶齐飞，荒草共长天一色，荒草长一..."
android:text=""
android:textColor="@color/colorMain"
android:textSize="@dimen/text_14" />
......@@ -78,7 +78,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:text="欣新房车东莞分公司总经理滴房车推广有奖"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_10" />
</LinearLayout>
......@@ -112,7 +112,7 @@
android:layout_marginTop="@dimen/size_5"
android:drawableLeft="@drawable/common_icon_logo_small"
android:drawablePadding="@dimen/size_3"
android:text="滴房车·让生活更美好"
android:text="房车·让生活更美好"
android:textColor="@color/gray_B4B4B4"
android:textSize="@dimen/text_8" />
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/HomeFragment.java
View file @ 558d86c3
......@@ -265,7 +265,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
tvDay.setCompoundDrawables(null, null, null, drawable);
begDate = MyUtils.getFetureDate(1) + " 09:00";
tvGetTime.setText(DateUtils.formatDate66(begDate));
tvGetWeek.setText("周" + MyUtils.getWeek(DateUtils.getCurDate()));
tvGetWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(1)));
endDate = MyUtils.getFetureDate(2) + " 18:00";
tvOutTime.setText(DateUtils.formatDate66(endDate));
tvOutWeek.setText("周" + MyUtils.getWeek(MyUtils.getFetureDate(2)));
......@@ -893,6 +893,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
return;
}
}
/**
* 判断是否登录
*
......@@ -900,7 +901,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
*/
private boolean isLogin() {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
startActivity(LoginRvActivity.getIntent(_mActivity,0));
startActivity(LoginRvActivity.getIntent(_mActivity, 0));
return false;
}
return true;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/HotCarTypeAdapter.java
View file @ 558d86c3
......@@ -45,13 +45,19 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
.apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
.into(utils);
helper.setText(R.id.tv_name,bean.getName());
helper.setText(R.id.tv_content,bean.getName1());
helper.setText(R.id.tv_name, bean.getName());
helper.setText(R.id.tv_content, bean.getName1());
if (!TextUtil.isEmpty(bean.getPrice())) {
helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), getUnit()));
} else {
helper.setText(R.id.tv_price, "");
}
if ("2".equals(hotType) || "4".equals(hotType)) {
helper.setGone(R.id.tv_content, false);
} else {
helper.setGone(R.id.tv_content, true);
}
}
public void setType(String hotType) {
......@@ -75,7 +81,7 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
}
// @Override
// @Override
// public int getItemCount() {
// return 4;
// }
......
module_home/src/main/res/layout/fragment_home.xml
View file @ 558d86c3
......@@ -556,11 +556,11 @@
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>
<!---->
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerView_home_content"
android:layout_width="match_parent"
android:layout_height="@dimen/size_440"
android:layout_height="@dimen/size_410"
android:layout_marginTop="@dimen/size_10"
android:paddingLeft="@dimen/size_10"
android:paddingRight="@dimen/size_10" />
......
module_home/src/main/res/values/strings.xml
View file @ 558d86c3
......@@ -11,9 +11,9 @@
<string name="rv_get_code">获取验证码</string>
<string name="rv_login">登录</string>
<string name="rv_pwd_login">密码登录</string>
<string name="rv_login_toast">还没有注册账号？</string>
<string name="rv_login_toast">还没有注册帐号？</string>
<string name="rv_registered_toast">立即注册</string>
<string name="rv_other_login">第三方账户登录</string>
<string name="rv_other_login">第三方帐户登录</string>
<string name="rv_login_rest">重新获取</string>
<string name="rv_login_authorization_failure">第三方登录失败</string>
<string name="rv_login_success">登录成功</string>
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 558d86c3
......@@ -390,7 +390,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvUserIdentity.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
tvViewPrivileges.setText("查看会员特权");
tvMembershipLevel.setText("会员特权");
tvMemberHint.setText("免费用车- -天");
tvIntegral.setText("0");
......
module_mine/src/main/java/com/rv/rvmine/fragment/MyReleasePatFragment.java
View file @ 558d86c3
......@@ -234,7 +234,9 @@ public class MyReleasePatFragment extends BaseFragment<CommonPresenter> implemen
Map<String, Object> map = new LinkedHashMap<>();
map.put("page", page);
map.put("type", "2");
mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.RVENTHUSIAST_GETBYUSERID_LIST, MyReleaseBean.class, map, headMap, page == 1 ? true : false);
if (mPresenter !=null) {
mPresenter.getData(RvFrameConfig.HOST, 0, ApiConfig.RVENTHUSIAST_GETBYUSERID_LIST, MyReleaseBean.class, map, headMap, page == 1 ? true : false);
}
}
private void deleteData() {
......
module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java
View file @ 558d86c3
......@@ -29,6 +29,7 @@ import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.component.dialog.PickerDialog;
import com.rv.component.utils.IsAppInstall;
import com.rv.component.utils.MyTextWatcher;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.ui.main.home.bean.ImageUploadBean;
import com.rv.rvmine.R;
......@@ -96,7 +97,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
private String mUnionid;
private String mHeadImg;
private String birthday;
private String birthday = "";
public static Intent getIntent(Context context, UserInfoBean.UserInfo info) {
return new Intent(context, PersonalInformationActivity.class)
......@@ -112,6 +113,8 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("个人资料");
titleView.setText(R.id.tv_title_right, "保存");
etNickname.addTextChangedListener(new MyTextWatcher(this, etNickname, 32));
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -383,7 +386,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
return;
}
if (TextUtil.isEmpty(birthday)) {
if (birthday != null && TextUtil.isEmpty(birthday)) {
showToast("生日不为空！");
return;
}
......
module_mine/src/main/res/layout/activity_personal_information.xml
View file @ 558d86c3
......@@ -59,7 +59,6 @@
android:background="@null"
android:gravity="right|center_vertical"
android:hint="请输入昵称"
android:maxLength="10"
android:maxLines="1"
android:textColor="@color/colorMain"
android:textColorHint="@color/colorGray"
......
module_mine/src/pro/res/layout/activity_mine.xml
View file @ 558d86c3
......@@ -6,8 +6,7 @@
android:background="@color/colorLine"
android:orientation="vertical">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -53,7 +52,8 @@
android:layout_width="@dimen/size_35"
android:layout_height="@dimen/size_35"
android:padding="@dimen/size_8"
android:src="@drawable/mycenter_icon_message" />
android:src="@drawable/mycenter_icon_message"
android:visibility="gone" />
<ImageView
android:id="@+id/iv_item_setting"
......
module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java
View file @ 558d86c3
......@@ -236,16 +236,19 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
if (travelBookingDialog == null) {
travelBookingDialog = new TravelBookingDialog(mActivity);
}
travelBookingDialog.setNewData(DetailsData);
travelBookingDialog.show();
}
travelBookingDialog.setOnDayClickListener(new TravelBookingDialog.OnOKClickListener() {
@Override
public void onClickData(BeanOrderParam data) {
startActivity(TravelerConfirmOrderActivity.getIntent(mActivity, data));
if (travelBookingDialog != null) {
travelBookingDialog.setNewData(DetailsData);
travelBookingDialog.show();
}
});
}
if (travelBookingDialog != null) {
travelBookingDialog.setOnDayClickListener(new TravelBookingDialog.OnOKClickListener() {
@Override
public void onClickData(BeanOrderParam data) {
startActivity(TravelerConfirmOrderActivity.getIntent(mActivity, data));
}
});
}
}
private void cancelCollect() {
......
plugin_poster/src/main/java/com/rv/poster/plugin/PosterActivity.java
View file @ 558d86c3
......@@ -56,6 +56,7 @@ import butterknife.OnClick;
@Route(path = Constance.ACTIVITY_URL_POSTERACTIVITY)
public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
@BindView(R2.id.img_bill_top)
ImageView imgBillTop;
@BindView(R2.id.ring_header)
......@@ -117,9 +118,13 @@ public class PosterActivity extends BaseStatusActivity<CommonPresenter> {
if (!TextUtils.isEmpty(name)) {
tvName.setText(name);
}
} else {
GlideManager.getInstance(mActivity).loadCircleImage("https://mgmt.dfangche.com/image/app/default_avatar.png", ringHeader);
tvName.setText("滴房车");
}
}
@Override
public void onShowResult(int requestType, BaseBean result) {
......
plugin_poster/src/main/res/layout/activity_carposter.xml
View file @ 558d86c3
......@@ -106,8 +106,8 @@
android:id="@+id/img_qrcode"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_60"
android:layout_marginRight="@dimen/size_5"
android:layout_marginLeft="@dimen/size_10" />
android:layout_marginLeft="@dimen/size_10"
android:layout_marginRight="@dimen/size_5" />
</LinearLayout>
</LinearLayout>
......@@ -119,7 +119,7 @@
android:layout_marginTop="@dimen/size_5"
android:drawableLeft="@drawable/common_icon_logo_small"
android:drawablePadding="@dimen/size_3"
android:text="滴房车·让生活更美好"
android:text="房车·让生活更美好"
android:textColor="@color/gray_B4B4B4"
android:textSize="@dimen/text_8" />
</LinearLayout>
......
plugin_poster/src/main/res/layout/activity_poster.xml
View file @ 558d86c3
......@@ -60,7 +60,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_5"
android:layout_marginLeft="@dimen/size_10"
android:layout_weight="1"
android:orientation="vertical">
......@@ -69,8 +69,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="false"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18" />
android:maxLines="2"
android:ellipsize="end"
android:text=""
android:textColor="@color/textGray"
android:textSize="@dimen/text_15" />
</LinearLayout>
......@@ -105,7 +108,7 @@
android:layout_marginTop="@dimen/size_5"
android:drawableLeft="@drawable/common_icon_logo_small"
android:drawablePadding="@dimen/size_3"
android:text="滴房车·让生活更美好"
android:text="房车·让生活更美好"
android:textColor="@color/gray_B4B4B4"
android:textSize="@dimen/text_8" />
</LinearLayout>
......
plugin_share/src/main/res/layout/activity_share_ruler.xml
View file @ 558d86c3
......@@ -210,17 +210,17 @@
android:text="1、满足下列条件的好友，可通过您分享的邀请链接/码，领取的房车新人专享优惠券：\n
a、好友有下载APP；\n
b、好友为新用户并未进行过注册；\n
c、好友的当前账号中无滴房车新手券。\n
c、好友的当前帐号中无滴房车新手券。\n
\n
2、在您登录的状态下，分享房车、旅游、营地、拍拍等APP内的分享，都有同等效果。\n
\n
3、您的好友在注册后，确定推荐人您后，您好友在APP进行付费操作，如租房车，确认行程并完成支付，您可获得对应的奖励；奖励将在您的好友成功支付订单后24小时内到账。\n
3、您的好友在注册后，确定推荐人您后，您好友在APP进行付费操作，如租房车，确认行程并完成支付，您可获得对应的奖励；奖励将在您的好友成功支付订单后24小时内到帐。\n
\n
4、拥有相同设备（手机）、账号、手机号、微信号、IP、银行卡或其他同理将视为同一用户（适用于您与您的好友），本活动仅对成功邀请好友完成并支付订单的用户发放邀请奖励。\n
4、拥有相同设备（手机）、帐号、手机号、微信号、IP、银行卡或其他同理将视为同一用户（适用于您与您的好友），本活动仅对成功邀请好友完成并支付订单的用户发放邀请奖励。\n
\n
5、您获得的现金奖励可以在我的钱包页面“我的—我的钱包—提现”中进行提现。\n
\n
6、针对违规骗取邀请奖励的行为，将不予发放邀请奖励、追回相关奖励或封停账号，并依法追究法律责任。 \n
6、针对违规骗取邀请奖励的行为，将不予发放邀请奖励、追回相关奖励或封停帐号，并依法追究法律责任。 \n
7、活动详情咨询：400-0369-369 "
android:textColor="#ff666666"
android:textSize="@dimen/sp_14" />
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/ConsumeDetailActivity.java
View file @ 558d86c3
......@@ -70,7 +70,7 @@ public class ConsumeDetailActivity extends BaseStatusActivity<CommonPresenter> i
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("账单明细");
titleView.setTitle("帐单明细");
recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
adapter = new ConsumeListAdapter(new ArrayList<ConsumeListBean.ConsumeItem>());
adapter.setOnLoadMoreListener(this, recyclerView);
......
plugin_wallet/src/main/java/com/xxrv/wallet/activity/WithdrawActivity.java
View file @ 558d86c3
......@@ -190,7 +190,7 @@ public class WithdrawActivity extends BaseStatusActivity<WalletPresenter> {
private void showHint() {
accountNumber = etAccountNumber.getText().toString().trim();
if (TextUtils.isEmpty(accountNumber)) {
showToast("账户不能为空！");
showToast("帐户不能为空！");
return;
}
......
plugin_wallet/src/main/java/com/xxrv/wallet/adapter/WalletCathAdapter.java
View file @ 558d86c3
......@@ -30,7 +30,7 @@ public class WalletCathAdapter extends BaseQuickAdapter<WalletcathListBean.ItemW
helper.setText(R.id.tv_amount, "审核中");
helper.setTextColor(R.id.tv_amount, Color.parseColor("#cccccc"));
} else if (item.getStauts() == 1) {
helper.setText(R.id.tv_amount, "已到账");
helper.setText(R.id.tv_amount, "已到帐");
helper.setTextColor(R.id.tv_amount, Color.parseColor("#999999"));
} else if (item.getStauts() == 2) {
helper.setText(R.id.tv_amount, "审核失败");
......
plugin_wallet/src/main/res/layout/activity_set_pay_pwd.xml
View file @ 558d86c3
......@@ -22,7 +22,7 @@
android:enabled="true"
android:background="@color/white"
android:gravity="left|center_vertical"
android:hint="请输入该账号注册的手机号"
android:hint="请输入该帐号注册的手机号"
android:imeOptions="actionSend"
android:inputType="phone"
android:textColor="@color/colorMain"
......
plugin_wallet/src/main/res/layout/activity_wallet.xml
View file @ 558d86c3
......@@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:textSize="@dimen/text_12"
android:textColor="@color/textGray"
android:text="待入账（元）"/>
android:text="待入帐（元）"/>
<TextView
android:id="@+id/tv_not_amount"
......@@ -190,7 +190,7 @@
android:textSize="@dimen/text_14"
android:layout_centerVertical="true"
android:textColor="@color/colorMain"
android:text="账单明细"/>
android:text="帐单明细"/>
<ImageView
android:layout_width="wrap_content"
......
plugin_wallet/src/main/res/layout/activity_withdraw.xml
View file @ 558d86c3
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginTop="@dimen/size_15"
android:text="到账 支付宝账户"
android:text="到帐 支付宝账户"
android:textColor="@color/textGray"
android:textSize="@dimen/text_16" />
......@@ -38,7 +38,7 @@
android:layout_weight="1"
android:background="@null"
android:gravity="left|center_vertical"
android:hint="请输入到账支付宝账号"
android:hint="请输入到帐支付宝帐号"
android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
android:text=""
android:textColor="@color/colorMain"
......
plugin_wallet/src/main/res/layout/rv_dialog_verify_account_hint.xml
View file @ 558d86c3
......@@ -16,7 +16,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="核实账户"
android:text="核实帐户"
android:textColor="@color/colorMain"
android:textSize="@dimen/text_18"
android:textStyle="bold" />
......@@ -33,7 +33,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="转账金额："
android:text="转帐金额："
android:textColor="@color/textGray"
android:textSize="@dimen/text_16" />
......@@ -57,7 +57,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="转账支付宝账号："
android:text="转帐支付宝账号："
android:textColor="@color/textGray"
android:textSize="@dimen/text_16" />
......
plugin_wallet/src/main/res/values/strings.xml
View file @ 558d86c3
......@@ -2,12 +2,12 @@
<string name="app_name">plugin_wallet</string>
<string-array name="commision_list">
<item>全部</item>
<item>待入账</item>
<item>已到账</item>
<item>待入帐</item>
<item>已到帐</item>
</string-array>
<string-array name="enchashment_list">
<item>申请中</item>
<item>已到账</item>
<item>已到帐</item>
</string-array>
</resources>
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