浏览代码

去掉扫码验证

donggaosheng 3 周之前
父节点
当前提交
12f8c8e034

+ 8 - 8
app/src/main/java/xn/xxp/home/auth/ChoiceAuthActivity.java

@@ -100,14 +100,14 @@ public class ChoiceAuthActivity extends BaseSignActivity<ActivityAuthChoiceBindi
         });
 
         // 切换为扫码
-        binding.qrAuth.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (!(FragmentUtils.getTop(fragmentManager) instanceof QrAuthFragment)) {
-                    FragmentUtils.replace(fragmentManager, new QrAuthFragment(), R.id.container);
-                }
-            }
-        });
+//        binding.qrAuth.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                if (!(FragmentUtils.getTop(fragmentManager) instanceof QrAuthFragment)) {
+//                    FragmentUtils.replace(fragmentManager, new QrAuthFragment(), R.id.container);
+//                }
+//            }
+//        });
     }
 
     public void authSuccess(AuthType authType, UserVo user) {

+ 11 - 38
app/src/main/java/xn/xxp/main/MainActivity.kt

@@ -59,7 +59,6 @@ import xn.xxp.room.bean.NoticeSummary
 import xn.xxp.utils.QrTool
 import xn.xxp.utils.Tool
 import xn.xxp.widget.ITitleBar
-import xn.xxp.HomeActivity
 import xn.xxp.widget.NavViewCompat
 import xn.xxp.widget.WaringDialog
 import java.math.BigDecimal
@@ -124,10 +123,9 @@ class MainActivity :
 //    }
     private var authType: AuthType = AuthType.FACE
     override fun onCreate(savedInstanceState: Bundle?) {
-        android.util.Log.e("MainActivity", "=== onCreate start, intent authType=${intent.getSerializableExtra("authType")}")
-        super.onCreate(savedInstanceState) // 注意:super.onCreate 内部会调用 initData(),此时 authType 尚未从 intent 赋值
-        authType = (intent.getSerializableExtra("authType") as AuthType?) ?: AuthType.FACE
-        android.util.Log.e("MainActivity", "=== onCreate end, authType=$authType")
+        super.onCreate(savedInstanceState)
+//        mSerialPortHelper.bindService()
+        authType = (intent.getSerializableExtra("authType") as AuthType?)!!
         // 实验室文化图 > 文化图
         val message = mBannerHandler.obtainMessage(WHAT_WORKBENCH)
         mBannerHandler.sendMessageDelayed(message, BANNER_TIME_WORKBENCH)
@@ -425,44 +423,19 @@ class MainActivity :
     }
 
     lateinit var labConfig: LabConfig
-
     override fun initData() {
-        android.util.Log.e("MainActivity", "=== initData called, LabApp.userVo=${LabApp.userVo}")
-        // 【改动1】登录态兜底:进程被杀重建 / 后端502导致 userVo 丢失
-        val userVo = LabApp.userVo
-        if (userVo == null) {
-            showToast("登录信息已失效,请重新验证")
-            val intent = Intent(this, HomeActivity::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-            startActivity(intent)
-            finish()
-            return
-        }
-
-        // 【改动2】原来第一行,用已判空的 userVo
-        Tool.INSTANCE.openDoor(userVo.userId, authType)
-
-        val labConfigRaw = RoomTool.getInstance().labConfigDao().labConfig
-        android.util.Log.e("MainActivity", "=== labConfig from Room = $labConfigRaw")
-        labConfig = labConfigRaw
+        Tool.INSTANCE.openDoor(LabApp.userVo.userId,authType)
+        labConfig = RoomTool.getInstance().labConfigDao().labConfig
         val laboratoryVo = LabApp.laboratory
-        android.util.Log.e("MainActivity", "=== LabApp.laboratory = $laboratoryVo")
-        if (null == laboratoryVo) {
-            showToast("暂无实验室信息,请重新进入")
-            val intent = Intent(this, HomeActivity::class.java)
-            intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
-            startActivity(intent)
-            finish()
+        if (null == laboratoryVo || null == labConfig) {
+            showToast("暂无实验室信息,即将重新获取")
+            Tool.INSTANCE.reStartApp("暂无实验室信息,即将重新获取")
             return
         }
         binding.titleBar.setTitleInfoFromSp()
 
-        android.util.Log.e("MainActivity", "=== initLaboratoryInfo start")
         initLaboratoryInfo(laboratoryVo)
-        android.util.Log.e("MainActivity", "=== initLaboratoryInfo end")
-
         // 开门按钮显示控制
-        android.util.Log.e("MainActivity", "=== labConfig.isRelationGuard=${labConfig?.isRelationGuard}")
         if ("1" == labConfig.isRelationGuard) {
             binding.openDoor.visibility = View.VISIBLE
             val drawable =
@@ -474,9 +447,8 @@ class MainActivity :
                 ContextCompat.getDrawable(this, R.drawable.divider_transparent_main_right_v2)
             binding.rightContent.dividerDrawable = drawable
         }
-
-        // 【改动3】原来这里用的是 LabApp.userVo.pageType,改成已判空的 userVo
-        if ("1" == userVo.pageType) {
+        // 视频监控按钮显示控制
+        if ("1" == LabApp.userVo.pageType) {
             binding.monitorGroup.visibility = View.VISIBLE
         } else {
             binding.monitorGroup.visibility = View.GONE
@@ -490,6 +462,7 @@ class MainActivity :
         queryCheckMachineMsgList()
         queryNoticeMsgList()
     }
+
     private fun queryBanner() {
         val param = BannerImageReq().apply {
             imgCategory = "2"

+ 10 - 10
app/src/main/res/layout/activity_auth_choice.xml

@@ -113,16 +113,16 @@
                 android:textSize="13sp"
                 android:visibility="gone" />
 
-            <RadioButton
-                android:id="@+id/qrAuth"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:button="@null"
-                android:gravity="center"
-                android:text="扫码验证"
-                android:textColor="@color/textcolor_cbx_black"
-                android:textSize="13sp" />
+<!--            <RadioButton-->
+<!--                android:id="@+id/qrAuth"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1"-->
+<!--                android:button="@null"-->
+<!--                android:gravity="center"-->
+<!--                android:text="扫码验证"-->
+<!--                android:textColor="@color/textcolor_cbx_black"-->
+<!--                android:textSize="13sp" />-->
 
         </RadioGroup>
 

+ 10 - 10
app/src/main/res/layout/activity_auth_four_choice.xml

@@ -112,16 +112,16 @@
                 android:textSize="13sp"
                 android:visibility="gone" />
 
-            <RadioButton
-                android:id="@+id/qrAuth"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:button="@null"
-                android:gravity="center"
-                android:text="扫码验证"
-                android:textColor="@color/textcolor_cbx_black"
-                android:textSize="13sp" />
+<!--            <RadioButton-->
+<!--                android:id="@+id/qrAuth"-->
+<!--                android:layout_width="0dp"-->
+<!--                android:layout_height="match_parent"-->
+<!--                android:layout_weight="1"-->
+<!--                android:button="@null"-->
+<!--                android:gravity="center"-->
+<!--                android:text="扫码验证"-->
+<!--                android:textColor="@color/textcolor_cbx_black"-->
+<!--                android:textSize="13sp" />-->
 
         </RadioGroup>
 

+ 8 - 8
app/src/main/res/layout/activity_main.xml

@@ -78,14 +78,6 @@
                 android:src="@mipmap/icon_sy_km"
                 android:visibility="visible" />
 
-            <ImageView
-                android:id="@+id/companyImg"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@null"
-                android:scaleType="fitXY"
-                tools:src="@mipmap/img_sy_qywh" />
-
         </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -512,6 +504,14 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
+            <ImageView
+                android:id="@+id/companyImg"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:contentDescription="@null"
+                android:scaleType="fitXY"
+                tools:src="@mipmap/img_sy_qywh" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>