Skip to content

W
workoffice
提交 16891fdb authored 作者: lgd's avatar lgd
浏览文件
操作

1.多域名修改

上级 ce7df19a
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 238 行增加 和 30 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 16891fdb
......@@ -1838,7 +1838,15 @@
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.MainLoginActivity"
android:name=".ui.activity.login.MainLoginActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.login.BatTypeActivity"
android:configChanges="keyboardHidden|orientation"
android:label=" "
android:launchMode="singleTop"
......
app/src/main/java/com/wd/workoffice/app/WorkApp.java
浏览文件 @ 16891fdb
......@@ -47,16 +47,7 @@ public class WorkApp extends BaseApp {
.setSupportDP(false)
.setSupportSP(false)
.setSupportSubunits(Subunits.MM);
RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body())
.build();
return chain.proceed(request);
});
initBatNetWork();
cookies = new HashMap<>();
RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
//获取请求链接
......@@ -109,6 +100,19 @@ public class WorkApp extends BaseApp {
JPushInterface.init(this);
}
private void initBatNetWork() {
RtfHelper.getInstance().init(ApiService.DOMAIN, chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body())
.build();
return chain.proceed(request);
});
}
// private void daoInit() {
// daoSession = DaoMaster.newDevSession(this, "workO.db");
// }
......
app/src/main/java/com/wd/workoffice/bean/workEnum/BatLoginType.java 0 → 100644
浏览文件 @ 16891fdb
package com.wd.workoffice.bean.workEnum;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public enum BatLoginType {
GT("锆碳","gt"), GK("钢控","gk");
private String name;
private String code;
BatLoginType(String name, String code) {
this.name = name;
this.code = code;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java
浏览文件 @ 16891fdb
......@@ -2,26 +2,22 @@ package com.wd.workoffice.ui.activity;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.RelativeLayout;
import com.ashokvarma.bottomnavigation.BottomNavigationBar;
import com.ashokvarma.bottomnavigation.BottomNavigationItem;
import com.ashokvarma.bottomnavigation.ShapeBadgeItem;
import com.ashokvarma.bottomnavigation.TextBadgeItem;
import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.event.MesLoginEvent;
import com.wd.workoffice.bean.event.NotifyEvent;
import com.wd.workoffice.bean.event.RefreshTokenEvent;
import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity;
import com.wd.workoffice.ui.activity.login.LoginActivity;
import com.wd.workoffice.ui.activity.login.MainLoginActivity;
import com.wd.workoffice.ui.activity.mes.MesLoginActivity;
import com.wd.workoffice.ui.adapter.VpMainAdapter;
import com.wd.workoffice.ui.fg.MainFragment;
......@@ -44,10 +40,8 @@ import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import butterknife.BindView;
import butterknife.ButterKnife;
import cn.jpush.android.api.JPushInterface;
import flexible.xd.android_base.base.AppManager;
import flexible.xd.android_base.model.event.LoginEvent;
import flexible.xd.android_base.utils.BarUtils;
import me.jessyan.autosize.internal.CancelAdapt;
public class MainActivity extends WorkBaseActivity implements BottomNavigationBar.OnTabSelectedListener, View.OnClickListener, CancelAdapt {
......
app/src/main/java/com/wd/workoffice/ui/activity/login/BatTypeActivity.java 0 → 100644
浏览文件 @ 16891fdb
package com.wd.workoffice.ui.activity.login;
import android.os.Bundle;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.workEnum.BatLoginType;
import com.wd.workoffice.retrofit.ApiService;
import com.wd.workoffice.util.DataKeeper;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.RtfHelper;
import okhttp3.Request;
/**
* 选择角色
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class BatTypeActivity extends WorkBaseActivity {
@BindView(R.id.tv_first)
TextView tvFirst;
@BindView(R.id.tv_second)
TextView tvSecond;
@BindView(R.id.activity_main)
LinearLayout activityMain;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_main_login_type;
}
@OnClick({R.id.tv_first, R.id.tv_second})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_first:
DataKeeper.getInstance().keepBatLoginType(BatLoginType.GK.getCode());
toast(DataKeeper.getInstance().getBatLoginType());
RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body())
.build();
return chain.proceed(request);
});
startActivity(LoginActivity.class);
break;
case R.id.tv_second:
DataKeeper.getInstance().keepBatLoginType(BatLoginType.GT.getCode());
toast(DataKeeper.getInstance().getBatLoginType());
RtfHelper.getInstance().init(WorkUtils.getDomain(), chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.header("Authorization", "Bearer " + UserKeeper.getInstance().getToken())
.header("userId", UserKeeper.getInstance().getUserId())
.method(original.method(), original.body())
.build();
return chain.proceed(request);
});
startActivity(LoginActivity.class);
break;
}
}
}
app/src/main/java/com/wd/workoffice/ui/activity/MainLoginActivity.java → app/src/main/java/com/wd/workoffice/ui/activity/login/MainLoginActivity.java
浏览文件 @ 16891fdb
package com.wd.workoffice.ui.activity;
package com.wd.workoffice.ui.activity.login;
import android.os.Bundle;
import android.view.View;
......@@ -61,7 +61,7 @@ public class MainLoginActivity extends WorkBaseActivity {
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_bat:
startActivity(LoginActivity.class);
startActivity(BatTypeActivity.class);
break;
case R.id.tv_mes:
startActivity(MesLoginActivity.class);
......
app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java
浏览文件 @ 16891fdb
package com.wd.workoffice.ui.activity.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.Button;
......@@ -10,15 +9,9 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.PermissionBean;
import com.wd.workoffice.bean.UserInfoBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.activity.MainActivity;
import com.wd.workoffice.ui.activity.MainLoginActivity;
import com.wd.workoffice.ui.activity.login.LoginActivity;
import com.wd.workoffice.ui.activity.login.MainLoginActivity;
import com.wd.workoffice.util.DataKeeper;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
......@@ -29,8 +22,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.model.event.LoginEvent;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* 我的 - 设置
......
app/src/main/java/com/wd/workoffice/util/DataKeeper.java
浏览文件 @ 16891fdb
package com.wd.workoffice.util;
import com.wd.workoffice.bean.workEnum.BatLoginType;
import flexible.xd.android_base.utils.SPUtils;
/**
......@@ -13,6 +15,9 @@ public class DataKeeper {
private final String MES_MENU_ID = "MES_MENU_ID";
private final String MES_MENU = "MES_MENU";
private final String MSG_STATUS = "MSG_STATUS";
private final String BAT_LOGIN_TYPE = "BAT_LOGIN_TYPE";
private DataKeeper() {
}
......@@ -27,7 +32,22 @@ public class DataKeeper {
}
return keeper;
}
/**
* bat登录选择类型
*
* @param info
*/
public void keepBatLoginType(String info) {
sp.put(BAT_LOGIN_TYPE, info);
}
public String getBatLoginType() {
return sp.getString(BAT_LOGIN_TYPE);
}
public void clearBatLoginType() {
sp.put(BAT_LOGIN_TYPE, "");
}
/**
* mes菜单
*
......@@ -83,5 +103,6 @@ public class DataKeeper {
public void clearAll() {
clearMenu();
clearMsgStatus();
clearBatLoginType();
}
}
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 16891fdb
......@@ -28,6 +28,7 @@ import com.wd.workoffice.app.WorkApp;
import com.wd.workoffice.bean.event.CheckFeedbackEvent;
import com.wd.workoffice.bean.event.RefreshTokenEvent;
import com.wd.workoffice.bean.mesBean.MenuBean;
import com.wd.workoffice.bean.workEnum.BatLoginType;
import com.wd.workoffice.bean.workEnum.OrderType;
import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.bean.workEnum.PermissionType;
......@@ -64,6 +65,18 @@ import retrofit2.Response;
* github: https://github.com/FlexibleXd
**/
public class WorkUtils {
/**
* 处理项目请求地址
*
* @return
*/
public static String getDomain (){
String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/";
String loginType =TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType())? BatLoginType.GK.getCode() :DataKeeper.getInstance().getBatLoginType();
return String.format(domain,loginType);
// return "http://zwang.bat100.net.cn:8000/gt/";
}
/**
* 将map数据转换为 普通的 json RequestBody
......
app/src/main/res/layout/activity_main_login_type.xml 0 → 100644
浏览文件 @ 16891fdb
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="80mm"
android:text="正望"
android:textSize="25sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="50mm"
android:text="选择一个账套进入"
android:textSize="16sp" />
<TextView
android:id="@+id/tv_first"
android:layout_width="100mm"
android:layout_height="100mm"
android:layout_marginTop="20mm"
android:background="@drawable/shape_main_login"
android:gravity="center"
android:text="钢控"
android:textSize="17sp" />
<TextView
android:id="@+id/tv_second"
android:layout_width="100mm"
android:layout_height="100mm"
android:layout_marginTop="20mm"
android:background="@drawable/shape_main_login"
android:gravity="center"
android:text="锆碳"
android:textSize="17sp" />
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论