Activity跳转回调测试

app/src/main/java/jx/cn/escort/adapter/IndexRecycleAdapter.kt

@@ -7,6 +7,7 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.view.*
 import android.view.ViewGroup.MarginLayoutParams
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.graphics.drawable.toBitmap
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.divider.MaterialDivider
@@ -14,6 +15,7 @@ import com.xuexiang.xui.XUI
 import com.xuexiang.xui.utils.DensityUtils
 import com.xuexiang.xui.utils.ResUtils
 import com.xuexiang.xui.widget.alpha.XUIAlphaTextView
+import com.xuexiang.xui.widget.textview.supertextview.SuperTextView
 import jx.cn.escort.R
 import jx.cn.escort.beans.TaskData
 import jx.cn.escort.ui.widget.TaskCardView
@@ -56,21 +58,19 @@ open class IndexRecycleAdapter(): RecyclerView.Adapter<IndexRecycleAdapter.Index
     override fun onBindViewHolder(holder: IndexRecycleViewHolder, position: Int) {
 
 
-            val  cardView= holder.item?.findViewById<TaskCardView>(jx.cn.escort.R.id.card_content)
+            val  cardContentWrap= holder.item?.findViewById<ConstraintLayout>(jx.cn.escort.R.id.card_content_wrap)
             val divideTop=  holder.item?.findViewById<MaterialDivider>(jx.cn.escort.R.id.card_divide_top)
 
             val contextThemeWrapper: ContextThemeWrapper = ContextThemeWrapper(context, jx.cn.escort.R.style.Cus_Theme_AppCompat)
-            var     leftText = XUIAlphaTextView(contextThemeWrapper)
-
-
+            var     cardHead = SuperTextView(contextThemeWrapper)
             var leftP=ViewGroup.LayoutParams(DensityUtils.px2dp(context,300f),DensityUtils.px2dp(context,120f))  as ViewGroup.LayoutParams
-            leftText.layoutParams=leftP
+            cardHead.layoutParams=leftP
+            val layoutPosition = holder.layoutPosition
+            cardHead.setLeftString(mData.get(layoutPosition).name)
+            cardHead.setLeftTextColor(Color.BLACK)
+
 
 
-            val layoutPosition = holder.layoutPosition
-            leftText.text=mData.get(layoutPosition).name
-            leftText.setTextColor(Color.BLACK)
-            leftText.setSingleLine()
             var  mLeftImageResource = ResUtils.getDrawable(context, R.drawable.ic_task_title);
             val widthScale = 0.2f
             val heightScale = 0.2f
@@ -81,16 +81,11 @@ open class IndexRecycleAdapter(): RecyclerView.Adapter<IndexRecycleAdapter.Index
             val scaledBitmap: Bitmap = Bitmap.createBitmap(mLeftImageResource.bounds.right, mLeftImageResource.bounds.bottom, Bitmap.Config.ARGB_8888)
             val canvas = Canvas(scaledBitmap)
             mLeftImageResource.draw(canvas)
+            cardHead.setLeftIcon(mLeftImageResource)
+            cardHead.setBackgroundResource(R.color.MainGreen_Light)
+            cardContentWrap?.addView(cardHead)
 
 
-            leftText.setCompoundDrawables(mLeftImageResource, null, null, null);
-            leftText.setGravity(Gravity.CENTER_VERTICAL);
-            leftText.setPadding(8, 0, 8, 0);
-            leftText.setTypeface(XUI.getDefaultTypeface());
-            cardView?.setLeftText(leftText)
-            cardView?.setDivideTop(divideTop)
-            cardView?.addView(leftText)
-
 
     }
 

app/src/main/java/jx/cn/escort/ui/activity/ActionTaskHandActivity.kt

@@ -6,6 +6,7 @@ import android.Manifest
 import android.Manifest.permission.*
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.PackageManager
 import android.content.pm.PackageManager.PERMISSION_GRANTED
@@ -16,10 +17,8 @@ import android.os.Bundle
 import android.os.SystemClock
 import android.util.Log
 import android.util.Size
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
+import android.view.*
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.camera.core.*
 import androidx.camera.core.ImageAnalysis.OUTPUT_IMAGE_FORMAT_YUV_420_888
@@ -35,6 +34,7 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationBarView
 import com.xuexiang.xui.XUI
 import com.xuexiang.xui.widget.actionbar.TitleBar
 import com.xuexiang.xui.widget.dialog.materialdialog.DialogAction
