Skip to content

S
supplier
Commit b343ab48 by 宁斌
Options

环境切换调整 引导图，logo替换

parent 221a97de
Showing with 149 additions and 164 deletions
arms/src/main/AndroidManifest.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="com.jess.arms"> <manifest package="com.jess.arms"
>
</manifest> </manifest>
base-module/src/main/AndroidManifest.xml
<manifest package="com.gingersoft.gsa.cloud.base" > <manifest package="com.gingersoft.gsa.cloud.base"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
</manifest> </manifest>
base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
...@@ -100,7 +100,7 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -100,7 +100,7 @@ public class GsaCloudApplication extends BaseApplication {
CC.enableDebug(true); CC.enableDebug(true);
CC.enableRemoteCC(true); CC.enableRemoteCC(true);
//初始化服務器地址 //初始化服務器地址
initDomainUrl(); initDomainUrl(false);
//初始化側滑回退 //初始化側滑回退
// QMUISwipeBackActivityManager.init(this); // QMUISwipeBackActivityManager.init(this);
...@@ -150,8 +150,8 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -150,8 +150,8 @@ public class GsaCloudApplication extends BaseApplication {
ClassicsFooter.REFRESH_FOOTER_NOTHING = getString(R.string.srl_footer_nothing);//"全部加载完成"; ClassicsFooter.REFRESH_FOOTER_NOTHING = getString(R.string.srl_footer_nothing);//"全部加载完成";
} }
public static void initDomainUrl() { public static void initDomainUrl(boolean isSwitchServer) {
HttpsConstans.init(mAppContext); HttpsConstans.init(mAppContext,isSwitchServer);
//需要單獨配置域名URL的，在接口上添加@Headers({"Domain-Name: settlement_report_server"})，不添加則是使用默認域名 //需要單獨配置域名URL的，在接口上添加@Headers({"Domain-Name: settlement_report_server"})，不添加則是使用默認域名
setGlobalDomain(); setGlobalDomain();
//清機報表請求地址 //清機報表請求地址
......
base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.constans; ...@@ -3,6 +3,7 @@ package com.gingersoft.gsa.cloud.constans;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.zhy.autolayout.utils.L; import com.zhy.autolayout.utils.L;
...@@ -93,10 +94,12 @@ public class HttpsConstans { ...@@ -93,10 +94,12 @@ public class HttpsConstans {
//修改這個值，修改微信公眾號報表地址：首頁曲線圖數據，支付分析報表數據 //修改這個值，修改微信公眾號報表地址：首頁曲線圖數據，支付分析報表數據
public static String WECHAR_REPORT_SERVER_ADDRESS;// = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS public static String WECHAR_REPORT_SERVER_ADDRESS;// = (isFormal ? WECHAR_REPORT_FORMAL_ADDRESS : WECHAR_REPORT_TEST_ADDRESS) + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
public static void init(Context context) { public static void init(Context context,boolean isSwitchServer) {
isFormal = (int) SPUtils.get(context, "isFormal", 2); isFormal = (int) SPUtils.get(context, "isFormal", 2);
Log.e("eee", "是否正式" + isFormal); Log.e("eee", "是否正式" + isFormal);
if (!BuildConfig.DEBUG && !isSwitchServer) {
isFormal = 1;
}
// _SERVER_ADDRESS = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : "http://a.ricepon.com:61177") + "/member-web/api/"; // _SERVER_ADDRESS = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : "http://a.ricepon.com:61177") + "/member-web/api/";
// ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = isFormal ==1 ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS; // ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = isFormal ==1 ? HTTP_ADDRESS_URL_FORMAL : REPORT_TEST_ADDRESS;
// ROOT_SERVER_ADDRESS_FORMAL = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH; // ROOT_SERVER_ADDRESS_FORMAL = (isFormal == 1 ? HTTP_ADDRESS_URL_FORMAL : HTTP_ADDRESS_URL_HK) + PATH;
...@@ -124,7 +127,7 @@ public class HttpsConstans { ...@@ -124,7 +127,7 @@ public class HttpsConstans {
case 3: case 3:
_SERVER_ADDRESS = ROOT_SERVER_YOU_CHANG_HK + "/member-web/api/"; _SERVER_ADDRESS = ROOT_SERVER_YOU_CHANG_HK + "/member-web/api/";
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_HK + PATH; ROOT_SERVER_ADDRESS_FORMAL = ROOT_SERVER_YOU_CHANG_HK;
ROOT_URL = ROOT_SZ_URL ; ROOT_URL = ROOT_SZ_URL ;
REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH; REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
...@@ -132,7 +135,7 @@ public class HttpsConstans { ...@@ -132,7 +135,7 @@ public class HttpsConstans {
case 4: case 4:
_SERVER_ADDRESS = ROOT_SERVER_SHI_WEI_HK + "/member-web/api/"; _SERVER_ADDRESS = ROOT_SERVER_SHI_WEI_HK + "/member-web/api/";
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_HK + PATH; ROOT_SERVER_ADDRESS_FORMAL = ROOT_SERVER_SHI_WEI_HK;
ROOT_URL = ROOT_SZ_URL ; ROOT_URL = ROOT_SZ_URL ;
REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH; REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
...@@ -140,7 +143,7 @@ public class HttpsConstans { ...@@ -140,7 +143,7 @@ public class HttpsConstans {
case 5: case 5:
_SERVER_ADDRESS = ROOT_SERVER_SHI_SHU_HK + "/member-web/api/"; _SERVER_ADDRESS = ROOT_SERVER_SHI_SHU_HK + "/member-web/api/";
ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ; ROOT_SETTLEMENT_REPORT_SERVER_ADDRESS_FORMAL = REPORT_TEST_ADDRESS ;
ROOT_SERVER_ADDRESS_FORMAL = HTTP_ADDRESS_URL_HK + PATH; ROOT_SERVER_ADDRESS_FORMAL = ROOT_SERVER_SHI_SHU_HK;
ROOT_URL = ROOT_SZ_URL ; ROOT_URL = ROOT_SZ_URL ;
REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH; REPORT_SERVER_ADDRESS = REPORT_TEST_ADDRESS +REPORT_PATH;
WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS WECHAR_REPORT_SERVER_ADDRESS = WECHAR_REPORT_TEST_ADDRESS + WECHAR_REPORT_PATH;//正式：WECHAR_REPORT_FORMAL_ADDRESS 測試：WECHAR_REPORT_TEST_ADDRESS
......
base-module/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
base-module/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
base-module/src/main/res/mipmap-hdpi/ic_launcher.png
base-module/src/main/res/mipmap-hdpi/ic_launcher.png

5.01 KB | W: | H:

base-module/src/main/res/mipmap-hdpi/ic_launcher.png

3.04 KB | W: | H:

base-module/src/main/res/mipmap-hdpi/ic_launcher.png
base-module/src/main/res/mipmap-hdpi/ic_launcher.png
base-module/src/main/res/mipmap-hdpi/ic_launcher.png
base-module/src/main/res/mipmap-hdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
base-module/src/main/res/mipmap-mdpi/ic_launcher.png
base-module/src/main/res/mipmap-mdpi/ic_launcher.png

3.02 KB | W: | H:

base-module/src/main/res/mipmap-mdpi/ic_launcher.png

2.05 KB | W: | H:

base-module/src/main/res/mipmap-mdpi/ic_launcher.png
base-module/src/main/res/mipmap-mdpi/ic_launcher.png
base-module/src/main/res/mipmap-mdpi/ic_launcher.png
base-module/src/main/res/mipmap-mdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
base-module/src/main/res/mipmap-xhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xhdpi/ic_launcher.png

7.32 KB | W: | H:

base-module/src/main/res/mipmap-xhdpi/ic_launcher.png

4.01 KB | W: | H:

base-module/src/main/res/mipmap-xhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png

12 KB | W: | H:

base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png

6.08 KB | W: | H:

base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png

16.6 KB | W: | H:

base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png

8.05 KB | W: | H:

base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
base-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
config.gradle
...@@ -6,7 +6,7 @@ ext { ...@@ -6,7 +6,7 @@ ext {
minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19 minSdkVersion : 19, //N5收銀機應用安卓開發環境要求Android OS Version: 5.1Android SDK Min Version: 19
targetSdkVersion : 28, targetSdkVersion : 28,
versionCode : 1, versionCode : 1,
versionName : "1.0" versionName : "1.8"
] ]
version = [ version = [
......
download-module/src/main/debug/AndroidManifest.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/download_data_app_name" android:label="@string/download_data_app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
......
login-module/src/main/AndroidManifest.xml
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/user_login_name" android:label="@string/user_login_name"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
tools:replace="android:label"> tools:replace="android:label">
......
login-module/src/main/debug/AndroidManifest.xml
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication" android:name="com.gingersoft.gsa.cloud.base.application.GsaCloudApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:label="@string/user_login_name" android:label="@string/user_login_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/SwitchServerActivity.java
...@@ -83,11 +83,6 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -83,11 +83,6 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
tvNowServer.setText("當前服務器：" + nowServer); tvNowServer.setText("當前服務器：" + nowServer);
setChecked((Integer) SPUtils.get(this, "isFormal", 2)); setChecked((Integer) SPUtils.get(this, "isFormal", 2));
// if (HttpsConstans.isFormal) {
// rbFormal.setChecked(true);
// } else {
// rbHK.setChecked(true);
// }
rbHK.setText("測試服務器"); rbHK.setText("測試服務器");
rbFormal.setText("正式服務器"); rbFormal.setText("正式服務器");
...@@ -95,89 +90,42 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -95,89 +90,42 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
rbHK.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { rbHK.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rbHK.setChecked(true); setChecked(2);
rbFormal.setChecked(false);
rb_youchang.setChecked(false);
rb_shiwei.setChecked(false);
rb_shishu.setChecked(false);
SPUtils.put(SwitchServerActivity.this, "isFormal", 2);
} }
}); });
rbFormal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { rbFormal.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rbHK.setChecked(false); setChecked(1);
rbFormal.setChecked(true);
rb_youchang.setChecked(false);
rb_shiwei.setChecked(false);
rb_shishu.setChecked(false);
SPUtils.put(SwitchServerActivity.this, "isFormal", 1);
} }
}); });
rb_youchang.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { rb_youchang.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rbHK.setChecked(false); setChecked(3);
rbFormal.setChecked(false);
rb_youchang.setChecked(true);
rb_shiwei.setChecked(false);
rb_shishu.setChecked(false);
SPUtils.put(SwitchServerActivity.this, "isFormal", 3);
} }
}); });
rb_shiwei.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { rb_shiwei.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rbHK.setChecked(false); setChecked(4);
rbFormal.setChecked(false);
rb_youchang.setChecked(false);
rb_shiwei.setChecked(true);
rb_shishu.setChecked(false);
SPUtils.put(SwitchServerActivity.this, "isFormal", 4);
} }
}); });
rb_shishu.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { rb_shishu.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
rbHK.setChecked(false); setChecked(5);
rbFormal.setChecked(false);
rb_youchang.setChecked(false);
rb_shiwei.setChecked(false);
rb_shishu.setChecked(true);
SPUtils.put(SwitchServerActivity.this, "isFormal", 5);
} }
}); });
// radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
// @Override
// public void onCheckedChanged(RadioGroup group, int checkedId) {
// for (int i = 0; i < rbIds.length; i++) {
// if (rbIds[i] == checkedId) {
// rbFormal.setChecked(true);
//// setChecked((i + 1));
// return;
// }
// }
// }
// }); // });
switchServer.setOnClickListener(v -> { switchServer.setOnClickListener(v -> {
// if (rbHK.isChecked()) { GsaCloudApplication.initDomainUrl(true);
// SPUtils.put(this, "isFormal", false);
// } else {
// SPUtils.put(this, "isFormal", true);
// }
GsaCloudApplication.initDomainUrl();
GsaCloudApplication.isLogin = false; GsaCloudApplication.isLogin = false;
CC.obtainBuilder("User.Component.Login") CC.obtainBuilder("User.Component.Login")
.setActionName("showActivityA") .setActionName("showActivityA")
.build() .build()
.call(); .call();
finish(); finish();
// try {
// Thread.sleep(2000);
// System.exit(0);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
}); });
} }
...@@ -185,31 +133,31 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im ...@@ -185,31 +133,31 @@ public class SwitchServerActivity extends BaseActivity<SwitchServerPresenter> im
switch (i) { switch (i) {
case 1: case 1:
rbHK.setChecked(false); rbHK.setChecked(false);
rbFormal.setChecked(true);
rb_youchang.setChecked(false); rb_youchang.setChecked(false);
rb_shiwei.setChecked(false); rb_shiwei.setChecked(false);
rb_shishu.setChecked(false); rb_shishu.setChecked(false);
rbFormal.setChecked(true);
break; break;
case 2: case 2:
rbHK.setChecked(true);
rbFormal.setChecked(false); rbFormal.setChecked(false);
rb_youchang.setChecked(false); rb_youchang.setChecked(false);
rb_shiwei.setChecked(false); rb_shiwei.setChecked(false);
rb_shishu.setChecked(false); rb_shishu.setChecked(false);
rbHK.setChecked(true);
break; break;
case 3: case 3:
rbHK.setChecked(false); rbHK.setChecked(false);
rbFormal.setChecked(false); rbFormal.setChecked(false);
rb_youchang.setChecked(true);
rb_shiwei.setChecked(false); rb_shiwei.setChecked(false);
rb_shishu.setChecked(false); rb_shishu.setChecked(false);
rb_youchang.setChecked(true);
break; break;
case 4: case 4:
rbHK.setChecked(false); rbHK.setChecked(false);
rbFormal.setChecked(false); rbFormal.setChecked(false);
rb_youchang.setChecked(false); rb_youchang.setChecked(false);
rb_shiwei.setChecked(true);
rb_shishu.setChecked(false); rb_shishu.setChecked(false);
rb_shiwei.setChecked(true);
break; break;
case 5: case 5:
rbHK.setChecked(false); rbHK.setChecked(false);
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
...@@ -9,6 +9,7 @@ import android.view.animation.Animation; ...@@ -9,6 +9,7 @@ import android.view.animation.Animation;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;
import android.view.animation.ScaleAnimation; import android.view.animation.ScaleAnimation;
import android.widget.RelativeLayout;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
...@@ -45,7 +46,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull; ...@@ -45,7 +46,7 @@ import static com.jess.arms.utils.Preconditions.checkNotNull;
public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implements WelcomeContract.View, View.OnClickListener { public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implements WelcomeContract.View, View.OnClickListener {
@BindView(R2.id.content_view) @BindView(R2.id.content_view)
ConstraintLayout contentView; RelativeLayout contentView;
@BindView(R2.id.cl_guide_layout) @BindView(R2.id.cl_guide_layout)
ConstraintLayout guideView; ConstraintLayout guideView;
@BindView(R2.id.vp2_guide) @BindView(R2.id.vp2_guide)
...@@ -215,7 +216,6 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem ...@@ -215,7 +216,6 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
if (absPos > 1) { if (absPos > 1) {
scaleX = 0F; scaleX = 0F;
scaleY = 0F; scaleY = 0F;
} else { } else {
scaleX = 1 - absPos; scaleX = 1 - absPos;
scaleY = 1 - absPos; scaleY = 1 - absPos;
......
login-module/src/main/res/layout/activity_welcome.xml
...@@ -4,17 +4,18 @@ ...@@ -4,17 +4,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
android:id="@+id/content_view" <!-- android:id="@+id/content_view"-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="match_parent" <!-- android:layout_height="match_parent"-->
android:background="@color/white" <!-- android:background="@color/white"-->
android:visibility="visible"> <!-- android:visibility="visible">-->
<!-- <ImageView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:src="@mipmap/img_start" />-->
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/img_start" />
<!-- <TextView--> <!-- <TextView-->
<!-- android:id="@+id/tv_welcome_title"--> <!-- android:id="@+id/tv_welcome_title"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
...@@ -45,7 +46,7 @@ ...@@ -45,7 +46,7 @@
<!-- android:layout_width="@dimen/dp_56"--> <!-- android:layout_width="@dimen/dp_56"-->
<!-- android:layout_height="@dimen/dp_56"--> <!-- android:layout_height="@dimen/dp_56"-->
<!-- android:layout_marginTop="@dimen/dp_16"--> <!-- android:layout_marginTop="@dimen/dp_16"-->
<!-- android:src="@mipmap/ic_logo"--> <!-- android:src="@mipmap/ic_launcher"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintLeft_toLeftOf="parent"--> <!-- app:layout_constraintLeft_toLeftOf="parent"-->
<!-- app:layout_constraintRight_toRightOf="parent"--> <!-- app:layout_constraintRight_toRightOf="parent"-->
...@@ -58,7 +59,51 @@ ...@@ -58,7 +59,51 @@
<!-- android:src="@mipmap/png_welcome_bottom"--> <!-- android:src="@mipmap/png_welcome_bottom"-->
<!-- app:layout_constraintBottom_toBottomOf="parent" />--> <!-- app:layout_constraintBottom_toBottomOf="parent" />-->
</androidx.constraintlayout.widget.ConstraintLayout> <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<RelativeLayout
android:id="@+id/content_view"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_welcome_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="多功能管理，讓管理更輕鬆"
android:textColor="@color/theme_color"
android:textSize="@dimen/sp_22"
android:textStyle="bold"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_80"/>
<ImageView
android:id="@+id/iv_welcome_center"
android:layout_width="@dimen/dp_203"
android:layout_height="@dimen/dp_256"
android:layout_marginTop="@dimen/dp_60"
android:src="@mipmap/png_welcome_center"
android:layout_centerHorizontal="true"
android:layout_below="@+id/tv_welcome_title" />
<ImageView
android:id="@+id/iv_welcome_logo"
android:layout_width="@dimen/dp_56"
android:layout_height="@dimen/dp_56"
android:layout_marginTop="@dimen/dp_16"
android:src="@mipmap/ic_launcher"
android:layout_centerHorizontal="true"
android:layout_below="@+id/iv_welcome_center" />
<ImageView
android:id="@+id/iv_welcome_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/png_welcome_bottom"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"/>
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_guide_layout" android:id="@+id/cl_guide_layout"
...@@ -67,10 +112,26 @@ ...@@ -67,10 +112,26 @@
android:background="@mipmap/pic_guide_bg" android:background="@mipmap/pic_guide_bg"
android:visibility="gone"> android:visibility="gone">
<androidx.viewpager2.widget.ViewPager2 <ImageView
android:id="@+id/vp2_guide" android:id="@+id/iv_guide_close"
android:layout_width="match_parent" android:layout_width="@dimen/dp_42"
android:layout_height="match_parent" /> android:layout_height="@dimen/dp_42"
android:padding="@dimen/dp_12"
android:src="@drawable/ic_guide_close"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_guide_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:text="為您搭建優良高效管理平台"
android:textColor="@color/white"
android:textSize="@dimen/dp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/tv_guide_title"
app:layout_constraintTop_toBottomOf="@id/tv_guide_title" />
<TextView <TextView
android:id="@+id/tv_guide_title" android:id="@+id/tv_guide_title"
...@@ -87,36 +148,15 @@ ...@@ -87,36 +148,15 @@
app:layout_constraintVertical_chainStyle="packed" /> app:layout_constraintVertical_chainStyle="packed" />
<TextView <TextView
android:id="@+id/tv_guide_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:text="為您搭建優良高效管理平台"
android:textColor="@color/white"
android:textSize="@dimen/dp_13"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@id/tv_guide_title"
app:layout_constraintTop_toBottomOf="@id/tv_guide_title" />
<ImageView
android:id="@+id/iv_guide_close"
android:layout_width="@dimen/dp_42"
android:layout_height="@dimen/dp_42"
android:padding="@dimen/dp_12"
android:src="@drawable/ic_guide_close"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_experience" android:id="@+id/tv_experience"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_15" android:layout_marginBottom="@dimen/dp_15"
android:background="@drawable/shape_experience_bg" android:background="@drawable/shape_experience_bg"
android:paddingBottom="@dimen/dp_10"
android:paddingLeft="@dimen/dp_28" android:paddingLeft="@dimen/dp_28"
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_28" android:paddingRight="@dimen/dp_28"
android:paddingBottom="@dimen/dp_10" android:paddingTop="@dimen/dp_10"
android:text="立即體驗" android:text="立即體驗"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/dp_14" android:textSize="@dimen/dp_14"
...@@ -125,6 +165,11 @@ ...@@ -125,6 +165,11 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" /> app:layout_constraintRight_toRightOf="parent" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/vp2_guide"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<com.gingersoft.gsa.cloud.ui.widget.Indicator.UIndicator <com.gingersoft.gsa.cloud.ui.widget.Indicator.UIndicator
android:id="@+id/guide_magic_indicator" android:id="@+id/guide_magic_indicator"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
login-module/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/> <foreground android:drawable="@mipmap/ic_launcher"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
login-module/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/> <!--<background android:drawable="@drawable/ic_launcher"/>-->
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher"/>
</adaptive-icon> </adaptive-icon>
\ No newline at end of file
login-module/src/main/res/mipmap-hdpi/ic_launcher.png
login-module/src/main/res/mipmap-hdpi/ic_launcher.png

5.01 KB | W: | H:

login-module/src/main/res/mipmap-hdpi/ic_launcher.png

3.04 KB | W: | H:

login-module/src/main/res/mipmap-hdpi/ic_launcher.png
login-module/src/main/res/mipmap-hdpi/ic_launcher.png
login-module/src/main/res/mipmap-hdpi/ic_launcher.png
login-module/src/main/res/mipmap-hdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
login-module/src/main/res/mipmap-mdpi/ic_launcher.png
login-module/src/main/res/mipmap-mdpi/ic_launcher.png

3.02 KB | W: | H:

login-module/src/main/res/mipmap-mdpi/ic_launcher.png

2.05 KB | W: | H:

login-module/src/main/res/mipmap-mdpi/ic_launcher.png
login-module/src/main/res/mipmap-mdpi/ic_launcher.png
login-module/src/main/res/mipmap-mdpi/ic_launcher.png
login-module/src/main/res/mipmap-mdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
login-module/src/main/res/mipmap-xhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xhdpi/ic_launcher.png

7.32 KB | W: | H:

login-module/src/main/res/mipmap-xhdpi/ic_launcher.png

4.01 KB | W: | H:

login-module/src/main/res/mipmap-xhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png

12 KB | W: | H:

login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png

6.08 KB | W: | H:

login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png

16.6 KB | W: | H:

login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png

8.05 KB | W: | H:

login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
login-module/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  • 2-up
  • Swipe
  • Onion skin
main-module/src/main/debug/AndroidManifest.xml
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".mvp.ui.activity.ReportActivity" /> <activity android:name=".mvp.ui.activity.ReportActivity" />
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
...@@ -192,7 +192,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -192,7 +192,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
.setActionName("switchServer") .setActionName("switchServer")
.build() .build()
.call(); .call();
finish(); // finish();
break; break;
case "複製Token": case "複製Token":
String token; String token;
...@@ -235,13 +235,13 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -235,13 +235,13 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
// functions.addAll(FunctionManager.getDefault().getFunctionByResModule(this, ComponentMain.Function.class, ComponentMain.Function.manager,"manager")); // functions.addAll(FunctionManager.getDefault().getFunctionByResModule(this, ComponentMain.Function.class, ComponentMain.Function.manager,"manager"));
functions.add(new Function((long) 151, 0, 5, "管理", 0, 0)); functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0)); // functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0)); functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0));
functions.add(new Function((long) 143, 151, 5, "餐臺管理", R.drawable.ic_dining_table_management, 0)); // functions.add(new Function((long) 143, 151, 5, "餐臺管理", R.drawable.ic_dining_table_management, 0));
functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0)); functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0));
// functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1)); // functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1));
// functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1)); // functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1));
functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0)); // functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
// functions.addAll(FunctionManager.getDefault().getFunctionByResModule(this, ComponentMain.Function.class, ComponentMain.Function.employee,"employee")); // functions.addAll(FunctionManager.getDefault().getFunctionByResModule(this, ComponentMain.Function.class, ComponentMain.Function.employee,"employee"));
functions.add(new Function((long) 152, 0, 5, "員工", 0, 0)); functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
...@@ -266,9 +266,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl ...@@ -266,9 +266,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
} }
} }
} }
initAdapter(parents, funMap, 0, R.layout.main_home_funcation_item, rvOrdering, 4); // initAdapter(parents, funMap, 0, R.layout.main_home_funcation_item, rvOrdering, 4);
initAdapter(parents, funMap, 1, R.layout.main_home_management_funcation_item, rvManagement, 5); initAdapter(parents, funMap, 1, R.layout.main_home_management_funcation_item, rvManagement, 5);
initAdapter(parents, funMap, 2, R.layout.main_home_management_funcation_item, rvStaffManagement, 4); // initAdapter(parents, funMap, 2, R.layout.main_home_management_funcation_item, rvStaffManagement, 4);
} }
private void initAdapter(SparseArray<String> parents, SparseArray<List<Function>> funMap, int i, int p, RecyclerView rvOrdering, int i2) { private void initAdapter(SparseArray<String> parents, SparseArray<List<Function>> funMap, int i, int p, RecyclerView rvOrdering, int i2) {
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/SettlementReportActivity.java
...@@ -120,7 +120,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -120,7 +120,7 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
@Override @Override
public void initData(@Nullable Bundle savedInstanceState) { public void initData(@Nullable Bundle savedInstanceState) {
// tv_last_time.setVisibility(View.GONE); // tv_last_time.setVisibility(View.GONE);
scrollView.post(() -> scrollView.fullScroll(ScrollView.FOCUS_UP));
} }
@Override @Override
...@@ -357,9 +357,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -357,9 +357,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
/** 帳單統計*/ /** 帳單統計*/
settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null)); settlementReportItem5s.add(new SectionTextItem5("==============================================================", null, null, null, null));
settlementReportItem5s.add(new SectionTextItem5(null, null, "帳單統計", null, null)); settlementReportItem5s.add(new SectionTextItem5(null, null, "帳單統計", null, null));
if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) { // if (!GsaCloudApplication.mV2.contains(Build.MODEL) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
settlementReportItem5s.add(new SectionTextItem5("類別", "帳單", "金額", "平均", "金額%")); // settlementReportItem5s.add(new SectionTextItem5("類別", "帳單", "金額", "平均", "金額%"));
} // }
//總計 //總計
//平均數 //平均數
String averagePrice2 = "0.00"; String averagePrice2 = "0.00";
...@@ -390,9 +390,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -390,9 +390,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
if (amount > 0) { if (amount > 0) {
canteenPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + ""; canteenPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + "";
} }
if (!GsaCloudApplication.mV2.contains(Build.MODEL) && !GsaCloudApplication.mN5.contains(Build.MODEL)) { // if (!GsaCloudApplication.mV2.contains(Build.MODEL) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
settlementReportItem5s.add(new SectionTextItem5(canteenText, canteenNum, canteenTotamout, canteenAveragePrice, canteenPercentage)); // settlementReportItem5s.add(new SectionTextItem5(canteenText, canteenNum, canteenTotamout, canteenAveragePrice, canteenPercentage));
} // }
} else { } else {
canteenText = ""; canteenText = "";
} }
...@@ -414,9 +414,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -414,9 +414,9 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
if (amount > 0) { if (amount > 0) {
takewayPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + ""; takewayPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + "";
} }
if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) { // if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
settlementReportItem5s.add(new SectionTextItem5(takewayText, takewayNum, takewayTotamout, takewayAveragePrice, takewayPercentage)); // settlementReportItem5s.add(new SectionTextItem5(takewayText, takewayNum, takewayTotamout, takewayAveragePrice, takewayPercentage));
} // }
} else { } else {
takewayText = ""; takewayText = "";
} }
...@@ -437,19 +437,19 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese ...@@ -437,19 +437,19 @@ public class SettlementReportActivity extends BaseActivity<SettlementReportPrese
if (amount > 0) { if (amount > 0) {
selfFetchingPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + ""; selfFetchingPercentage = (int) (MoneyUtil.divide(amount, voBean.getTotamount(), 2) * 100) + "";
} }
if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) { // if (!GsaCloudApplication.mV2.contains(Build.MODEL ) && !GsaCloudApplication.mN5.contains(Build.MODEL)) {
settlementReportItem5s.add(new SectionTextItem5(selfFetchingText, selfFetchingNum, selfFetchingTotamout, selfFetchingAveragePrice, selfFetchingPercentage)); // settlementReportItem5s.add(new SectionTextItem5(selfFetchingText, selfFetchingNum, selfFetchingTotamout, selfFetchingAveragePrice, selfFetchingPercentage));
} // }
} else { } else {
selfFetchingText = ""; selfFetchingText = "";
} }
if (GsaCloudApplication.mV2.contains(Build.MODEL ) || GsaCloudApplication.mN5.contains(Build.MODEL)) { // if (GsaCloudApplication.mV2.contains(Build.MODEL ) || GsaCloudApplication.mN5.contains(Build.MODEL)) {
settlementReportItem5s.add(new SectionTextItem5("類別", canteenText, takewayText, selfFetchingText, null)); settlementReportItem5s.add(new SectionTextItem5("類別", canteenText, takewayText, selfFetchingText, null));
settlementReportItem5s.add(new SectionTextItem5("賬單", canteenNum, takewayNum, selfFetchingNum, null)); settlementReportItem5s.add(new SectionTextItem5("賬單", canteenNum, takewayNum, selfFetchingNum, null));
settlementReportItem5s.add(new SectionTextItem5("金額", canteenTotamout, takewayTotamout, selfFetchingTotamout, null)); settlementReportItem5s.add(new SectionTextItem5("金額", canteenTotamout, takewayTotamout, selfFetchingTotamout, null));
settlementReportItem5s.add(new SectionTextItem5("平均", canteenAveragePrice, takewayAveragePrice, selfFetchingAveragePrice, null)); settlementReportItem5s.add(new SectionTextItem5("平均", canteenAveragePrice, takewayAveragePrice, selfFetchingAveragePrice, null));
settlementReportItem5s.add(new SectionTextItem5("金額%", canteenPercentage, takewayPercentage, selfFetchingPercentage, null)); settlementReportItem5s.add(new SectionTextItem5("金額%", canteenPercentage, takewayPercentage, selfFetchingPercentage, null));
} // }
} }
if (analysisBeanMap != null && analysisBeanMap.size() > 0) { if (analysisBeanMap != null && analysisBeanMap.size() > 0) {
......
main-module/src/main/res/layout/activity_new_main.xml
...@@ -194,7 +194,8 @@ ...@@ -194,7 +194,8 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/dp_1" android:layout_height="@dimen/dp_1"
android:background="#F0F0F0" /> android:background="#F0F0F0"
android:visibility="gone"/>
<TextView <TextView
android:id="@+id/tv_function_name3" android:id="@+id/tv_function_name3"
...@@ -202,7 +203,7 @@ ...@@ -202,7 +203,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15" android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_20" android:layout_marginTop="@dimen/dp_20"
android:visibility="visible" android:visibility="gone"
android:textColor="#181818" android:textColor="#181818"
android:textSize="@dimen/dp_14" /> android:textSize="@dimen/dp_14" />
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
android:id="@+id/rv_staff_management" android:id="@+id/rv_staff_management"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="visible" android:visibility="gone"
android:layout_marginLeft="@dimen/main_recyclerview_marginLeft" android:layout_marginLeft="@dimen/main_recyclerview_marginLeft"
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/main_recyclerview_marginRight" /> android:layout_marginRight="@dimen/main_recyclerview_marginRight" />
...@@ -226,10 +227,11 @@ ...@@ -226,10 +227,11 @@
android:layout_marginRight="@dimen/dp_10" android:layout_marginRight="@dimen/dp_10"
app:hl_cornerRadius="@dimen/dp_4" app:hl_cornerRadius="@dimen/dp_4"
app:hl_dy="@dimen/main_shadow_dy" app:hl_dy="@dimen/main_shadow_dy"
android:visibility="visible" android:visibility="gone"
app:hl_shadowBackColor="@color/white" app:hl_shadowBackColor="@color/white"
app:hl_shadowColor="@color/shadow_color" app:hl_shadowColor="@color/shadow_color"
app:hl_shadowLimit="@dimen/main_shadow_limit"> app:hl_shadowLimit="@dimen/main_shadow_limit"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -264,7 +266,6 @@ ...@@ -264,7 +266,6 @@
</RelativeLayout> </RelativeLayout>
</com.gingersoft.gsa.cloud.ui.view.MyScrollView> </com.gingersoft.gsa.cloud.ui.view.MyScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout> </com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
manager-module/src/main/debug/AndroidManifest.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/manager_app_name" android:label="@string/manager_app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
......
other_order_mode/src/main/debug/AndroidManifest.xml
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
......
table-module/src/main/debug/AndroidManifest.xml
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/table_app_name" android:label="@string/table_app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:networkSecurityConfig="@xml/network_android" android:networkSecurityConfig="@xml/network_android"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment