diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6aac20b..5940137 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,10 @@ + + + + @@ -203,6 +207,16 @@ android:configChanges="orientation|screenSize|keyboardHidden" android:exported="false" android:screenOrientation="portrait" /> + + + + - + + + + + + + + + + + + + + + { @Override protected void onApplyData() { - // getAppVersionInfo(); + getAppVersionInfo(); } /** * 获取线上APP的版本信息 */ private void getAppVersionInfo() { - RxHttp.get(Api.UPDATE_APP) - .asResponse(Object.class) + RxHttp.postJson(Api.UPDATE_APP) + .add("phoneType", "1") + .add("platform", "2") + .asResponse(UpdateEntity.class) .as(RxLife.asOnMain(this)) .subscribe(data -> { - //TODO - + if (data != null) { + int currentVersionCode = AppUtil.getVersionCode(mContext); + int onlineVersionCode = Integer.parseInt(data.getVersionCode()); + if (onlineVersionCode > currentVersionCode) { + int grade = Integer.parseInt(data.getForceUpdate()); + showUpdateDialog(grade, AppUtil.getImageUrl(data.getDownloadUrl()), data.getVersionDesc()); + } + } }, (OnError) error -> { LogUtil.e("getAppVersionInfo", error.getErrorMsg()); }); diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/BaoxianFuwuActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/BaoxianFuwuActivity.java index 7fd8eff..25cf43c 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/home/BaoxianFuwuActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/BaoxianFuwuActivity.java @@ -3,6 +3,7 @@ package com.tairui.industrial_operation.ui.home; import com.gyf.immersionbar.ImmersionBar; import com.tairui.industrial_operation.base.BaseActivity; import com.tairui.industrial_operation.databinding.ActivityBaoxianfuwuBinding; +import com.tairui.industrial_operation.util.IntentUtil; import com.tairui.industrial_operation.util.SingleClickListener; import android.view.View; @@ -28,6 +29,12 @@ public class BaoxianFuwuActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityBaoxianshenqingBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.viewNext.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext,DaikuanApplySuccessActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanApplySuccessActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanApplySuccessActivity.java new file mode 100644 index 0000000..4f777c4 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanApplySuccessActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityDaikuanshenqingChenggongBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class DaikuanApplySuccessActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityDaikuanshenqingChenggongBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanShenqingActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanShenqingActivity.java new file mode 100644 index 0000000..bc1b28a --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/DaikuanShenqingActivity.java @@ -0,0 +1,40 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityDaikuanshenqingBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class DaikuanShenqingActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityDaikuanshenqingBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.viewNext.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, RenlianShibieActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuActivity.java index c0490e3..aa8cb80 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuActivity.java @@ -3,6 +3,7 @@ package com.tairui.industrial_operation.ui.home; import com.gyf.immersionbar.ImmersionBar; import com.tairui.industrial_operation.base.BaseActivity; import com.tairui.industrial_operation.databinding.ActivityDanbaofuwuBinding; +import com.tairui.industrial_operation.util.IntentUtil; import com.tairui.industrial_operation.util.SingleClickListener; import android.view.View; @@ -28,6 +29,12 @@ public class DanbaoFuwuActivity extends BaseActivity finish(); } }); + binding.img1.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, DanbaoFuwuDetailActivity.class); + } + }); } } diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuDetailActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuDetailActivity.java new file mode 100644 index 0000000..cddfca4 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuDetailActivity.java @@ -0,0 +1,40 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityDanbaofuwuDetailBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class DanbaoFuwuDetailActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityDanbaofuwuDetailBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.viewNext.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, DanbaoFuwuShenqingActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuShenqingActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuShenqingActivity.java new file mode 100644 index 0000000..ccb515b --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/DanbaoFuwuShenqingActivity.java @@ -0,0 +1,40 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityDanbaofuwuShenqingBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class DanbaoFuwuShenqingActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityDanbaofuwuShenqingBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.viewNext.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, DaikuanApplySuccessActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/NongShiServiceActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/NongShiServiceActivity.java index 755978d..4de2596 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/home/NongShiServiceActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/NongShiServiceActivity.java @@ -147,6 +147,12 @@ public class NongShiServiceActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityNongjiDeviceDetailBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.img2.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, NongjiDeviceGoumaiZulinActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/NongjiDeviceGoumaiZulinActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/NongjiDeviceGoumaiZulinActivity.java new file mode 100644 index 0000000..d3e1a64 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/NongjiDeviceGoumaiZulinActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityNongjiDeviceGoumaiZulinBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class NongjiDeviceGoumaiZulinActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityNongjiDeviceGoumaiZulinBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/RenlianShibieActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/RenlianShibieActivity.java new file mode 100644 index 0000000..5636f62 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/RenlianShibieActivity.java @@ -0,0 +1,40 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityRenlianshibieBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class RenlianShibieActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityRenlianshibieBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.viewNext.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, DaikuanApplySuccessActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanActivity.java new file mode 100644 index 0000000..ebb3c09 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanActivity.java @@ -0,0 +1,40 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivitySuyuanScanBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class SuyuanScanActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivitySuyuanScanBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.img1.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, SuyuanScanResultActivity.class); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanResultActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanResultActivity.java new file mode 100644 index 0000000..a9e14d1 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanScanResultActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.home; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivitySuyuanScanResultBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class SuyuanScanResultActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivitySuyuanScanResultBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanSearchActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanSearchActivity.java index 9e6377f..bf10fd6 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanSearchActivity.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/home/SuyuanSearchActivity.java @@ -47,6 +47,12 @@ public class SuyuanSearchActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityAfterSaleBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/FeedbackActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/FeedbackActivity.java new file mode 100644 index 0000000..287de26 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/FeedbackActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityFeedbackBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class FeedbackActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityFeedbackBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyAddressActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyAddressActivity.java new file mode 100644 index 0000000..38ed019 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyAddressActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityMyAddressBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class MyAddressActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityMyAddressBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyBankCardActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyBankCardActivity.java new file mode 100644 index 0000000..54e2cf6 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyBankCardActivity.java @@ -0,0 +1,34 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityBankCardBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class MyBankCardActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityBankCardBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyCouponActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyCouponActivity.java new file mode 100644 index 0000000..113d0e0 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyCouponActivity.java @@ -0,0 +1,34 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityMyCouponBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class MyCouponActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityMyCouponBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java index 931fb47..fc5a8df 100644 --- a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyFragment.java @@ -2,6 +2,8 @@ package com.tairui.industrial_operation.ui.my; import com.tairui.industrial_operation.base.BaseFragment; import com.tairui.industrial_operation.databinding.FragmentMyBinding; +import com.tairui.industrial_operation.ui.mall.ShopCartActivity; +import com.tairui.industrial_operation.ui.service.FenjianWuliuActivity; import com.tairui.industrial_operation.util.IntentUtil; import com.tairui.industrial_operation.util.SingleClickListener; @@ -22,7 +24,44 @@ public class MyFragment extends BaseFragment { IntentUtil.startActivity(mContext, SettingActivity.class); } }); + binding.layoutShopCart.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, ShopCartActivity.class); + } + }); + binding.layoutCoupon.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, MyCouponActivity.class); + } + }); + binding.layoutBankCard.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, MyBankCardActivity.class); + } + }); + binding.layoutGoodsCollect.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, MyGoodsCollectActivity.class); + } + }); + + binding.fun1.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, NonghuTianbaoActivity.class); + } + }); + binding.fun2.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, MyAddressActivity.class); + } + }); binding.fun3.setOnClickListener(new SingleClickListener() { @Override protected void onSingleClick(View v) { @@ -41,5 +80,29 @@ public class MyFragment extends BaseFragment { IntentUtil.startActivity(mContext, FenjianBaozhuangActivity.class); } }); + binding.fun6.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, FenjianWuliuActivity.class); + } + }); + binding.fun7.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, OnlineServiceActivity.class); + } + }); + binding.fun8.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, FeedbackActivity.class); + } + }); + binding.img1.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, MyOrderActivity.class); + } + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyGoodsCollectActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyGoodsCollectActivity.java new file mode 100644 index 0000000..27004cb --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyGoodsCollectActivity.java @@ -0,0 +1,34 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityGoodsCollectBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class MyGoodsCollectActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityGoodsCollectBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/MyOrderActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyOrderActivity.java new file mode 100644 index 0000000..dd4aa1f --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/MyOrderActivity.java @@ -0,0 +1,166 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.R; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityMyOrderBinding; +import com.tairui.industrial_operation.util.IntentUtil; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class MyOrderActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityMyOrderBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + binding.feedbackBtn.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + IntentUtil.startActivity(mContext, AfterSaleActivity.class); + } + }); + binding.tab1.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + binding.tab1Title.setTextColor(getResColor(R.color.color_txt_green)); + binding.tab1Divider.setVisibility(View.VISIBLE); + setGone(binding.img1, true); + + binding.tab2Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab2Divider.setVisibility(View.INVISIBLE); + setGone(binding.img2, false); + + binding.tab3Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab3Divider.setVisibility(View.INVISIBLE); + setGone(binding.img3, false); + + binding.tab4Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab4Divider.setVisibility(View.INVISIBLE); + setGone(binding.img4, false); + + binding.tab5Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab5Divider.setVisibility(View.INVISIBLE); + setGone(binding.img5, false); + } + }); + + binding.tab2.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + binding.tab1Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab1Divider.setVisibility(View.INVISIBLE); + setGone(binding.img1, false); + + binding.tab2Title.setTextColor(getResColor(R.color.color_txt_green)); + binding.tab2Divider.setVisibility(View.VISIBLE); + setGone(binding.img2, true); + + binding.tab3Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab3Divider.setVisibility(View.INVISIBLE); + setGone(binding.img3, false); + + binding.tab4Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab4Divider.setVisibility(View.INVISIBLE); + setGone(binding.img4, false); + + binding.tab5Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab5Divider.setVisibility(View.INVISIBLE); + setGone(binding.img5, false); + } + }); + + binding.tab3.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + binding.tab1Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab1Divider.setVisibility(View.INVISIBLE); + setGone(binding.img1, false); + + binding.tab2Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab2Divider.setVisibility(View.INVISIBLE); + setGone(binding.img2, false); + + binding.tab3Title.setTextColor(getResColor(R.color.color_txt_green)); + binding.tab3Divider.setVisibility(View.VISIBLE); + setGone(binding.img3, true); + + binding.tab4Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab4Divider.setVisibility(View.INVISIBLE); + setGone(binding.img4, false); + + binding.tab5Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab5Divider.setVisibility(View.INVISIBLE); + setGone(binding.img5, false); + } + }); + + binding.tab4.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + binding.tab1Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab1Divider.setVisibility(View.INVISIBLE); + setGone(binding.img1, false); + + binding.tab2Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab2Divider.setVisibility(View.INVISIBLE); + setGone(binding.img2, false); + + binding.tab3Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab3Divider.setVisibility(View.INVISIBLE); + setGone(binding.img3, false); + + binding.tab4Title.setTextColor(getResColor(R.color.color_txt_green)); + binding.tab4Divider.setVisibility(View.VISIBLE); + setGone(binding.img4, true); + + binding.tab5Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab5Divider.setVisibility(View.INVISIBLE); + setGone(binding.img5, false); + } + }); + + binding.tab5.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + binding.tab1Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab1Divider.setVisibility(View.INVISIBLE); + setGone(binding.img1, false); + + binding.tab2Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab2Divider.setVisibility(View.INVISIBLE); + setGone(binding.img2, false); + + binding.tab3Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab3Divider.setVisibility(View.INVISIBLE); + setGone(binding.img3, false); + + binding.tab4Title.setTextColor(getResColor(R.color.color_tv_content)); + binding.tab4Divider.setVisibility(View.INVISIBLE); + setGone(binding.img4, false); + + binding.tab5Title.setTextColor(getResColor(R.color.color_txt_green)); + binding.tab5Divider.setVisibility(View.VISIBLE); + setGone(binding.img5, true); + } + }); + + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/NonghuTianbaoActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/NonghuTianbaoActivity.java new file mode 100644 index 0000000..e63f6e2 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/NonghuTianbaoActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityNonghutianbaoBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class NonghuTianbaoActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityNonghutianbaoBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/ui/my/OnlineServiceActivity.java b/app/src/main/java/com/tairui/industrial_operation/ui/my/OnlineServiceActivity.java new file mode 100644 index 0000000..637bb11 --- /dev/null +++ b/app/src/main/java/com/tairui/industrial_operation/ui/my/OnlineServiceActivity.java @@ -0,0 +1,33 @@ +package com.tairui.industrial_operation.ui.my; + +import com.gyf.immersionbar.ImmersionBar; +import com.tairui.industrial_operation.base.BaseActivity; +import com.tairui.industrial_operation.databinding.ActivityOnlineServiceBinding; +import com.tairui.industrial_operation.util.SingleClickListener; + +import android.view.View; + +public class OnlineServiceActivity extends BaseActivity { + + @Override + protected Class getBindingClass() { + return ActivityOnlineServiceBinding.class; + } + + @Override + protected void initStatusBar() { + ImmersionBar.with(this).fitsSystemWindows(false).transparentStatusBar() + .statusBarDarkFont(true).init(); + } + + @Override + protected void onBindListener() { + binding.btnBack.setOnClickListener(new SingleClickListener() { + @Override + protected void onSingleClick(View v) { + finish(); + } + }); + } + +} diff --git a/app/src/main/java/com/tairui/industrial_operation/util/AppUtil.java b/app/src/main/java/com/tairui/industrial_operation/util/AppUtil.java index 3289df4..23f1a2e 100644 --- a/app/src/main/java/com/tairui/industrial_operation/util/AppUtil.java +++ b/app/src/main/java/com/tairui/industrial_operation/util/AppUtil.java @@ -6,12 +6,17 @@ import java.lang.reflect.Field; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import com.tairui.industrial_operation.BuildConfig; import com.tairui.industrial_operation.R; +import com.tairui.industrial_operation.entity.Api; import com.tairui.industrial_operation.ui.photoview.PhotoViewActivty; import com.tairui.industrial_operation.widget.loading.LoadingDialog; import android.content.Context; +import android.content.pm.PackageInfo; +import android.os.Build; import android.os.Bundle; +import android.text.TextUtils; import androidx.annotation.RawRes; public class AppUtil { @@ -66,4 +71,36 @@ public class AppUtil { return R.mipmap.ic_launcher; } } + + + /** + * 获取应用的 Version Code + */ + public static int getVersionCode(Context context) { + try { + PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); + return getVersionCodeFromPackageInfo(pInfo); + } catch (Exception e) { + return BuildConfig.VERSION_CODE; // 降级方案 + } + } + + @SuppressWarnings("deprecation") + private static int getVersionCodeFromPackageInfo(PackageInfo pInfo) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + return (int) pInfo.getLongVersionCode(); // API 28+ 使用 long + } else { + return pInfo.versionCode; // 传统方式 + } + } + + public static String getImageUrl(String url) { + if (TextUtils.isEmpty(url)) { + return null; + } else if (url.startsWith("http")) { + return url; + } else { + return Api.OSS_HOST.concat(url); + } + } } diff --git a/app/src/main/res/layout/activity_after_sale.xml b/app/src/main/res/layout/activity_after_sale.xml new file mode 100644 index 0000000..7b2bbb6 --- /dev/null +++ b/app/src/main/res/layout/activity_after_sale.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_bank_card.xml b/app/src/main/res/layout/activity_bank_card.xml new file mode 100644 index 0000000..1ce33f6 --- /dev/null +++ b/app/src/main/res/layout/activity_bank_card.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_baoxianfuwu.xml b/app/src/main/res/layout/activity_baoxianfuwu.xml index 6774f6d..e693aa3 100644 --- a/app/src/main/res/layout/activity_baoxianfuwu.xml +++ b/app/src/main/res/layout/activity_baoxianfuwu.xml @@ -101,6 +101,7 @@ android:layout_marginTop="12dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_daikuanshenqing.xml b/app/src/main/res/layout/activity_daikuanshenqing.xml new file mode 100644 index 0000000..63f9436 --- /dev/null +++ b/app/src/main/res/layout/activity_daikuanshenqing.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_daikuanshenqing_chenggong.xml b/app/src/main/res/layout/activity_daikuanshenqing_chenggong.xml new file mode 100644 index 0000000..d9f7c1b --- /dev/null +++ b/app/src/main/res/layout/activity_daikuanshenqing_chenggong.xml @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_danbaofuwu.xml b/app/src/main/res/layout/activity_danbaofuwu.xml index e972af0..ac43049 100644 --- a/app/src/main/res/layout/activity_danbaofuwu.xml +++ b/app/src/main/res/layout/activity_danbaofuwu.xml @@ -101,6 +101,7 @@ android:layout_marginTop="12dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_danbaofuwu_shenqing.xml b/app/src/main/res/layout/activity_danbaofuwu_shenqing.xml new file mode 100644 index 0000000..d19305b --- /dev/null +++ b/app/src/main/res/layout/activity_danbaofuwu_shenqing.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_feedback.xml b/app/src/main/res/layout/activity_feedback.xml new file mode 100644 index 0000000..0f8cb58 --- /dev/null +++ b/app/src/main/res/layout/activity_feedback.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_goods_collect.xml b/app/src/main/res/layout/activity_goods_collect.xml new file mode 100644 index 0000000..2c0091e --- /dev/null +++ b/app/src/main/res/layout/activity_goods_collect.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_address.xml b/app/src/main/res/layout/activity_my_address.xml new file mode 100644 index 0000000..61330e0 --- /dev/null +++ b/app/src/main/res/layout/activity_my_address.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_coupon.xml b/app/src/main/res/layout/activity_my_coupon.xml new file mode 100644 index 0000000..8522a2d --- /dev/null +++ b/app/src/main/res/layout/activity_my_coupon.xml @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_order.xml b/app/src/main/res/layout/activity_my_order.xml new file mode 100644 index 0000000..4d21bd5 --- /dev/null +++ b/app/src/main/res/layout/activity_my_order.xml @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_nonghutianbao.xml b/app/src/main/res/layout/activity_nonghutianbao.xml new file mode 100644 index 0000000..064026e --- /dev/null +++ b/app/src/main/res/layout/activity_nonghutianbao.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_nongji_device_detail.xml b/app/src/main/res/layout/activity_nongji_device_detail.xml new file mode 100644 index 0000000..903cd0b --- /dev/null +++ b/app/src/main/res/layout/activity_nongji_device_detail.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_nongji_device_goumai_zulin.xml b/app/src/main/res/layout/activity_nongji_device_goumai_zulin.xml new file mode 100644 index 0000000..45906ae --- /dev/null +++ b/app/src/main/res/layout/activity_nongji_device_goumai_zulin.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_online_service.xml b/app/src/main/res/layout/activity_online_service.xml new file mode 100644 index 0000000..cab0e6f --- /dev/null +++ b/app/src/main/res/layout/activity_online_service.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_renlianshibie.xml b/app/src/main/res/layout/activity_renlianshibie.xml new file mode 100644 index 0000000..a53c2d4 --- /dev/null +++ b/app/src/main/res/layout/activity_renlianshibie.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_suyuan_scan.xml b/app/src/main/res/layout/activity_suyuan_scan.xml new file mode 100644 index 0000000..a6d7e3d --- /dev/null +++ b/app/src/main/res/layout/activity_suyuan_scan.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_suyuan_scan_result.xml b/app/src/main/res/layout/activity_suyuan_scan_result.xml new file mode 100644 index 0000000..3d8d86a --- /dev/null +++ b/app/src/main/res/layout/activity_suyuan_scan_result.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_suyuan_search.xml b/app/src/main/res/layout/activity_suyuan_search.xml index 0dfe890..2a28101 100644 --- a/app/src/main/res/layout/activity_suyuan_search.xml +++ b/app/src/main/res/layout/activity_suyuan_search.xml @@ -109,6 +109,7 @@ android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_xindaichanpin.xml b/app/src/main/res/layout/activity_xindaichanpin.xml index 1128828..a1194ee 100644 --- a/app/src/main/res/layout/activity_xindaichanpin.xml +++ b/app/src/main/res/layout/activity_xindaichanpin.xml @@ -100,6 +100,7 @@ android:layout_marginTop="12dp">