Skip to content

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

修改包名

parent d67908b5
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 215 deletions
RvClient/src/main/AndroidManifest.xml
View file @ c952f527
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.test.rv">
package="com.xxfc.rv">
<!-- ===================标准 =================== -->
<uses-permission android:name="android.permission.VIBRATE" /> <!-- 震动 -->
<uses-permission android:name="android.permission.INTERNET" /> <!-- 联网 -->
......@@ -90,7 +90,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<application
android:name=".RvClientApplication"
android:name="com.xxfc.rv.RvClientApplication"
android:allowBackup="true"
android:icon="@mipmap/logo"
android:label="@string/app_name"
......@@ -131,6 +131,7 @@
android:name="design_height_in_dp"
android:value="640" /> <!-- umShare 相关 start -->
<!-- WeiXin callback -->
<activity
android:name=".wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
......@@ -161,7 +162,7 @@
android:theme="@android:style/Theme.Translucent.NoTitleBar" /> <!-- umShare 相关 end -->
<activity
android:name=".MainActivity"
android:name="com.xxfc.rv.MainActivity"
android:launchMode="singleTask"
android:screenOrientation="portrait" />
......
RvClient/src/main/java/com/test/rv/WelcomeActivity.java deleted 100644 → 0
View file @ d67908b5
package com.test.rv;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import com.ruiwenliu.wrapper.base.BaseActivity;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.util.UtilsManager;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.concurrent.TimeUnit;
import io.reactivex.Flowable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.annotations.NonNull;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
public class WelcomeActivity extends BaseActivity<CommonPresenter> {
private Disposable mDisposable = null;
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@Override
protected int setLayout() {
return R.layout.rv_act_weclome;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
showTitle(false);//隐藏菜单栏
interval();
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
}
@Override
public void onDestroy() {
super.onDestroy();
stopCarousel();
}
/**
* 计时器
*/
private void interval() {
mDisposable = Flowable.interval(3, TimeUnit.SECONDS)
.doOnNext(new Consumer<Long>() {
@Override
public void accept(@NonNull Long aLong) throws Exception {
}
})
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<Long>() {
@Override
public void accept(@NonNull Long aLong) throws Exception {
if (!TextUtils.isEmpty(UtilsManager.getInstance(mActivity).getSPInstance("city_json").getString("token", ""))) {
OkGoUtil.setToken(
UtilsManager.getInstance(mActivity)
.getSPInstance("city_json")
.getString("token", ""));
}
startActivity(MainActivity.getIntent(mActivity));
mDisposable.dispose();
finish();
}
});
}
/**
* 停止计时
*/
public void stopCarousel() {
if (mDisposable != null && !mDisposable.isDisposed()) {
mDisposable.dispose();
}
}
}
RvClient/src/main/java/com/test/rv/wxapi/WXEntryActivity.java deleted 100644 → 0
View file @ d67908b5
package com.test.rv.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
public class WXEntryActivity extends WXCallbackActivity {
}
RvClient/src/main/java/com/test/rv/wxapi/WXPayEntryActivity.java deleted 100644 → 0
View file @ d67908b5
package com.test.rv.wxapi;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.TextView;
import com.base.utils.ui.datetime.selector.util.TextUtil;
import com.frame.base.bus.PaymentFailedEvent;
import com.frame.base.bus.PaymentSuccessfulEvent;
import com.frame.base.bus.RxBus;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.rv.home.R2;
import com.rv.home.rv.module.basic.BaseStatusActivity;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
import com.tencent.mm.opensdk.modelbase.BaseReq;
import com.tencent.mm.opensdk.modelbase.BaseResp;
import com.tencent.mm.opensdk.openapi.IWXAPI;
import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
import com.tencent.mm.opensdk.openapi.WXAPIFactory;
import com.test.rv.R;
import butterknife.BindView;
import butterknife.OnClick;
public class WXPayEntryActivity extends BaseStatusActivity<CommonPresenter> implements IWXAPIEventHandler {
private static final String TAG = "MicroMsg.SDKSample.WXPayEntryActivity";
@BindView(R2.id.tv_content)
TextView tvContent;
@BindView(R2.id.tv_order)
TextView tvOrder;
private IWXAPI api;
@Override
protected int setLayout() {
return R.layout.rv_pay_result;
}
@Override
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle(mActivity.getString(R.string.rv_weixin_pay_success));
api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
api.handleIntent(getIntent(), this);
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
api.handleIntent(intent, this);
}
@Override
public void onReq(BaseReq req) {
}
@Override
public void onResp(BaseResp resp) {
Log.d("Wxpayentryactivity", "onPayFinish, errCode = " + resp.errCode);
if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
switch (resp.errCode) {
case 0:
RxBus.post(new PaymentSuccessfulEvent());
finish();
break;
case -1:
finish();
break;
case -2:
RxBus.post(new PaymentFailedEvent());
finish();
break;
}
// AlertDialog.Builder builder = new AlertDialog.Builder(this);
// builder.setTitle("提示");
// builder.setMessage("微信支付结果：" + String.valueOf(resp.errCode));
// builder.show();
}
}
@Override
public void onShowResult(int requestType, BaseBean result) {
}
@OnClick(R2.id.tv_order)
public void onViewClicked() {
startActivity(OrderListActivity.getIntent(mActivity, 1));
finish();
}
}
\ No newline at end of file
RvClient/src/main/java/com/test/rv/MainActivity.java → RvClient/src/main/java/com/xxfc/rv/MainActivity.java
View file @ c952f527
package com.test.rv;
package com.xxfc.rv;
import android.content.Context;
import android.content.Intent;
......@@ -26,7 +26,6 @@ import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.adapter.TabAdapter;
import com.rv.home.rv.module.ui.main.home.HomeFragment;
import com.rv.rvmine.MineFragment;
import com.rv.rvmine.traveler.SettingActivity;
import com.rv.tourism.R2;
import com.rv.tourism.TourismFragment;
import com.rv.version.bean.VersionCheckBean;
......
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ToTravelFragment.java
View file @ c952f527
......@@ -38,7 +38,7 @@ import io.reactivex.schedulers.Schedulers;
* Desc:待出行
*/
public class ToTravelFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener{
public class ToTravelFragment extends BaseFragment<CommonPresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
@BindView(R2.id.recyclerView)
RecyclerView recyclerView;
@BindView(R2.id.refresh)
......@@ -73,9 +73,9 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
if (1 ==dataBean.getType()) {
if (1 == dataBean.getType()) {
startActivityForResult(OrderDetailActivity.getIntent(_mActivity, dataBean), 1);
}else if (2== dataBean.getType()){
} else if (2 == dataBean.getType()) {
startActivityForResult(TravelOrderDetailsActivity.getIntent(_mActivity, dataBean), 2);
}
}
......@@ -85,12 +85,12 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
@Override
public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
int id = view.getId();
if (id == R.id.tv_process){
if (id == R.id.tv_process) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
}else if (id == R.id.tv_camp_process){
startActivity(PickUpTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
} else if (id == R.id.tv_camp_process) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity,dataBean));
startActivity(GetOnTheCarQRCodeActivity.getIntent(_mActivity, dataBean));
}
}
});
......@@ -170,8 +170,8 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
countPage = bean.getData().getTotalPage();
mAdapter.addNewData(bean);
mSimpleRefreshLayout.onRefreshComplete();
if(bean.getData().getTotalCount()==0){
mAdapter.setEmptyView(getEmptyView(recyclerView,-1,_mActivity.getString(R.string.rv_select_not_data)));
if (bean.getData().getTotalCount() == 0) {
mAdapter.setEmptyView(getEmptyView(recyclerView, -1, _mActivity.getString(R.string.rv_select_not_data)));
mAdapter.notifyDataSetChanged();
}
......
plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java
View file @ c952f527
......@@ -178,7 +178,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
}
private void toMainActivity() {
ComponentName componentName = new ComponentName(mContext, "com.test.rv.MainActivity");
ComponentName componentName = new ComponentName(mContext, "com.xxfc.rv.MainActivity");
Intent intent = new Intent();
intent.putExtra("from", "use_member");
intent.setComponent(componentName);
......
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