更换cbd的服务器

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

@@ -44,25 +44,9 @@ class AppUpdateActivity :BaseActivity<BedAppUpdatePresenter, UpdateLayBinding>()
     override fun init() {
         Constant.APP_UPDATING = true
         if (!TextUtils.isEmpty(Constant.APP_PATH)) {
-            val downloadPath = urlManager.base + Constant.APP_PATH
+            val downloadPath = Constant.APP_PATH
             Log.e(TAG, "start download: $downloadPath")
             downLoadAPK(downloadPath)
-            if (!"rk3128".equals(Build.MODEL)) {
-                try {
-                    //启动云派app升级监听服务
-                    val intent = Intent()
-                    intent.setClassName("com.wd.app", "com.wd.app.MyService")
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        //android8.0以上通过startForegroundService启动service
-                        startForegroundService(intent)
-                    } else {
-                        startService(intent)
-                    }
-                    Constant.yunpai_plugin = true
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
         } else {
             showMessage(R.string.download_error)
             finish()

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

@@ -107,11 +107,8 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
         HardWareFactory.getHardTools().init(this)
         //注册方式
         HardWareFactory.getHardTools().Registration(this)
-
         //xCrash catcher
         XCrashUtils().init(application)
-
-
         //蓝牙配网服务
         val bleIntent = Intent(this, BleService::class.java)
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -120,8 +117,12 @@ class CallingbedActivationActivity  : BaseActivity<CallingbedActivationPresenter
         } else {
             startService(bleIntent)
         }
+        val intent = Intent()
+        intent.setClass(activity, CallingbedActivity::class.java)
+        activity.startActivity(intent)
+        finish()
 
-        checkServer()
+//        checkServer()
     }
 
     override fun bindEvent() {

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

@@ -17,7 +17,9 @@ import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONObject
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.FieldNamingPolicy
 import com.google.gson.Gson
+import com.google.gson.GsonBuilder
 
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
@@ -31,6 +33,7 @@ import com.wdkl.app.ncs.callingbed.helper.*
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
 import com.wdkl.app.ncs.callingbed.sleep.SleepService
+import com.wdkl.app.ncs.callingbed.sleep.cdb.AppInfoBean
 
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.base.BaseApplication
@@ -143,7 +146,9 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         if (!apartmentFragment.equals(curFragment)) {
             switchFragment(R.id.callingbed_main_frame, apartmentFragment(), apartmentFragment)
         }
-
+        if (updata == null) {
+            updata = AppInfoBean()
+        }
         language = LocaleMangerUtils.getApplicationLocale().language
 
         //注册广播
@@ -164,7 +169,7 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         //保持屏幕常亮
 //        AppTool.Setting.setScreenOffTimeOut(applicationContext, 35000)
 
-        presenter.loadServerInfo()
+//        presenter.loadServerInfo()
 
         SpeechUtil.getInstance().init(applicationContext)
         val dm = resources.displayMetrics
@@ -172,6 +177,10 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
         Constant.DEVICE_HEIGHT = dm.heightPixels
         Constant.DEVICE_ORIENTATION = resources.configuration.orientation
 
+        checkServer()
+        //启动床垫服务
+        startSLService()
+
     }
 
 
@@ -933,5 +942,35 @@ class CallingbedActivity :BaseActivity<BedCallingbedActivityPresenter, Callingbe
             e.printStackTrace()
         }
     }
