rk3288_ym型号21.5寸分机添加sdk，使用sdk api来支持app在线升级和其他优化

android_bed/build.gradle

@@ -167,6 +167,7 @@ String getDate() {
 }
 
 dependencies {
+    compileOnly files('compileOnlyLibs/XJSdk.jar')
 
     /**
      * 单元测试

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

@@ -6,6 +6,7 @@ import android.text.TextUtils
 import android.util.Log
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
+import com.konka.android.tv.XJManager
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.databinding.UpdateLayBinding
@@ -104,10 +105,13 @@ class AppUpdateActivity :BaseActivity<BedAppUpdatePresenter, UpdateLayBinding>()
                 } else if (BuildConfig.flag.equals(Constant.DEV_W_XHG_RK3288)) {
                     //新豪格rk3288 10寸分机
                     installApkForRk3288()
-                }  else if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
+                } else if (BuildConfig.flag.equals(Constant.DEV_W_A133)) {
                     //a133
                     startInstallA133()
-                }else {
+                } else if (BuildConfig.flag.equals(Constant.DEV_W_RK3288_YM)) {
+                   //rk3288_ym 21.5寸竖屏分机
+                    startInstallRk3288Ym()
+                } else {
                     AppUpdateHelper.installAPK(activity)
                 }
             }
@@ -165,6 +169,11 @@ class AppUpdateActivity :BaseActivity<BedAppUpdatePresenter, UpdateLayBinding>()
         }.start()
     }
 
+    fun startInstallRk3288Ym() {
+        val apkAbsolutePath = AppUpdateHelper.FILE_APK_PATH + "/" + AppUpdateHelper.FILE_APK_NAME
+        XJManager.getInstance().silentInstall(apkAbsolutePath, this)
+    }
+
     //云派8寸机app静默升级
     fun startInstallAppYunPai() {
         val apkAbsolutePath = AppUpdateHelper.FILE_APK_PATH + "/" + AppUpdateHelper.FILE_APK_NAME

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

@@ -472,6 +472,9 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
             Constant.DEVICE_STATUS = deviceInfo.status
         }
 
+        //隐藏虚拟导航栏
+        HardWareFactory.getHardTools().startbar(true)
+
         if (BuildConfig.device_type.equals("1")) {
             val intent = Intent()
             intent.setClass(activity, CallingbedMomActivity::class.java)

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

@@ -33,6 +33,7 @@ import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
 import com.jni.JniClient
+import com.konka.android.tv.XJManager
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.agreement.CallingbedAgreement
@@ -369,7 +370,9 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
 
         if ("rk3128".equals(Build.MODEL)) {
             checkLaunch()
-        } else {
+        } else if ("YUNPAI_H6".equals(Build.MODEL)
+            || BuildConfig.flag.equals(Constant.DEV_W_RK3288_YM)
+            || BuildConfig.flag.equals(Constant.DEV_W_YLD)) {
             startYunpaiPlugin()
         }
         SpeechUtil.getInstance().init(applicationContext)
@@ -1890,9 +1893,6 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                             }
                             try {
                                 HardWareFactory.getHardTools().setTime(this, time, timeZone)
-//                                val intent = Intent("android.intent.action.SET_TIME")
-//                                intent.putExtra("time", time)
-//                                sendBroadcast(intent)
                                 Log.d("setTime", "set sys time1: $time, $timeZone")
                             } catch (e: Exception) {
                                 //"20211213:092314"
@@ -3322,11 +3322,16 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
                         inputStream.close()
                         fos.close()
 
-//                        AppUpdateHelper.rootSilenceInstall(filePath)
-                        val intent = Intent("install.apk.broadcast")
-                        intent.putExtra("path", filePath)  //要静默安装的apk路径
-                        intent.putExtra("pkgname", "com.wdkl.app.ncs.callingbed")  //安装完成后是否启动
-                        sendBroadcast(intent)
+                        if (BuildConfig.flag.equals(Constant.DEV_W_RK3288_YM)) {
+                            XJManager.getInstance().silentInstall(filePath, activity)
+                        } else if (BuildConfig.flag.equals(Constant.DEV_W_YLD)) {
+                            AppUpdateHelper.rootSilenceInstall(filePath)
+                        } else {
+                            val intent = Intent("install.apk.broadcast")
+                            intent.putExtra("path", filePath)  //要静默安装的apk路径
+                            intent.putExtra("pkgname", "com.wdkl.app.ncs.callingbed")  //安装完成后是否启动
+                            sendBroadcast(intent)
+                        }
                         runOnUiThread {
                             showMessage(R.string.plugin_update_tips)
                         }

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

@@ -298,7 +298,7 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
         settings_main_14_tx.text =  BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + "_" + Build.MODEL
         //发布日期
         settings_main_15_tx.text =  BuildConfig.BUILD_TIME
-//        activation_zcm.text=  Constant.DEVICE_REGISTER_ID
+        settings_register_id.text=  Constant.DEVICE_REGISTER_ID
 
         switch_bluetooth.isChecked = SettingConfig.getBluetoothGatewayOn(activity)
 

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/hardware/imp/RK3288YMHardTools.java

@@ -8,6 +8,7 @@ import android.content.pm.PackageManager;
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.konka.android.tv.XJManager;
 import com.wdkl.app.ncs.callingbed.activity.AppUpdateActivity;
 import com.wdkl.app.ncs.callingbed.activity.CallingbedActivationActivity;
 import com.wdkl.app.ncs.callingbed.hardware.HardTools;
@@ -16,6 +17,8 @@ import com.wdkl.app.ncs.callingbed.helper.NetHelper;
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.common.Constant;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 public class RK3288YMHardTools extends HardTools {
@@ -45,6 +48,17 @@ public class RK3288YMHardTools extends HardTools {
     }
     @Override
     public void setTime(Context context, long timeMills, String timeZone) {
+        if (timeMills != 0) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date(timeMills));
+            int year = calendar.get(Calendar.YEAR);
+            int month = calendar.get(Calendar.MONTH);
+            int day = calendar.get(Calendar.DAY_OF_MONTH);
+            int hour = calendar.get(Calendar.HOUR_OF_DAY);
+            int minute = calendar.get(Calendar.MINUTE);
+
+            XJManager.getInstance().setTime(BaseApplication.appContext, year, month, day, hour, minute);
+        }
         super.setTime(context, timeMills, timeZone);
     }
     @Override
@@ -66,10 +80,7 @@ public class RK3288YMHardTools extends HardTools {
 
     @Override
     public void startbar(Boolean is) {
-        /*Intent intent = new Intent();
-        intent.setAction("com.konka.action.NAVI_BAR_VISIBLE_CHANGE");
-        intent.putExtra("nav", is);
-        BaseApplication.appContext.sendBroadcast(intent);*/
+        XJManager.getInstance().setStatusBarHide(BaseApplication.appContext, is);
 
         super.startbar(is);
     }

android_bed/src/main/res/layout-land/callingbed_setting_main.xml

@@ -683,8 +683,14 @@
                         <ImageView
                             android:id="@+id/setting_qr_code"
                             android:layout_width="200dp"
-                            android:layout_height="200dp"
-                            android:layout_marginTop="@dimen/d14" />
+                            android:layout_height="200dp"/>
+
+                        <TextView
+                            android:id="@+id/settings_register_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/main_color"
+                            android:textSize="@dimen/font_size_16" />
                     </LinearLayout>
 
                     <LinearLayout

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

@@ -678,8 +678,14 @@
                         <ImageView
                             android:id="@+id/setting_qr_code"
                             android:layout_width="200dp"
-                            android:layout_height="200dp"
-                            android:layout_marginTop="@dimen/d14" />
+                            android:layout_height="200dp" />
+
+                        <TextView
+                            android:id="@+id/settings_register_id"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textColor="@color/main_color"
+                            android:textSize="@dimen/font_size_16" />
                     </LinearLayout>
 
                     <LinearLayout