Skip to content

android / dayu

Go to a project
Commit be280264 by 罗翻
Options

修改部分bug

parent 3d913069
Inline Side-by-side
Showing with 28 additions and 13 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
...@@ -241,8 +241,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -241,8 +241,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
} }
showHideFragment(2, mPosition); showHideFragment(2, mPosition);
mBind.ivMessage.setVisibility(View.GONE); mBind.ivMessage.setVisibility(View.GONE);
thirdFragment.setIndex(secondIndex); if (thirdFragment != null) {
thirdFragment.swtichFragment(secondIndex); thirdFragment.setIndex(secondIndex);
thirdFragment.swtichFragment(secondIndex);
}
} }
} }
} }
......
baseSDK/build.gradle
...@@ -18,6 +18,12 @@ android { ...@@ -18,6 +18,12 @@ android {
release { release {
minifyEnabled isReleaseMinify minifyEnabled isReleaseMinify
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' 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
...@@ -46,12 +46,12 @@ public class Constants { ...@@ -46,12 +46,12 @@ public class Constants {
* 演示环境 * 演示环境
*/ */
// public static final String ENVIROMENT = "demons"; // 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 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 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_SOP = "http://test.sop.dayu.ai/#/sop";
// public final static String WEB_ZHI_SHI = "http://test.sop.dayu.ai/#/detail"; // public final static String WEB_ZHI_SHI = "http://test.sop.dayu.ai/#/detail";
// public final static boolean IS_DEBUG = false; // public final static boolean IS_DEBUG = true;
/** /**
* 登录. * 登录.
......
build.gradle
...@@ -6,13 +6,14 @@ buildscript { ...@@ -6,13 +6,14 @@ buildscript {
ext.min_sdk_version = 16 ext.min_sdk_version = 16
ext.target_sdk_version = 23 ext.target_sdk_version = 23
ext.version_code = 8 ext.version_code = 8
ext.verson_name = "1.3.1" ext.verson_name = "1.4.0"
ext.gradle_version = '3.0.1' ext.gradle_version = '3.0.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
ext.arouter_compiler_version = '1.1.4' ext.arouter_compiler_version = '1.1.4'
repositories { repositories {
jcenter() jcenter()
google() google()
......
gradle.properties
...@@ -7,4 +7,4 @@ isMessageModule=true ...@@ -7,4 +7,4 @@ isMessageModule=true
isOrderModule=true isOrderModule=true
##maven依赖 ##maven依赖
mavenMode=false 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
...@@ -18,7 +18,8 @@ import io.reactivex.Observable; ...@@ -18,7 +18,8 @@ import io.reactivex.Observable;
import io.reactivex.functions.Function; 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> { public class HomeMessageFragment extends DataBindingFragment<FragmentMessageBinding> {
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderContract.java
...@@ -8,7 +8,8 @@ import java.util.ArrayList; ...@@ -8,7 +8,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* Created by luo on 2016/8/4. * Created by luofan
* on 2016/11/04.
*/ */
public interface ProcessOrderContract { public interface ProcessOrderContract {
......
orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
...@@ -29,9 +29,8 @@ import java.util.ArrayList; ...@@ -29,9 +29,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 工程师提交验收报告，包含上传照片 * Created by luofan
* on 2017/9/15. * on 2016/11/04.
* Created by yu
*/ */
public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, ActivityProcessOrderBinding> public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, ActivityProcessOrderBinding>
implements ProcessOrderContract.View { implements ProcessOrderContract.View {
...@@ -156,7 +155,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -156,7 +155,6 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, mImages); intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, mImages);
int DELETECODE = 0; int DELETECODE = 0;
startActivityForResult(intent, DELETECODE); startActivityForResult(intent, DELETECODE);
} }
@Override @Override
...@@ -169,6 +167,12 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac ...@@ -169,6 +167,12 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
if (mSelectList != null) { if (mSelectList != null) {
for (int a = 0; a < mSelectList.size(); a++) { for (int a = 0; a < mSelectList.size(); a++) {
mImages.add(mSelectList.get(a).getCompressPath()); 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); initPhotoView(mImages);
} }
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
...@@ -100,7 +100,6 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData ...@@ -100,7 +100,6 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
}else { }else {
startActivity(intent); startActivity(intent);
} }
} }
}); });
} }
......
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 sign in to comment