diff --git a/app/build.gradle b/app/build.gradle index de28a27..1905399 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,6 +14,8 @@ android { namespace "com.project.survey" defaultConfig { + applicationId "com.bingce.controlnetwork" + minSdkVersion AndroidSdk.minSdkVersion targetSdkVersion AndroidSdk.targetSdkVersion ndk {} diff --git a/app/libs/base-java-release.aar b/app/libs/base-java-release.aar index 620e8df..be77090 100644 Binary files a/app/libs/base-java-release.aar and b/app/libs/base-java-release.aar differ diff --git a/app/libs/base-release.aar b/app/libs/base-release.aar index 4ccdb07..5eaf533 100644 Binary files a/app/libs/base-release.aar and b/app/libs/base-release.aar differ diff --git a/app/libs/device-release.aar b/app/libs/device-release.aar index 30e0fb6..326dbae 100644 Binary files a/app/libs/device-release.aar and b/app/libs/device-release.aar differ diff --git a/app/libs/device-ui-release.aar b/app/libs/device-ui-release.aar index 285e475..0997d4c 100644 Binary files a/app/libs/device-ui-release.aar and b/app/libs/device-ui-release.aar differ diff --git a/app/libs/gson-release.aar b/app/libs/gson-release.aar new file mode 100644 index 0000000..39ceba0 Binary files /dev/null and b/app/libs/gson-release.aar differ diff --git a/app/libs/totalstation-release.aar b/app/libs/totalstation-release.aar index 706d411..3af5d1f 100644 Binary files a/app/libs/totalstation-release.aar and b/app/libs/totalstation-release.aar differ diff --git a/app/src/main/java/com/project/survey/App.java b/app/src/main/java/com/project/survey/App.java index 305d156..d355b2e 100644 --- a/app/src/main/java/com/project/survey/App.java +++ b/app/src/main/java/com/project/survey/App.java @@ -6,6 +6,7 @@ import android.app.Application; import android.util.Log; import com.bingce.AppChannel; +import com.bingce.BaseApp; import com.bingce.data.database.DBQueryConstant; import com.bingce.data.database.KeyValueDb; import com.bingce.data.database.ProjectCoordinateDatabase; @@ -19,15 +20,17 @@ import com.bingce.device.Device; import com.bingce.device.DeviceProgressDialogBuilderImpl; import com.bingce.rtk.command.RTK; import com.bingce.utils.CoordinatorSystemNotifierImpl; +import com.bingce.utils.SdkUtils; import com.bingce.utils.ThreadPoolUtil; import org.polaric.colorful.Colorful; import blankj.utilcode.util.Utils; +import cn.liuyanbing.surveyor.BCSdk; import io.reactivex.functions.Consumer; import io.reactivex.plugins.RxJavaPlugins; -public class App extends Application { +public class App extends BaseApp { private final CoordinatorSystemNotifierImpl coordinatorSystemNotifier = new CoordinatorSystemNotifierImpl(); private static App app; @@ -70,6 +73,16 @@ public class App extends Application { } + @Override + protected void initTtsManager() { + + } + + @Override + public String applicationId() { + return ""; + } + private void initDevice() { //初始化设备相关代码 @@ -103,6 +116,11 @@ public class App extends Application { return false; } + @Override + public int angleNotNumber() { + return 6; + } + private void initThemeDark() { Colorful.defaults() diff --git a/app/src/main/java/com/project/survey/ui/MainActivity.kt b/app/src/main/java/com/project/survey/ui/MainActivity.kt index 9206fc5..f4071e0 100644 --- a/app/src/main/java/com/project/survey/ui/MainActivity.kt +++ b/app/src/main/java/com/project/survey/ui/MainActivity.kt @@ -4,12 +4,17 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import androidx.viewpager.widget.ViewPager +import blankj.utilcode.util.AppUtils +import com.bingce.AppChannel import com.bingce.ui.TabEntity +import com.bingce.utils.AppUtil +import com.bingce.utils.RegisterUtil +import com.bingce.utils.SdkUtils import com.flyco.tablayout.listener.CustomTabEntity import com.flyco.tablayout.listener.OnTabSelectListener import com.project.survey.R -import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivityMainBinding +import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.ui.home.HomeFragment import com.project.survey.ui.home.InstrumentFragment import com.project.survey.ui.home.MeFragment @@ -24,9 +29,24 @@ class MainActivity : BaseBindingActivity() { } override fun initView() { - + verifySdk() initTabFragment() + } + private fun verifySdk() { + SdkUtils.verify( + this, + "ShangHai", + AppUtil.getLanguage(), + AppUtils.getAppVersionCode().toLong(), + AppChannel.customChannel, + RegisterUtil.getOriginalMachineCode(), + RegisterUtil.getDeviceBoundID(), + "", + "", + "", + "" + ) } private fun initTabFragment() { diff --git a/app/src/main/java/com/project/survey/ui/SplashActivity.kt b/app/src/main/java/com/project/survey/ui/SplashActivity.kt index c9d1d62..22b90aa 100644 --- a/app/src/main/java/com/project/survey/ui/SplashActivity.kt +++ b/app/src/main/java/com/project/survey/ui/SplashActivity.kt @@ -1,8 +1,8 @@ package com.project.survey.ui import android.content.Intent -import com.project.survey.ui.base.BaseBindingActivity import com.project.survey.databinding.ActivitySplashBinding +import com.project.survey.ui.base.BaseBindingActivity /** * 启动页