@@ -93,9 +93,21 @@ class ActionTaskHandActivity : AppCompatActivity(), KoinComponent {
         bottomNav.isItemActiveIndicatorEnabled=false
         bottomNav.itemBackgroundResource = R.drawable.nav_item_bg
 
+
         switchFragment(TaskFaceFragment(this@ActionTaskHandActivity))
 
+        bottomNav.setOnItemSelectedListener(object: NavigationBarView.OnItemSelectedListener {
+            override fun onNavigationItemSelected(p0: MenuItem): Boolean {
+                val launch =
+                    registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {}
+                launch.launch(Intent(this@ActionTaskHandActivity,MainActivity::class.java))
+                //ActivityUtils.startActivity(this@ActionTaskHandActivity,MainActivity::class.java)
+                return true
+            }
+
+
 
+        })
 
 
     }

app/src/main/java/jx/cn/escort/ui/activity/EscortTaskHandActivity.kt

@@ -4,12 +4,22 @@ package jx.cn.escort.ui.activity
 
 import android.content.Context
 import android.content.SharedPreferences
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.os.Bundle
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentTransaction
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationBarView
 import com.xuexiang.xui.XUI
+import jx.cn.escort.R
 import jx.cn.escort.databinding.ActivityActionTaskHandleBinding
 import jx.cn.escort.databinding.ActivityEscortTaskHandleBinding
 import jx.cn.escort.extension.ExtensionBinding.Companion.binding
+import jx.cn.escort.ui.fragment.NetConfirmFragment
+import jx.cn.escort.utils.ActivityUtils
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 
@@ -30,9 +40,34 @@ class EscortTaskHandActivity : AppCompatActivity(), KoinComponent {
         setContentView(mBinding.root)
 
 
+        var bottomNav= findViewById<BottomNavigationView>(R.id.bottom_nav)
+        var ckColor= Color.parseColor("#8ad1d2")
+        var color= Color.parseColor("#5e5656")
+        // 设置图标颜色
+        val colorStateList = ColorStateList(
+            arrayOf(
+                intArrayOf(android.R.attr.state_checked),
+                intArrayOf(-android.R.attr.state_checked)
+            ),
+            intArrayOf(ckColor,color) // 这里设置为你想要的颜色
+        )
+        bottomNav.itemIconTintList = colorStateList
+        // 设置文字颜色
+        bottomNav.itemTextColor = colorStateList
+        bottomNav.isItemActiveIndicatorEnabled=false
+        bottomNav.itemBackgroundResource = R.drawable.nav_item_bg
 
+        switchFragment(NetConfirmFragment(this@EscortTaskHandActivity))
 
+        bottomNav.setOnItemSelectedListener(object: NavigationBarView.OnItemSelectedListener {
+            override fun onNavigationItemSelected(p0: MenuItem): Boolean {
+                ActivityUtils.startActivity(this@EscortTaskHandActivity,MainActivity::class.java)
+                return true
+            }
 
+
+
+        })
     }
 
 
@@ -43,6 +78,12 @@ class EscortTaskHandActivity : AppCompatActivity(), KoinComponent {
     }
 
 
+    fun switchFragment(fragment: Fragment){
+        val fm=supportFragmentManager
+        val  transaction: FragmentTransaction =fm.beginTransaction()
+        transaction.replace(R.id.task_handle_wrap,fragment)
+        transaction.commitAllowingStateLoss()
+    }
 
 
 }

app/src/main/java/jx/cn/escort/ui/fragment/NetConfirmFragment.kt

@@ -0,0 +1,54 @@
+package jx.cn.escort.ui.fragment
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.xuexiang.xui.widget.actionbar.TitleBar
+import jx.cn.escort.R
+import jx.cn.escort.R.layout
+import jx.cn.escort.ui.activity.ActionTaskHandActivity
+import jx.cn.escort.ui.activity.EscortTaskHandActivity
+import jx.cn.escort.ui.activity.MainActivity
+import jx.cn.escort.utils.ActivityUtils
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+
+class NetConfirmFragment (context: Context): Fragment(), KoinComponent {
+
+    private var context: Context
+    private val mContext: Context   by  inject()
+    init {
+        this.context=context
+    }
+
+
+    private val defaultSharedPreferences: SharedPreferences = androidx.preference.PreferenceManager.getDefaultSharedPreferences(mContext)
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val netConfirmFragment:View=inflater.inflate(layout.fragment_net_confirm,container,false)
+        val escortTaskHandActivity = context as EscortTaskHandActivity
+        var taskHandleTitle = escortTaskHandActivity.findViewById<TitleBar>(R.id.task_handle_title)
+        taskHandleTitle.setTitle("网点交接")
+        taskHandleTitle.setLeftClickListener(object:View.OnClickListener{
+            override fun onClick(v: View?) {
+                ActivityUtils.startActivity(context, MainActivity::class.java)
+            }
+        })
+
+        return netConfirmFragment
+    }
+
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+
+
+
+}

