diff --git a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt index 7cf65b9..c698be4 100644 --- a/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt +++ b/app/src/main/java/com/lukouguoji/aerologic/ui/fragment/HomeFragment.kt @@ -24,10 +24,9 @@ import com.lukouguoji.aerologic.page.car.list.CarListActivity import com.lukouguoji.aerologic.page.flight.query.list.FlightQueryListActivity import com.lukouguoji.aerologic.page.gnj.jiaojie.GnjHandoverListActivity import com.lukouguoji.aerologic.page.gnj.manifest.list.GnjManifestListActivity -import com.lukouguoji.aerologic.page.gnj.stash.list.GnjStashListActivity import com.lukouguoji.aerologic.page.gnj.move.stash.list.GnjMoveStashListActivity -import com.lukouguoji.aerologic.page.gnj.query.details.GnjQueryDetailsActivity import com.lukouguoji.aerologic.page.gnj.query.list.GnjQueryListActivity +import com.lukouguoji.aerologic.page.gnj.stash.list.GnjStashListActivity import com.lukouguoji.aerologic.page.gnj.unload.list.GnjUnloadListActivity import com.lukouguoji.aerologic.page.log.list.LogListActivity import com.lukouguoji.aerologic.page.message.list.MessageListActivity @@ -40,7 +39,6 @@ import com.lukouguoji.gnc.page.distribution.home.GncDistributionHomeActivity import com.lukouguoji.gnc.page.fubang.list.GncFuBangListActivity import com.lukouguoji.gnc.page.shouyun.unlist.GncShouYunUnListActivity import com.lukouguoji.module_base.MyApplication -import com.lukouguoji.module_base.adapter.loadImage import com.lukouguoji.module_base.common.Constant import com.lukouguoji.module_base.db.perference.SharedPreferenceUtil import com.lukouguoji.module_base.router.ARouterConstants @@ -179,7 +177,8 @@ class HomeFragment : Fragment() { // 跳过特殊菜单(航班查询、货物查询) if (Constant.AuthName.Flight == leftMenuTemp.id || - Constant.AuthName.CargoStatus == leftMenuTemp.id) { + Constant.AuthName.CargoStatus == leftMenuTemp.id + ) { return } @@ -424,9 +423,10 @@ class HomeFragment : Fragment() { ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_ARRIVE) .navigation() } - // 仓库 + // 出港仓库 Constant.AuthName.GjcIntExpStorageUse -> { - ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_EXP_STORAGE_USE) + ARouter.getInstance() + .build(ARouterConstants.ACTIVITY_URL_INT_EXP_STORAGE_USE) .navigation() } /** @@ -439,7 +439,8 @@ class HomeFragment : Fragment() { } // 原始舱单 Constant.AuthName.IntArrAirManifest -> { - ARouter.getInstance().build(ARouterConstants.ACTIVITY_URL_INT_ARR_AIR_MANIFEST) + ARouter.getInstance() + .build(ARouterConstants.ACTIVITY_URL_INT_ARR_AIR_MANIFEST) .navigation() } // 进港舱单 @@ -561,7 +562,7 @@ class HomeFragment : Fragment() { inner class RightMenu(val id: String, val img: Int, val text: String) private fun getRightMenu4Id(id: String): List { - var list = arrayListOf() + val list = arrayListOf() when (id) { Constant.AuthName.DomExp -> { list.add( @@ -578,7 +579,6 @@ class HomeFragment : Fragment() { "出港复磅" ) ) -// list.add(RightMenu(Constant.AuthName.AppDomExpTransport, R.mipmap.gnc_zhuanyun, "转运确认")) list.add( RightMenu( Constant.AuthName.AppDomExpAssemble, @@ -653,18 +653,10 @@ class HomeFragment : Fragment() { } Constant.AuthName.IntExp -> { -// list.add( -// RightMenu( -// Constant.AuthName.GjcAppDomExpCheckin, -// R.mipmap.gjc_shou_yun_icon, -// "出港收运" -// ) -// ) - list.add( RightMenu( Constant.AuthName.GjcInspectionActivity, - R.mipmap.gnc_cha, + com.lukouguoji.module_base.R.drawable.img_gjc_shouyunjiancha, "收运检查" ) ) @@ -680,7 +672,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcFuBangActivity, - R.mipmap.gjc_fu_bang_icon, + com.lukouguoji.module_base.R.drawable.img_gjc_banxiangguobang, "板箱过磅" ) ) @@ -712,7 +704,7 @@ class HomeFragment : Fragment() { list.add( RightMenu( Constant.AuthName.GjcAssembleAllocateActivity, - com.lukouguoji.module_base.R.drawable.img_gnc_fenpei, + com.lukouguoji.module_base.R.drawable.img_gjc_zuzhuangfenpei, "组装分配" ) ) diff --git a/module_base/src/main/res/drawable-xhdpi/img_gjc_banxiangguobang.png b/module_base/src/main/res/drawable-xhdpi/img_gjc_banxiangguobang.png new file mode 100644 index 0000000..921bb33 Binary files /dev/null and b/module_base/src/main/res/drawable-xhdpi/img_gjc_banxiangguobang.png differ diff --git a/module_base/src/main/res/drawable-xhdpi/img_gjc_shouyunjiancha.png b/module_base/src/main/res/drawable-xhdpi/img_gjc_shouyunjiancha.png new file mode 100644 index 0000000..bda2b67 Binary files /dev/null and b/module_base/src/main/res/drawable-xhdpi/img_gjc_shouyunjiancha.png differ diff --git a/module_base/src/main/res/drawable-xhdpi/img_gjc_zuzhuangfenpei.png b/module_base/src/main/res/drawable-xhdpi/img_gjc_zuzhuangfenpei.png new file mode 100644 index 0000000..32fd1b6 Binary files /dev/null and b/module_base/src/main/res/drawable-xhdpi/img_gjc_zuzhuangfenpei.png differ