Skip to content

R
RvApp
Commit 0bf242d7 authored by linfeng's avatar linfeng
Browse files
Options

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

parents e0829437 7c441c69
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 26 deletions
RvClient/build.gradle
View file @ 0bf242d7
......@@ -8,8 +8,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
flavorDimensions "default"
versionCode 151
versionName "1.5.1"
versionCode 152
versionName "1.5.2"
multiDexEnabled true
ndk {
......
RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ 0bf242d7
......@@ -2,6 +2,7 @@ package com.xxfc.rv;
import android.Manifest;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.Notification;
import android.content.ComponentName;
import android.content.Context;
......@@ -20,8 +21,10 @@ import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
......@@ -97,7 +100,7 @@ import pub.devrel.easypermissions.AppSettingsDialog;
import pub.devrel.easypermissions.EasyPermissions;
public class MainActivity extends BaseActivity<CommonPresenter> implements EasyPermissions.PermissionCallbacks{
public class MainActivity extends BaseActivity<CommonPresenter> implements EasyPermissions.PermissionCallbacks {
private static final String TAG = MainActivity.class.getSimpleName();
......@@ -161,7 +164,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements Easy
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
// initKeepLive();
AudioOrVideoController.init(getApplicationContext(), logoutListener);
EventBus.getDefault().register(this);
checkPermissions();
......@@ -441,8 +443,6 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements Easy
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
......@@ -562,16 +562,44 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements Easy
header.put("Authorization", OkGoUtil.getToken());
Map<String, Object> body = new HashMap<>();
body.put("code", Cookie.getStringValue(getApplicationContext(), "code"));
body.put("code", AppCookie.getStringValue(getApplicationContext(), "code"));
mPresenter.postData(RvFrameConfig.HOST, 10000, ApiConfig.HTTP_URL_RELATION_BIND, null, body, header, false);
}
Log.d("type =",""+intent.getIntExtra("type", 0)) ;
switch (intent.getIntExtra("type", 0)) {
case 0:
case 4:
ComponentName componentName = new ComponentName(this, "com.rv.share.WebViewActivity");
Intent in = new Intent();
in.setComponent(componentName);
in.putExtra("url", intent.getStringExtra("url"));
in.putExtra("title", intent.getStringExtra("title"));
startActivity(in);
break;
case 1:
setCurrent(TYPE_HOME_PAGE);
break;
case 2:
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_TRAVELDETAILS)
.withString("id", intent.getStringExtra("id"))
.navigation();
break;
case 3:
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_CAMPDETAIL)
.withString("id", intent.getStringExtra("id"))
.navigation();
break;
case 5:
ARouter.getInstance()
.build(Constance.ACTIVITY_URL_DETAILPAT)
.withString("id", intent.getStringExtra("id"))
.navigation();
break;
}
}
}
......@@ -655,11 +683,29 @@ public class MainActivity extends BaseActivity<CommonPresenter> implements Easy
Cookie.clear(getApplicationContext());
OkGoUtil.clearToken();
ImSetting.logout();
startActivity(LoginRvActivity.getIntent(getApplicationContext(), 0));
showToast("退出成功！");
if (mAdapter != null) {
((MineFragment) mAdapter.getItem(4)).signOut();
}
showLogoutDialog();
// startActivity(LoginRvActivity.getIntent(getApplicationContext(), 0));
// showToast("退出成功！");
// if (mAdapter != null) {
// ((MineFragment) mAdapter.getItem(4)).signOut();
// }
}
private void showLogoutDialog() {
new android.support.v7.app.AlertDialog.Builder(mActivity)
.setTitle("提示")
.setMessage("该账号在其他移动端登录，程序即将退出")
.setCancelable(false)
.setPositiveButton("确定", (dialog1, which) -> {
dialog1.dismiss();
System.exit(0);
}).show();
// WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
// params.type = WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG;
// dialog.getWindow().setAttributes(params);
// dialog.getWindow().getAttributes().gravity = Gravity.CENTER;
// dialog.show();
}
void destory() {
......
RvClient/src/main/java/com/xxfc/rv/WakeUpActivity.java
View file @ 0bf242d7
......@@ -47,11 +47,18 @@ public class WakeUpActivity extends AppCompatActivity {
LogUtil.d("唤醒传过来的url=" + url);
String title = URLDecoder.decode(object.optString("title"), "UTF-8");
LogUtil.d("唤醒传过来的tile=" + title);
if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) {
String id = object.optString("id");
LogUtil.d("唤醒传过来的id=" + id);
int type = object.optInt("t", 0);
LogUtil.d("唤醒传过来的type=" + type);
// if (!TextUtils.isEmpty(url) && !TextUtils.isEmpty(title)) {
intent.putExtra("to", "webView");
intent.putExtra("url", url);
intent.putExtra("title", title);
}
intent.putExtra("id", id);
intent.putExtra("type", type);
// }
} catch (Exception e) {
e.printStackTrace();
}
......
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 0bf242d7
......@@ -152,7 +152,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
((View) ivMember.getParent()).setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
tvViewPrivileges.setText("查看会员特权");
mSimpleRefreshLayout.setPullDownEnable(false);
} else {
tvNickname.setVisibility(View.VISIBLE);
......
module_tourism/src/main/java/com/rv/tourism/TourismFragment.java
View file @ 0bf242d7
......@@ -30,6 +30,7 @@ import com.baidu.mapapi.search.geocode.OnGetGeoCoderResultListener;
import com.baidu.mapapi.search.geocode.ReverseGeoCodeResult;
import com.base.utils.tools.android.IntentUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.ruiwenliu.wrapper.SPConstance;
import com.ruiwenliu.wrapper.browse.ActivityImageBrowseUrl;
import com.frame.base.url.Constance;
import com.ruiwenliu.wrapper.base.BaseBean;
......@@ -39,6 +40,7 @@ import com.ruiwenliu.wrapper.util.glide.GlideManager;
import com.ruiwenliu.wrapper.util.permission.RxPermission;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.rv.component.utils.Cookie;
import com.rv.component.utils.LocationRecord;
import com.rv.tourism.adapter.AllPopularAdapter;
import com.rv.tourism.adapter.PopularBrigadeAdapter;
......@@ -56,6 +58,7 @@ import com.yuyife.banner.Banner;
import com.yuyife.banner.BannerConfig;
import com.yuyife.banner.listener.OnBannerListener;
import com.yuyife.banner.loader.ImageLoader;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.util.HashMap;
......@@ -229,10 +232,13 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
.withDouble("lonLongitude", 0)
.navigation();
} else if (id == R.id.travel_server_image) {
Intent intent = new Intent(Intent.ACTION_DIAL);
Uri uri = Uri.parse("tel:" + "4000369369");
intent.setData(uri);
if (isLogin()) {
ComponentName name = new ComponentName(getActivity(), "com.rv.im.CustomerListActivity");
Intent intent = new Intent();
intent.putExtra("login_user_id", Cookie.getStringValue(getContext(), SPConstance.USER_JSON_IMUSERID));
intent.setComponent(name);
startActivity(intent);
}
} else if (id == R.id.ll_item_popular_brigade_many || id == R.id.iv_popular_brigade_many) {
//查看热门更多
llLayoutPopularMore.setVisibility(View.VISIBLE);
......@@ -241,6 +247,19 @@ public class TourismFragment extends BaseFragment<TourismPresenter> implements S
}
}
/**
* 判断是否登录
*
* @return
*/
private boolean isLogin() {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
return false;
}
return true;
}
/**
* 获取周边游
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ 0bf242d7
......@@ -296,7 +296,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
info = infoBean.getData();
if (info != null) {
GlideManager.getInstance(this).loadImage(info.getHeadimgurl(), ivAvatar);
tvNickname.setText(info.getUsername());
tvNickname.setText(!TextUtils.isEmpty(info.getNickname()) ? info.getNickname() : info.getUsername());
if (info.getCertificationStatus() == 0) { //实名认证状态:0-未认证，1-已认证
verified = false;
tvVerified.setText("未实名认证");
......
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