Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
be280264
authored
Apr 03, 2018
by
罗翻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分bug
parent
3d913069
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
26 additions
and
11 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
baseSDK/build.gradle
baseSDK/src/main/java/com/dayu/common/Constants.java
build.gradle
gradle.properties
messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderContract.java
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
View file @
be280264
...
...
@@ -241,11 +241,13 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
showHideFragment
(
2
,
mPosition
);
mBind
.
ivMessage
.
setVisibility
(
View
.
GONE
);
if
(
thirdFragment
!=
null
)
{
thirdFragment
.
setIndex
(
secondIndex
);
thirdFragment
.
swtichFragment
(
secondIndex
);
}
}
}
}
@Override
public
void
dumpReceActivity
()
{
...
...
baseSDK/build.gradle
View file @
be280264
...
...
@@ -18,6 +18,12 @@ android {
release
{
minifyEnabled
isReleaseMinify
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
buildConfigField
"String"
,
"BASEURL"
,
"\"${BASE_URL}\""
}
debug
{
minifyEnabled
isDebugMinify
proguardFiles
getDefaultProguardFile
(
'proguard-android.txt'
),
'proguard-rules.pro'
buildConfigField
"String"
,
"BASEURL"
,
"\"${BASE_URL}\""
}
}
...
...
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
be280264
...
...
@@ -46,12 +46,12 @@ public class Constants {
* 演示环境
*/
// public static final String ENVIROMENT = "demons";
// public final static int LOG_LEVEL = LogUtils.LEVEL_
OFF
;
// public final static int LOG_LEVEL = LogUtils.LEVEL_
ALL
;
// public final static String BASE_URL = "http://test.mobile.dayu.ai";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://test.sop.dayu.ai/#/sop";
// public final static String WEB_ZHI_SHI = "http://test.sop.dayu.ai/#/detail";
// public final static boolean IS_DEBUG =
fals
e;
// public final static boolean IS_DEBUG =
tru
e;
/**
* 登录.
...
...
build.gradle
View file @
be280264
...
...
@@ -6,13 +6,14 @@ buildscript {
ext
.
min_sdk_version
=
16
ext
.
target_sdk_version
=
23
ext
.
version_code
=
8
ext
.
verson_name
=
"1.
3.1
"
ext
.
verson_name
=
"1.
4.0
"
ext
.
gradle_version
=
'3.0.1'
ext
.
isReleaseMinify
=
false
ext
.
isDebugMinify
=
false
ext
.
arouter_api_version
=
'1.3.1'
ext
.
arouter_compiler_version
=
'1.1.4'
repositories
{
jcenter
()
google
()
...
...
gradle.properties
View file @
be280264
...
...
@@ -7,4 +7,4 @@ isMessageModule=true
isOrderModule
=
true
##maven依赖
mavenMode
=
false
BASE_URL
=
http://47.94.101.239:3112
\ No newline at end of file
messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java
View file @
be280264
...
...
@@ -18,7 +18,8 @@ import io.reactivex.Observable;
import
io.reactivex.functions.Function
;
/**
* Created by luofan on 2017/11/20.
* Created by luofan
* on 2017/11/20.
*/
public
class
HomeMessageFragment
extends
DataBindingFragment
<
FragmentMessageBinding
>
{
...
...
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderContract.java
View file @
be280264
...
...
@@ -8,7 +8,8 @@ import java.util.ArrayList;
import
java.util.List
;
/**
* Created by luo on 2016/8/4.
* Created by luofan
* on 2016/11/04.
*/
public
interface
ProcessOrderContract
{
...
...
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
View file @
be280264
...
...
@@ -29,9 +29,8 @@ import java.util.ArrayList;
import
java.util.List
;
/**
* 工程师提交验收报告,包含上传照片
* on 2017/9/15.
* Created by yu
* Created by luofan
* on 2016/11/04.
*/
public
class
ProcessOrderActivity
extends
BaseActivity
<
ProcessOrderPresenter
,
ActivityProcessOrderBinding
>
implements
ProcessOrderContract
.
View
{
...
...
@@ -156,7 +155,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
intent
.
putStringArrayListExtra
(
Constants
.
BUNDLE_KEY_ID
,
mImages
);
int
DELETECODE
=
0
;
startActivityForResult
(
intent
,
DELETECODE
);
}
@Override
...
...
@@ -169,6 +167,12 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
if
(
mSelectList
!=
null
)
{
for
(
int
a
=
0
;
a
<
mSelectList
.
size
();
a
++)
{
mImages
.
add
(
mSelectList
.
get
(
a
).
getCompressPath
());
// try {
// ExifInterface exif = new ExifInterface(mSelectList.get(a).getCompressPath());
// String time = exif.getAttribute(TAG_DATETIME);
// } catch (IOException e) {
// e.printStackTrace();
// }
}
initPhotoView
(
mImages
);
}
...
...
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
View file @
be280264
...
...
@@ -100,7 +100,6 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
}
else
{
startActivity
(
intent
);
}
}
});
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment