diff --git a/app/src/main/java/com/bingce/controlnetwork/App.java b/app/src/main/java/com/bingce/controlnetwork/App.java index b0aea8d..a1f03c9 100644 --- a/app/src/main/java/com/bingce/controlnetwork/App.java +++ b/app/src/main/java/com/bingce/controlnetwork/App.java @@ -85,7 +85,7 @@ public class App extends RepositoryBaseApp { @Override public void onCreate() { - customChannel = BuildConfig.CHANNEL_TYPE;//AppChannel.CUSTOM_PUBLIC; + customChannel = AppChannel.CUSTOM_CONTROL_PRO;//AppChannel.CUSTOM_PUBLIC; super.onCreate(); app = this; diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java index 4b51e4f..a9696ca 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java +++ b/app/src/main/java/com/bingce/controlnetwork/activity/MainActivity.java @@ -34,7 +34,6 @@ import com.afollestad.materialdialogs.MaterialDialog; import com.bingce.AppChannel; import com.bingce.BaseApp; import com.bingce.activity.BaseMainActivity; -import com.bingce.controlapphelper.datasource.database.config.ConfigOperate; import com.bingce.controlapphelper.event.DatabaseReadyEvent; import com.bingce.controlapphelper.event.SwitchPageEvent; import com.bingce.controlapphelper.util.InterfaceUtil; @@ -48,16 +47,13 @@ import com.bingce.controlnetwork.activity.user.UserInfoActivity; import com.bingce.controlnetwork.bean.MainUserBean; import com.bingce.controlnetwork.fragment.MainSurveyFragment; import com.bingce.controlnetwork.fragment.ProjectListFragment; -import com.bingce.controlnetwork.fragment.ServiceFragment; import com.bingce.controlnetwork.newui.configfragment.ConfigFragment; import com.bingce.controlnetwork.newui.mefragment.MeFragment; import com.bingce.controlnetwork.util.CheckControlUpdateUtil; import com.bingce.controlnetwork.viewmodel.MainActivityViewModel; import com.bingce.data.sync.GlobalFlowCenter; import com.bingce.data.sync.utils.LeanCloudConfigLoader; -import com.bingce.data.sync.utils.LeanCloudUserLoginStateUtils; import com.bingce.device.Device; -import com.bingce.device.ui.dialog.DialogUtil; import com.bingce.device.ui.manager.DeviceConnectManager; import com.bingce.device.ui.manager.DeviceRemindManager; import com.bingce.device.ui.manager.DeviceRequestManager; @@ -66,7 +62,6 @@ import com.bingce.event.OpenShortUrlEvent; import com.bingce.surveyor.agentweb.AgentWebActivity; import com.bingce.totalstation.TotalStation; import com.bingce.ui.TabEntity; -import com.bingce.utils.AppUtil; import com.bingce.utils.ColorUtil; import com.bingce.utils.CrashCollector; import com.bingce.utils.DateUtils; @@ -100,10 +95,7 @@ import org.polaric.colorful.Colorful; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import alibaba.fastjson.JSON; -import alibaba.fastjson.JSONObject; import blankj.utilcode.util.ActivityUtils; import blankj.utilcode.util.ServiceUtils; import blankj.utilcode.util.StringUtils; @@ -130,8 +122,8 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn private CheckBox powerOffCheckbox; private final List mFragments = new ArrayList<>(); private String[] mTitles; - private final int[] mIconUnSelectIds = new int[]{R.drawable.ic_tab_project_unselect, R.drawable.ic_ruler_unselected, R.mipmap.tab_home_unselect, R.mipmap.tab_service_unselect, R.mipmap.tab_me_unselect}; - private final int[] mIconSelectIds = new int[]{R.drawable.ic_tab_project_selected, R.drawable.ic_ruler_selected, R.mipmap.tab_home_select, R.mipmap.tab_service_select, R.mipmap.tab_me_select}; + private final int[] mIconUnSelectIds = new int[]{R.drawable.ic_tab_project_unselect, R.drawable.ic_ruler_unselected, R.mipmap.tab_home_unselect, R.mipmap.tab_me_unselect}; + private final int[] mIconSelectIds = new int[]{R.drawable.ic_tab_project_selected, R.drawable.ic_ruler_selected, R.mipmap.tab_home_select, R.mipmap.tab_me_select}; private final ArrayList mTabEntities = new ArrayList<>(); private ViewPager mViewPager; private CommonTabLayout mTabLayout; @@ -164,40 +156,7 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn VipManager.getInstance().controlSdkRefresh(this, ((App) Utils.getApp()).registerCodeV2, new VipManager.OnSdkRefreshListener() { @Override public void onRefreshSuccess() { - if (!AppUtil.isZh() && SdkUtils.isRegCodeValidate() && !SdkUtils.isIntlCodeValidate()) {//非中文环境需要国际许可码 - DialogUtil.mDismissAlertDialog(MainActivity.this, R.string.hint, R.string.you_need_apply_for_an_international_license_code, R.string.i_know, null, null); - } else if ((AppUtil.isZh() && !VipManager.getInstance().isCnLevelExpireTimeValid() && VipManager.getInstance().isIntlLevelExpireTimeValid()) - || (!AppUtil.isZh() && VipManager.getInstance().isCnLevelExpireTimeValid() && !VipManager.getInstance().isIntlLevelExpireTimeValid())) { - if (langDialog == null || !langDialog.isShowing()) { - langDialog = new MaterialDialog.Builder(MainActivity.this).content(R.string.your_membership_is_not_available_in_the_current_language).positiveText(R.string.i_know).show(); - } - } - if (!VipManager.getInstance().checkReg() - && (VipManager.getInstance().isCnLevelExpireTimeValid() || VipManager.getInstance().isIntlLevelExpireTimeValid()) - && !VipManager.getInstance().isControlBoundDevice) { - if (unbindDeviceDialog == null || !unbindDeviceDialog.isShowing()) { - unbindDeviceDialog = new MaterialDialog.Builder(MainActivity.this) - .title(R.string.hint) - .content(R.string.unbind_old_device_first) - .positiveText(R.string.unbind_device) - .onPositive((dialog, which) -> - startActivity(new Intent(MainActivity.this, UserInfoActivity.class))) - .negativeText(R.string.not_now) - .show(); - } - } - if (!StringUtils.isEmpty(SdkUtils.attach())) { - JSONObject attach = JSON.parseObject(SdkUtils.attach()); - if (attach != null && attach.containsKey("sessionTokenInvalid")) { - boolean sessionTokenInvalid = attach.getBooleanValue("sessionTokenInvalid");//如果改了密码，sessionToken变了，需要退出登录 - if (sessionTokenInvalid) { - LCUser.logOut(); - LeanCloudUserLoginStateUtils.onLogOut(); - updateHeaderResult(); - VipManager.getInstance().controlSdkRefresh(MainActivity.this, ((App) Utils.getApp()).registerCodeV2, null); - } - } - } + } @Override @@ -243,11 +202,11 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn mTabLayout.setUnderlineColor(Color.BLACK); } } - mTitles = new String[]{getString(R.string.project), getString(R.string.survey), getString(R.string.label_manager), getString(R.string.service), getString(R.string.me)}; + mTitles = new String[]{getString(R.string.project), getString(R.string.survey), getString(R.string.label_manager), getString(R.string.me)}; mFragments.add(new ProjectListFragment()); mFragments.add(new MainSurveyFragment()); mFragments.add(new ConfigFragment()); - mFragments.add(new ServiceFragment()); +// mFragments.add(new ServiceFragment()); mFragments.add(new MeFragment()); for (int i = 0; i < mTitles.length; i++) { mTabEntities.add(new TabEntity(mTitles[i], mIconSelectIds[i], mIconUnSelectIds[i])); @@ -666,11 +625,7 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn getMenuInflater().inflate(R.menu.menu_activity_main, menu); menu.findItem(R.id.menu_activity_main_bluetooth).setIcon( new IconicsDrawable(Utils.getApp()).icon(MaterialDesignIconic.Icon.gmi_bluetooth).color(Color.WHITE).sizeDp(20)); - if (AppChannel.customChannel == AppChannel.CUSTOM_CONTROL_PUBLIC) { - menu.findItem(R.id.menu_activity_main_bound_device_activate).setTitle(R.string.opening_renewal); - } else { - menu.findItem(R.id.menu_activity_main_bound_device_activate).setTitle(R.string.bound_device_activate); - } + menu.findItem(R.id.menu_activity_main_bound_device_activate).setTitle(R.string.bound_device_activate); return super.onCreateOptionsMenu(menu); } @@ -689,9 +644,6 @@ public class MainActivity extends BaseMainActivity implements Device.IDeviceConn Intent intent4 = new Intent(Utils.getApp(), SettingsActivity.class); startActivityForResult(intent4, 331); break; - case R.id.menu_activity_main_more: -// openLeftDrawer(); - break; } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/java/com/bingce/controlnetwork/activity/user/UserInfoActivity.java b/app/src/main/java/com/bingce/controlnetwork/activity/user/UserInfoActivity.java index e5b3798..050b787 100644 --- a/app/src/main/java/com/bingce/controlnetwork/activity/user/UserInfoActivity.java +++ b/app/src/main/java/com/bingce/controlnetwork/activity/user/UserInfoActivity.java @@ -421,23 +421,6 @@ public class UserInfoActivity extends ColorfulActivity { item_control_level.setRightText(getString(R.string.vip_expired)); } } - - if (!VipManager.getInstance().checkReg() - && (VipManager.getInstance().isCnLevelExpireTimeValid() || VipManager.getInstance().isIntlLevelExpireTimeValid()) - && !VipManager.getInstance().isControlBoundDevice) { - new MaterialDialog.Builder(UserInfoActivity.this) - .title(R.string.hint) - .content(R.string.unbind_old_device_first) - .positiveText(R.string.unbind_device) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - unbind(); - } - }) - .negativeText(R.string.not_now) - .show(); - } } else { ToastUtils.showShort(R.string.not_log_in); } diff --git a/app/src/main/java/com/bingce/controlnetwork/fragment/projectdetail/ProjectDetailFragment.kt b/app/src/main/java/com/bingce/controlnetwork/fragment/projectdetail/ProjectDetailFragment.kt index 31c4221..f06cc88 100644 --- a/app/src/main/java/com/bingce/controlnetwork/fragment/projectdetail/ProjectDetailFragment.kt +++ b/app/src/main/java/com/bingce/controlnetwork/fragment/projectdetail/ProjectDetailFragment.kt @@ -83,6 +83,7 @@ abstract class ProjectDetailFragment : BaseFragment() { private fun initView() { //设置开始测量 + mBinding.ilBtn.btnOne.text = getString(R.string.new_surveyor_station) mBinding.ilBtn.btnTwo.text = getString(R.string.start_surveyor) childFragmentManager diff --git a/app/src/main/res/layout/new_fragment_me.xml b/app/src/main/res/layout/new_fragment_me.xml index fc58e3e..8315d15 100644 --- a/app/src/main/res/layout/new_fragment_me.xml +++ b/app/src/main/res/layout/new_fragment_me.xml @@ -9,7 +9,8 @@ android:id="@+id/llUser" android:layout_width="match_parent" android:layout_height="60dp" - android:layout_margin="12dp"> + android:layout_margin="12dp" + android:visibility="gone"> - - \ No newline at end of file diff --git a/control_common b/control_common index edf19cf..697c229 160000 --- a/control_common +++ b/control_common @@ -1 +1 @@ -Subproject commit edf19cf26cc7871dea90117b60cd9271872b9d4e +Subproject commit 697c229579216c89f87450553f99e87f4813c60f