app/src/main/java/jx/cn/escort/utils/ActivityUtils.kt

@@ -32,6 +32,8 @@ import android.content.Intent
              startActivity(context,cls,null)
          }
 
+
+
      }
 
 

app/src/main/res/layout/fragment_index.xml

@@ -19,13 +19,13 @@
                 <androidx.cardview.widget.CardView
 
                         android:id="@+id/notification_layout"
-                        android:layout_width="match_parent" android:layout_height="245dp"
+                        android:layout_width="match_parent" android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintBottom_toTopOf="@id/statistics_layout"
                         android:layout_marginBottom="6dp"
-                        app:layout_constraintHorizontal_bias="0.0">
+                >
                         <com.xuexiang.xui.widget.textview.MarqueeTextView
                                 android:id="@+id/tv_marquee"
                                 android:layout_width="match_parent"

app/src/main/res/layout/fragment_line_confirm.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
+              android:layout_height="match_parent">
 <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#f5f5f5"
@@ -131,4 +132,5 @@
 
 
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>

app/src/main/res/layout/fragment_net_confirm.xml

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="#f5f5f5"
+>
+<androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#f5f5f5"
+        android:paddingHorizontal="8dp"
+>
+
+
+    <androidx.cardview.widget.CardView
+            android:layout_width="match_parent" android:layout_height="wrap_content"
+            app:contentPadding="20dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="10dp"
+            android:id="@+id/top_net_member"
+    >
+
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+        >
+
+
+            <com.xuexiang.xui.widget.imageview.RadiusImageView
+                    android:id="@+id/top_profile_image"
+                    android:layout_width="90dp"
+                    android:layout_height="80dp"
+                    app:riv_border_color="@color/xui_config_color_gray_6"
+                    app:riv_border_width="0.5pt"
+                    app:riv_is_circle="false"
+                    app:riv_selected_border_color="@color/xui_config_color_gray_4"
+                    app:riv_selected_border_width="1px"
+                    app:riv_selected_mask_color="@color/xui_config_color_gray_8"
+                    app:riv_corner_radius="20dp"
+                    android:background="@drawable/ic_mine_profile"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/top_profile_title"
+                    app:layout_constraintBaseline_toTopOf="parent"
+                    tools:layout_editor_absoluteY="0dp"/>
+            <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                    android:id="@+id/top_profile_title"
+                    android:layout_width="80dp"
+                    android:layout_height="80dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/top_profile_image"
+                    app:sCenterBottomTextString="押解员"
+                    app:sCenterTextString="张三"
+                    app:layout_constraintBaseline_toTopOf="parent"
+                    app:sCenterTextIsBold="true"
+                    app:sCenterTextSize="26sp"
+            />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+
+
+    <jx.cn.escort.ui.widget.TaskCardView
+
+            app:layout_constraintTop_toBottomOf="@+id/top_net_member"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/card_content"
+            android:layout_marginTop="10dp"
+            android:layout_marginVertical="8dp"
+            app:contentPadding="2dp"
+            app:cardBackgroundColor="@color/MainGreen.Light"
+            app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+        >
+
+                    <com.xuexiang.xui.widget.textview.autofit.AutoFitLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintBottom_toTopOf="@id/line_card_divide"
+                            android:id="@+id/line_card_head"
+                    >
+                        <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                                            android:layout_width="match_parent"
+                                            android:layout_height="32dp"
+                                            app:sLeftTextString="一号线"
+                                            app:sLeftTextSize="20sp"
+                                            app:sRightTextSize="20sp"
+                                            app:sBackgroundDrawableRes="@color/MainGreen.Light"/>
+                    </com.xuexiang.xui.widget.textview.autofit.AutoFitLayout>
+        <com.google.android.material.divider.MaterialDivider
+                android:id="@+id/line_card_divide"
+                app:dividerThickness="1pt"
+                app:dividerColor="#b5c6c6"
+                app:dividerInsetStart="2dp"
+                app:dividerInsetEnd="2dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/line_card_head"
+                android:theme="@style/App.Material"
+
+        />
+
+
+
+
+        <com.xuexiang.xui.widget.textview.autofit.AutoFitLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/line_card_content"
+                app:layout_constraintTop_toBottomOf="@id/line_card_divide"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginTop="10dp"
+                android:paddingStart="20dp"
+        >
+
+            <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    app:sLeftTextString="任务编号:"
+                    app:sLeftTextIsBold="true"
+                    app:sLeftTextSize="15sp"
+                    app:sRightTextSize="15sp"
+                    app:sBackgroundDrawableRes="@color/MainGreen.Light"
+            />
+            <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    app:sLeftTextString="任务类型:"
+                    app:sLeftTextIsBold="true"
+                    app:sLeftTextSize="15sp"
+                    app:sRightTextSize="15sp"
+                    android:layout_marginTop="40dp"
+                    app:sBackgroundDrawableRes="@color/MainGreen.Light"
+            />
+            <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    app:sLeftTextString="状态:"
+                    app:sLeftTextIsBold="true"
+                    app:sLeftTextSize="15sp"
+                    app:sRightTextSize="15sp"
+                    android:layout_marginTop="80dp"
+                    app:sBackgroundDrawableRes="@color/MainGreen.Light"
+            />
+            <com.xuexiang.xui.widget.textview.supertextview.SuperTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="32dp"
+                    app:sLeftTextString="箱包:"
+                    app:sLeftTextIsBold="true"
+                    app:sLeftTextSize="15sp"
+                    app:sRightTextSize="15sp"
+                    android:layout_marginTop="120dp"
+                    app:sBackgroundDrawableRes="@color/MainGreen.Light"
+            />
+
+
+        </com.xuexiang.xui.widget.textview.autofit.AutoFitLayout>
+
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+    </jx.cn.escort.ui.widget.TaskCardView>
+
+
+
+
+    <com.xuexiang.xui.widget.button.roundbutton.RoundButton
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:rb_backgroundColor="@color/MainGreen"
+            app:layout_constraintTop_toBottomOf="@id/card_content"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            app:rb_radius="100dp"
+            android:text="扫描验证"
+            android:layout_marginTop="50dp"
+    />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+    </FrameLayout>