+    var  updata : AppInfoBean?=null
+    private fun checkServer() {
+        var baseurl = "https://api.base.wdklian.com/app/getAppByScene?scene=com.wdkl.app.ncs.cbd_serial_box"
+        HttpHelper.upload(baseurl,
+                TAG, object : HttpHelper.UploadCallback {
+            override fun onFail() {
+                Log.e(TAG, "onFail:")
+
+            }
+
+            override fun onSuccess(data: String?) {
+                Log.e(TAG, "onSuccess: $data")
+                if (data!=""){
+                    activity.runOnUiThread(Runnable {
+                        val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                        updata = gson.fromJson(data, AppInfoBean::class.java)
+                        var version = BuildConfig.VERSION_CODE.toInt()
+                        if ( version< updata!!.version_code) {
+                            Constant.APP_UPDATING = true
+                            Constant.APP_PATH = updata!!.link
+                            UpdateTipsDialogHelper.showDialog(activity)
+                        } else {
+                            showMessage(R.string.update_no_required)
+                        }
+                    })
+                }
+
 
+            }
+        })
+    }
 }

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

@@ -4,17 +4,22 @@ import android.app.Activity
 import android.bluetooth.BluetoothAdapter
 import android.content.Intent
 import android.os.Build
+import android.util.Log
 import android.view.View
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.FieldNamingPolicy
+import com.google.gson.GsonBuilder
 import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedSettingMainBinding
 import com.wdkl.app.ncs.callingbed.dialog.*
+import com.wdkl.app.ncs.callingbed.helper.HttpHelper
 import com.wdkl.app.ncs.callingbed.helper.NetHelper
 import com.wdkl.app.ncs.callingbed.helper.UpdateTipsDialogHelper
 import com.wdkl.app.ncs.callingbed.helper.Utils
 import com.wdkl.app.ncs.callingbed.launch.CallingbedLaunch
 import com.wdkl.app.ncs.callingbed.settings.SettingConfig
+import com.wdkl.app.ncs.callingbed.sleep.cdb.AppInfoBean
 
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.utils.EcodeHelper
@@ -69,14 +74,12 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
         settings_main_2_ll.setOnClickListener {
             NetworkDialogHelper.showDialog(activity)
         }
-
         //设备配置
         settings_main_top_3_ll.setOnClickListener {
             val intent = Intent()
             intent.setClass(activity, DeviceSystemActivity::class.java)
             activity.startActivity(intent)
         }
-
         //进入调试
         settings_main_3_ll.setOnClickListener {
 
@@ -85,15 +88,7 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
         settings_main_4_ll.setOnClickListener {
             UpdataDialogHelper.showDialog(activity, object : UpdataDialogHelper.ClickListener {
                 override fun onClick() {
-                    if (Constant.PART_ID != null) {
-                        if ("rk3128".equals(Build.MODEL)) {
-                            presenter.getAppVersion(Constant.PART_ID, 204)
-                        } else {
-                            presenter.getAppVersion(Constant.PART_ID, 104)
-                        }
-                    } else {
-                        showMessage("null part id")
-                    }
+                    checkServer()
                 }
             })
         }
@@ -363,4 +358,36 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
 
         })
     }
+    var  updata : AppInfoBean?=null
+    private fun checkServer() {
+        var baseurl = "https://api.base.wdklian.com/app/getAppByScene?scene=com.wdkl.app.ncs.cbd_serial_box"
+        HttpHelper.upload(baseurl,
+                TAG, object : HttpHelper.UploadCallback {
+            override fun onFail() {
+                Log.e(TAG, "onFail:")
+
+            }
+
+            override fun onSuccess(data: String?) {
+                Log.e(TAG, "onSuccess: $data")
+                if (data!=""){
+                    activity.runOnUiThread(Runnable {
+                        val gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+                        updata = gson.fromJson(data, AppInfoBean::class.java)
+                        var version = BuildConfig.VERSION_CODE.toInt()
+                        if ( version< updata!!.version_code) {
+                            Constant.APP_UPDATING = true
+                            Constant.APP_PATH = updata!!.link
+                            UpdateTipsDialogHelper.showDialog(activity)
+                        } else {
+                            showMessage(R.string.update_no_required)
+                        }
+                    })
+                }
+
+
+
+            }
+        })
+    }
 }

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

@@ -76,6 +76,28 @@ class  apartmentFragment: BaseFragment<BedMainFragmentPresenter, MainView3Layout
 
         }
         scheduler.scheduleAtFixedRate(task, 0, 20, TimeUnit.SECONDS)
