Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

5 天以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/ui/guide/GuideActivity.java

@@ -20,7 +20,6 @@
import com.doumee.keyCabinet.MApplication;
import com.doumee.keyCabinet.R;
import com.doumee.keyCabinet.base.MyBaseActivity;
import com.doumee.keyCabinet.bean.ConfigBean;
import com.doumee.keyCabinet.bean.DevConfigBean;
import com.doumee.keyCabinet.ui.main.MainActivity;
import com.doumee.keyCabinet.utils.LanguageUtil;
@@ -42,12 +41,12 @@
        public void handleMessage(@NonNull Message msg) {
            switch (msg.what) {
                case 1:
                    if(MApplication.getConfigBean().getShopId()==null){
                    /*if(MApplication.getConfigBean().getShopId()==null){
                        if(isHavePermission){
                            handler.sendEmptyMessageDelayed(2,20000);
                            getVM().devLogin();
                        }
                    }
                    }*/
                    break;
                case 2:
                    getVM().resetReq();
@@ -75,38 +74,7 @@

    @Override
    public void initData(@Nullable Bundle savedInstanceState) {
        getVM().getDevLD().observe(this, new Observer<DevConfigBean>() {
            @Override
            public void onChanged(DevConfigBean devConfigBean) {
                if(devConfigBean!=null){
                    ConfigBean configBean = new ConfigBean();
                    configBean.setShopId(devConfigBean.getShopId());
                    configBean.setCapacity(devConfigBean.getCapacity());
                    configBean.setMoney(devConfigBean.getMoney());
                    configBean.setCategory(devConfigBean.getCategory());
                    configBean.setCurNum(devConfigBean.getCurNum());
                    configBean.setName(devConfigBean.getName());
                    configBean.setGymId(devConfigBean.getVenueId());
                    configBean.setLanguage(devConfigBean.getLanguage());
                    String language = devConfigBean.getLanguage();
                    if(!TextUtils.isEmpty(language)){
                        //转小写
                        language = language.toLowerCase();
                        if("zh".equals(language)){
                            MApplication.nLan = 0;
                        }else {
                            MApplication.nLan = 1;
                        }
                    }
                    SpUtil.saveString("language",language);
                    LanguageUtil.changeAppLanguage(GuideActivity.this,language);
                    MApplication.saveConfigBean(configBean);

                    startActivity(MainActivity.class);
                    finish();
                }
            }
        });
    }

    private boolean isHavePermission = false;