分机：解决activity退出崩溃问题，调整便民服务二维码位置及修改二维码数据不全问题，sip通话模式下增加sip文字显示，xcrash日志文件大小设置为64kb

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -4,6 +4,7 @@ import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCharacteristic
 import android.content.*
 import android.content.pm.PackageManager
+import android.graphics.Color
 import android.media.AudioManager
 import android.net.ConnectivityManager
 import android.net.Uri
@@ -218,6 +219,9 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
             } else {
                 startService(serviceIntent)
             }
+            view_title_layout_tv_sip.visibility = View.VISIBLE
+        } else {
+            view_title_layout_tv_sip.visibility = View.GONE
         }
 
         if (!Settings.System.canWrite(this)) {
@@ -827,7 +831,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         SoundPoolManager.getInstance().release()
 
         //关闭通知
-        if (singleDevice!!.getCharacteristic() != null) {
+        if (singleDevice?.getCharacteristic() != null) {
             BleManager.getInstance().stopNotify(
                     singleDevice!!.getDevice(),
                     singleDevice!!.getCharacteristic().getService().getUuid().toString(),
@@ -1471,7 +1475,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                 if (messageEvent.message is String) run {
                     val status = messageEvent.message as String
                     Log.d("sip", "sip regist status: " + status)
-                    updateStatus(status)
+                    //updateStatus(status)
                 }
             }
 
@@ -2097,12 +2101,15 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
     private fun updateTcpState() {
         if (Constant.TCP_CONNECTED) {
             view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_success)
-            view_title_layout_tv_point.setBackgroundResource(R.mipmap.sip_b)
+            //view_title_layout_tv_point.setBackgroundResource(R.mipmap.sip_b)
+            view_title_layout_tv_sip.setTextColor(Color.DKGRAY)
         } else {
-            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_fail)
-            view_title_layout_tv_point.setBackgroundResource(R.mipmap.sip_h)
+            view_title_layout_iv_tcp.setImageResource(R.mipmap.ic_tcp_nor)
+            //view_title_layout_tv_point.setBackgroundResource(R.mipmap.sip_h)
+            view_title_layout_tv_sip.setTextColor(Color.RED)
         }
     }
+
     private fun updateLeftBtState(state: String) {
         menu_home.setBackgroundResource(R.drawable.shape_main_bt_bg)
         menu_home.setTextColor(getResources().getColor(R.color.white))

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -60,22 +60,6 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
         val layoutManager = GridLayoutManager(getActivity(), 3)
         rv_main_view.setLayoutManager(layoutManager)
         updateInfo()
-
-        //便民服务二维码
-        Thread {
-            val builder = StringBuilder()
-            builder.append(QR_CODE_URL2)
-            builder.append("&no=")
-            builder.append(Constant.PART_UNION_ID)
-            builder.append("&page=shopping")
-            builder.append("&addr=")
-            builder.append(Constant.PART_NAME)
-            builder.append(Constant.BED_NAME)
-            val code = EcodeHelper().createQRImage(builder.toString(), 180, null)
-            activity.runOnUiThread {
-                image_qr_code?.setImageBitmap(code)
-            }
-        }.start()
     }
 
     override fun bindEvent() {
@@ -100,8 +84,23 @@ class  MainFragment: BaseFragment<BedMainFragmentPresenter, MainViewLayoutBindin
     }
 
     override fun showCustomInfo(customInfo: CustomerInfoVO) {
-        //隐藏空页面并展示入住信息
+        //便民服务二维码
+        Thread {
+            val builder = StringBuilder()
+            builder.append(QR_CODE_URL2)
+            builder.append("&no=")
+            builder.append(Constant.PART_UNION_ID)
+            builder.append("&page=shopping")
+            builder.append("&addr=")
+            builder.append(Constant.PART_NAME)
+            builder.append(Constant.BED_NAME)
+            val code = EcodeHelper().createQRImage(builder.toString(), 180, null)
+            activity.runOnUiThread {
+                image_qr_code?.setImageBitmap(code)
+            }
+        }.start()
 
+        //隐藏空页面并展示入住信息
         Constant.CUSTOM_INFO = Gson().toJson(customInfo)
         //显示入住信息
         tv_bed_name.text = customInfo.named

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/helper/XCrashUtils.java

@@ -130,7 +130,7 @@ public class XCrashUtils {
                 .setAnrLogCountMax(10)
                 .setAnrCallback(anrCallback)
                 .setPlaceholderCountMax(3)
-                .setPlaceholderSizeKb(512)
+                .setPlaceholderSizeKb(64)
                 .setLogDir(application.getExternalFilesDir("xcrash").toString())
                 .setLogFileMaintainDelayMs(5000));
     }

android_bed/src/main/res/layout/callingbed_activation.xml

@@ -65,8 +65,7 @@
                 <ImageView
                     android:id="@+id/activation_qr_code"
                     android:layout_width="@dimen/d200"
-                    android:layout_height="@dimen/d200"
-                    android:layout_marginTop="@dimen/d10" />
+                    android:layout_height="@dimen/d200" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -99,7 +98,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d15">
+                    android:layout_marginTop="@dimen/d10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -124,7 +123,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d15">
+                    android:layout_marginTop="@dimen/d10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -149,7 +148,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_marginLeft="@dimen/d116"
-                    android:layout_marginTop="@dimen/d15">
+                    android:layout_marginTop="@dimen/d10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -174,7 +173,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_marginLeft="@dimen/d108"
-                    android:layout_marginTop="@dimen/d15">
+                    android:layout_marginTop="@dimen/d10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -199,7 +198,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_marginLeft="@dimen/d100"
-                    android:layout_marginTop="@dimen/d15">
+                    android:layout_marginTop="@dimen/d10">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -222,7 +221,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/d48"
-                    android:layout_marginTop="@dimen/d5"
+                    android:layout_marginTop="@dimen/d10"
                     android:gravity="center_vertical"
                     android:layout_marginLeft="@dimen/d19"
                     android:layout_marginRight="@dimen/d19"

android_bed/src/main/res/layout/main_view_layout.xml

@@ -46,7 +46,8 @@
                     android:layout_height="wrap_content"
                     android:text="床位号"
                     android:textColor="@color/txt_number2"
-                    android:textSize="18sp"/>
+                    android:textSize="18sp"
+                    android:visibility="gone"/>
             </LinearLayout>
 
             <com.wdkl.ncs.android.lib.widget.MarqueeTextView
@@ -125,10 +126,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="@dimen/d50"
-                android:layout_marginRight="@dimen/d10"
-                android:gravity="center"
-               >
+                android:layout_marginTop="@dimen/d24"
+                android:layout_marginRight="@dimen/d6"
+                android:gravity="center">
 
                 <ImageView
                     android:id="@+id/image_qr_code"
@@ -138,7 +138,7 @@
                 <TextView
                     android:layout_width="20dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
+                    android:layout_marginLeft="6dp"
                     android:gravity="center"
                     android:text="便民服务"
                     android:textSize="20sp" />

android_bed/src/main/res/layout/view_title_layout.xml

@@ -102,7 +102,7 @@
                 android:layout_width="@dimen/d18"
                 android:layout_height="@dimen/d18"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="@dimen/d23"
+                android:layout_marginLeft="@dimen/d20"
                 android:layout_marginRight="4dp"
                 android:background="@mipmap/shijian" />
             <!--时间-->
@@ -112,7 +112,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/d5"
-                android:layout_marginRight="@dimen/d30"
+                android:layout_marginRight="@dimen/d20"
                 android:format12Hour="HH:mm"
                 android:format24Hour="HH:mm"
                 android:text="16:08"
@@ -121,14 +121,25 @@
 
             <!--SIP状态图标-->
             <TextView
+                android:id="@+id/view_title_layout_tv_sip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="4dp"
+                android:layout_marginRight="4dp"
+                android:text="SIP"
+                android:textColor="#FF444444"
+                android:visibility="gone"/>
+
+            <TextView
                 android:id="@+id/view_title_layout_tv_point"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_centerVertical="true"
+                android:layout_gravity="center_vertical"
                 android:layout_marginLeft="4dp"
                 android:layout_marginRight="4dp"
                 android:background="@mipmap/sip_b"
-                android:visibility="gone" />
+                android:visibility="gone"/>
 
             <ImageView
                 android:id="@+id/view_title_layout_iv_bt"

welcome/src/main/code/com/wdkl/ncs/android/component/welcome/activity/WelcomeActivity.kt

@@ -96,7 +96,6 @@ class WelcomeActivity :BaseActivity<WelcomePresenter, ActivityWelcomeBinding>(),
      */
     override fun toHome() {
         AppTool.Time.delay(200) {
-//            push("/callingdoor/main")
             if ( BuildConfig.isandroid_bed.toBoolean()){
                 push("/callingbed/activation")
             }else if(BuildConfig.iscallingdoor.toBoolean()){

welcome/src/main/res/layout-land/activity_welcome.xml

@@ -5,18 +5,7 @@
         android:id="@+id/activity_main_inference"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/weicome"
-        >
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="Loading..."
-            android:textSize="32sp"
-            android:visibility="gone"
-            android:textColor="@color/black"/>
+        android:background="@mipmap/weicome">
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!--未注册显示界面-->
-
 </layout>

welcome/src/main/res/layout/activity_welcome.xml

@@ -5,18 +5,7 @@
         android:id="@+id/activity_main_inference"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@mipmap/weicome_p"
-        >
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="Loading..."
-            android:textSize="32sp"
-            android:visibility="gone"
-            android:textColor="@color/black"/>
+        android:background="@mipmap/weicome_p">
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <!--未注册显示界面-->
-
 </layout>