app/src/main/res/layout/fragment_tasks_card.xml

@@ -8,33 +8,40 @@
                 app:cardCornerRadius="12dp"
                 app:contentPadding="2dp"
                 android:layout_margin="5dp"
-                app:cardBackgroundColor="#cde2e2"
+                app:cardBackgroundColor="@color/MainGreen.Light"
         >
 
+        <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent"
+                                                           android:layout_height="match_parent"
+                                                           android:id="@+id/card_content_wrap"
+        >
+
+
+
+
+                <com.google.android.material.divider.MaterialDivider
+                        android:id="@+id/card_divide_top"
+                        app:dividerThickness="1pt"
+                        app:dividerColor="#b5c6c6"
+                        app:dividerInsetStart="2dp"
+                        app:dividerInsetEnd="2dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="45dp"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:theme="@style/App.Material"
+
+                />
+
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-<!--        <com.xuexiang.xui.widget.alpha.XUIAlphaTextView-->
-<!--                android:layout_width="300dp"-->
-<!--                android:layout_height="45dp"-->
-<!--                android:text="测试"-->
-<!--                app:drawableLeftCompat="@drawable/ic_task_title"-->
-<!--        >-->
 
-<!--        </com.xuexiang.xui.widget.alpha.XUIAlphaTextView>-->
 
-        <com.google.android.material.divider.MaterialDivider
-                android:id="@+id/card_divide_top"
-                app:dividerThickness="1pt"
-                app:dividerColor="#b5c6c6"
-                app:dividerInsetStart="2dp"
-                app:dividerInsetEnd="2dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="45dp"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:theme="@style/App.Material"
 
-        />
 
 
 

app/src/main/res/values/colors.xml

@@ -2,4 +2,6 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="MainGreen">#7FCDCE</color>
+    <color name="MainGreen.Light">#CDE2E2</color>
 </resources>