+
+        main_view3_tv_bed_code.text ="IP地址:"+ NetHelper.getInstance().localIP
+        main_view3_tv_bed_age.text ="MAC地址:"+ Constant.DEVICE_REGISTER_ID
+        main_view3_tv_bed_name_title.text ="01"
+        main_view3_tv_bed_name.text ="CBD律动"
+        if (!BuildConfig.DEBUG) {
+            ip = Constant.SLEEP_TCP_SERVER_URL
+            port = Constant.SLEEP_TCP_PORT.toString()
+        } else {
+            ip = Constant.SLEEP_TCP_SERVER_URL_TXT
+            port = Constant.SLEEP_TCP_PORT.toString()
+        }
+        if (Constant.Sleep_TCP_CONNECTED){
+            main_view3_tv_bed_sex.text ="数据服务器状态: 地址"+ip+" 端口:"+port+"连接正常"
+        }else{
+            main_view3_tv_bed_sex.text ="数据服务器状态:  地址"+ip+" 端口:"+port+"连接失败，重新连接中"
+        }
+        main_view3_tv_bed_time.text ="设备状态: 律动床垫:"+"律动床椅:"+"睡眠床垫:"
+
+
+
+        main_view3_rv_main_view_s.visibility =View.VISIBLE
     }
 
     override fun bindEvent() {
@@ -152,26 +174,7 @@ class  apartmentFragment: BaseFragment<BedMainFragmentPresenter, MainView3Layout
 
         Constant.FJ_AGE =""+customInfo.age + customInfo.ageUnit
 
-        main_view3_tv_bed_code.text ="IP地址:"+ NetHelper.getInstance().localIP
-        main_view3_tv_bed_age.text ="MAC地址:"+ Constant.DEVICE_REGISTER_ID
-
-                if (!BuildConfig.DEBUG) {
-                    ip = Constant.SLEEP_TCP_SERVER_URL
-                    port = Constant.SLEEP_TCP_PORT.toString()
-                } else {
-                    ip = Constant.SLEEP_TCP_SERVER_URL_TXT
-                    port = Constant.SLEEP_TCP_PORT.toString()
-                }
-        if (Constant.Sleep_TCP_CONNECTED){
-            main_view3_tv_bed_sex.text ="数据服务器状态: 地址"+ip+" 端口:"+port+"连接正常"
-        }else{
-            main_view3_tv_bed_sex.text ="数据服务器状态:  地址"+ip+" 端口:"+port+"连接失败，重新连接中"
-        }
-        main_view3_tv_bed_time.text ="设备状态: 律动床垫:"+"律动床椅:"+"睡眠床垫:"
 
-
-
-        main_view3_rv_main_view_s.visibility =View.VISIBLE
     }
 
     override fun showEvents(data: ArrayList<EventDO>) {

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

@@ -67,7 +67,40 @@ public class HttpHelper {
             }
         });
     }
+    public static void upload(String url, Object tag, UploadCallback callback) {
+        if (okHttpClient == null) {
+            okHttpClient = new OkHttpClient();
+        }
+
+        Request request = new Request.Builder()
+                .url(url)
+                .tag(tag)
+                .build();
+
+        okHttpClient.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onFailure(Call call, IOException e) {
+                if (callback != null) {
+                    callback.onFail();
+                }
+            }
 
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                Log.d("post", "response: " + response.toString());
+                if( response.code()==200 && response.body() != null) {
+                    String data = response.body().string();
+                    if (callback != null) {
+                        callback.onSuccess(data);
+                    }
+                } else {
+                    if (callback != null) {
+                        callback.onFail();
+                    }
+                }
+            }
+        });
+    }
     public static void download(String url, Object tag, final DownloadListener listener) {
         if (okHttpClient == null) {
             okHttpClient = new OkHttpClient();

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/sleep/SleepService.java

@@ -164,7 +164,8 @@ public class SleepService extends Service implements BeaconConsumer, SleepSocket
         //ip = "47.115.176.250";
         //port = 3006;
         SleepSocketConnectLine.setHeartbeat(BluetoothUtil.hexStringToByteArray(data));//发送心跳数据
-        if (!SleepconnectState  &&  Constant.CUSTOM_ID != -1){
+        if (!SleepconnectState  ){
+//        if (!SleepconnectState  &&  Constant.CUSTOM_ID != -1){
             SleepSocketConnectLine.start();
             SleepSocketConnectLine.setOnConnectStateListener(this);//监听是否在线
             SleepSocketConnectLine.setOnSocketReadListener(this);  //监听返回数据

android_bed/src/main/java/com/wdkl/app/ncs/callingbed/sleep/cdb/AppInfoBean.java

@@ -0,0 +1,83 @@
+package com.wdkl.app.ncs.callingbed.sleep.cdb;
+
+import java.io.Serializable;
+
+public class AppInfoBean implements Serializable {
+
+
+    /**
+     * id : 14
+     * named : 维鼎康联打单工具
+     * scene : com.wdkl.bfsuma
+     * version_name : 1.0.9
+     * version_code : 9
+     * link : http://wdklmall.oss-cn-shenzhen.aliyuncs.com/mallgoods/com.wdkl.bfsuma/1.0.9.apk
+     */
+
+    private int id;
+    private String named;
+    private String scene;
+    private String version_name;
+    private int version_code;
+    private String link;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getNamed() {
+        return named;
+    }
+
+    public void setNamed(String named) {
+        this.named = named;
+    }
+
+    public String getScene() {
+        return scene;
+    }
+
+    public void setScene(String scene) {
+        this.scene = scene;
+    }
+
+    public String getVersion_name() {
+        return version_name;
+    }
+
+    public void setVersion_name(String version_name) {
+        this.version_name = version_name;
+    }
+
+    public int getVersion_code() {
+        return version_code;
+    }
+
+    public void setVersion_code(int version_code) {
+        this.version_code = version_code;
+    }
+
+    public String getLink() {
+        return link;
+    }
+
+    public void setLink(String link) {
+        this.link = link;
+    }
+
+    @Override
+    public String toString() {
+        return "UpData{" +
+                "id=" + id +
+                ", named='" + named + '\'' +
+                ", scene='" + scene + '\'' +
+                ", version_name='" + version_name + '\'' +
+                ", version_code=" + version_code +
+                ", link='" + link + '\'' +
+                '}';
+    }
+}

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

@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="marquee"
                 android:singleLine="true"
-                android:text="--"
+                android:text="CBD水平律动健康"
                 android:textColor="@color/white"
                 android:textSize="@dimen/font_size_18" />
         </LinearLayout>

build.gradle

@@ -81,8 +81,8 @@ buildscript {
         ext.app_version = "1.3.5"
     } else if (android_bed) {
         //分机
-        ext.app_version_code =113
-        ext.app_version = "1.4.3"
+        ext.app_version_code =115
+        ext.app_version = "1.4.5"
     } else if (android_host) {
         //主机
         ext.app_version_code = 102

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -85,8 +85,11 @@ public class Constant {
 //    //床垫服务端口
 //    public static int SLEEP_TCP_PORT = 5084;
 //
-//    //床垫服务器地址：
-    public static String SLEEP_TCP_SERVER_URL = "47.107.238.130";
+//    //维鼎床垫服务器地址：
+//    public static String SLEEP_TCP_SERVER_URL = "47.107.238.130";
+//    CBD服务器地址：
+//    public static String SLEEP_TCP_SERVER_URL = "https://api.base.cbdld88.com";
+    public static String SLEEP_TCP_SERVER_URL = "8.155.160.248";
 
     //TCP服务连接心跳
     public static int TCP_HEART_BEAT = 60;