Skip to content

android / dayu

Go to a project
Commit 5b5648ff by 罗翻
Options

Merge remote-tracking branch 'origin/dev' into dev_1.0

parents 3a70a0f5 b61ecd3a
Inline Side-by-side
Showing with 456 additions and 482 deletions
annotation_lib/build.gradle deleted 100755 → 0
apply plugin: 'java'
sourceCompatibility = JavaVersion.VERSION_1_7
targetCompatibility = JavaVersion.VERSION_1_7
// 解决build警告：编码GBK的不可映射字符
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
annotation_lib/src/main/java/com/app/annotation/apt/ApiFactory.java deleted 100755 → 0
package com.app.annotation.apt;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Created by luofan on 2017/11/24.
*/
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface ApiFactory {
}
annotation_lib/src/main/java/com/app/annotation/apt/InstanceFactory.java deleted 100755 → 0
package com.app.annotation.apt;
/**
* Created by luofan on 2017/11/24.
*/
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
/**
* 实例化注解,会被主动添加到实例化工厂,自动生成newInstance代码
*/
public @interface InstanceFactory {
}
app/src/main/java/com/dayu/bigfish/ui/AboutUsActivity.java
......@@ -13,7 +13,7 @@ public class AboutUsActivity extends DataBindingActivity<AboutUsBinding> {
@Override
public int getLayoutId() {
return R.layout.activity_about_us;
return R.layout.app_activity_about_us;
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeFirstTabFragment.java
......@@ -6,14 +6,14 @@ import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.bigfish.R;
import com.dayu.bigfish.databinding.FragmentFirstBinding;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract;
import com.dayu.bigfish.presenter.main.MainPresenter;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
import com.umeng.analytics.MobclickAgent;
/**
* Created by luofan on 2017/11/20.
*/
public class HomeFirstTabFragment extends BaseFragment<MainPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
private static final String TAG = "HomeFirstTabFragment";
......
apt/build.gradle deleted 100755 → 0
apply plugin: 'java'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
dependencies {
compile project(':annotation_lib')
compile 'com.google.auto.service:auto-service:1.0-rc2'
compile 'com.squareup:javapoet:1.4.0'
}
// 解决build警告：编码GBK的不可映射字符
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}
apt/src/main/java/com/app/apt/AnnotationProcessor.java deleted 100755 → 0
package com.app.apt;
import com.app.apt.processor.ApiFactoryProcessor;
import com.app.apt.processor.InstanceProcessor;
import com.google.auto.service.AutoService;
import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Filer;
import javax.annotation.processing.Messager;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
/**
* Created by luofan on 2017/11/24.
*/
@AutoService(Processor.class)//自动生成 javax.annotation.processing.IProcessor 文件
@SupportedSourceVersion(SourceVersion.RELEASE_8)//java版本支持
@SupportedAnnotationTypes({//标注注解处理器支持的注解类型
"com.app.annotation.apt.InstanceFactory",
"com.app.annotation.apt.ApiFactory",
})
public class AnnotationProcessor extends AbstractProcessor {
public Filer mFiler; //文件相关的辅助类
public Elements mElements; //元素相关的辅助类
public Messager mMessager; //日志相关的辅助类
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
mFiler = processingEnv.getFiler();
mElements = processingEnv.getElementUtils();
mMessager = processingEnv.getMessager();
new ApiFactoryProcessor().process(roundEnv, this);
new InstanceProcessor().process(roundEnv, this);
return true;
}
}
apt/src/main/java/com/app/apt/inter/IProcessor.java deleted 100755 → 0
package com.app.apt.inter;
import com.app.apt.AnnotationProcessor;
import javax.annotation.processing.RoundEnvironment;
/**
* Created by luofan on 2017/11/24.
* 注解处理器接口
*/
public interface IProcessor {
void process(RoundEnvironment roundEnv, AnnotationProcessor mAbstractProcessor);
}
apt/src/main/java/com/app/apt/processor/ApiFactoryProcessor.java deleted 100755 → 0
package com.app.apt.processor;
import com.app.annotation.apt.ApiFactory;
import com.app.apt.AnnotationProcessor;
import com.app.apt.inter.IProcessor;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec;
import java.io.IOException;
import java.util.Objects;
import javax.annotation.processing.FilerException;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.util.ElementFilter;
import javax.tools.Diagnostic;
import static com.squareup.javapoet.TypeSpec.classBuilder;
import static javax.lang.model.element.Modifier.FINAL;
import static javax.lang.model.element.Modifier.PUBLIC;
import static javax.lang.model.element.Modifier.STATIC;
/**
* Created by luofan on 2017/11/24.
*/
public class ApiFactoryProcessor implements IProcessor {
@Override
public void process(RoundEnvironment roundEnv, AnnotationProcessor mAbstractProcessor) {
String CLASS_NAME = "ApiFactory";
TypeSpec.Builder tb = classBuilder(CLASS_NAME).addModifiers(PUBLIC, FINAL).addJavadoc("@ API工厂 代替model类");
try {
for (TypeElement element : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(ApiFactory.class))) {
mAbstractProcessor.mMessager.printMessage(Diagnostic.Kind.NOTE, "正在处理: " + element.toString());
for (Element e : element.getEnclosedElements()) {
ExecutableElement executableElement = (ExecutableElement) e;
MethodSpec.Builder methodBuilder =
MethodSpec.methodBuilder(e.getSimpleName().toString())
.addJavadoc("@此方法由apt自动生成")
.addModifiers(PUBLIC, STATIC);
// methodBuilder.returns(TypeName.get(executableElement.getReturnType()));
methodBuilder.returns(ClassName.get("io.reactivex", "Observable"));
String paramsString = "";
for (VariableElement ep : executableElement.getParameters()) {
methodBuilder.addParameter(TypeName.get(ep.asType()), ep.getSimpleName().toString());
paramsString += ep.getSimpleName().toString() + ",";
}
if (!(e.getSimpleName().toString()).equals("download")) {
methodBuilder.addStatement(
"return $T.getService()" +
".$L($L)"
+ ".compose($T.applySchedulers())"
, ClassName.get("com.dayu.bigfish.api", "Api")
, e.getSimpleName().toString()
, Objects.equals(paramsString, "") ? "" : paramsString.substring(0, paramsString.length() - 1)
, ClassName.get("com.dayu.bigfish.api", "Api"));
} else {
methodBuilder.addStatement(
"return $T.getService()" +
".$L($L)"
, ClassName.get("com.dayu.bigfish.api", "Api")
, e.getSimpleName().toString()
, paramsString.substring(0, paramsString.length() - 1));
}
tb.addMethod(methodBuilder.build());
}
}
JavaFile javaFile = JavaFile.builder("com.apt", tb.build()).build();// 生成源代码
javaFile.writeTo(mAbstractProcessor.mFiler);// 在 app module/build/generated/source/apt 生成一份源代码
} catch (FilerException e) {
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
}
apt/src/main/java/com/app/apt/processor/InstanceProcessor.java deleted 100755 → 0
package com.app.apt.processor;
import com.app.annotation.apt.InstanceFactory;
import com.app.apt.AnnotationProcessor;
import com.app.apt.inter.IProcessor;
import com.app.apt.util.Utils;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.CodeBlock;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.TypeSpec;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.processing.FilerException;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.ElementFilter;
import static com.squareup.javapoet.TypeSpec.classBuilder;
import static javax.lang.model.element.Modifier.FINAL;
import static javax.lang.model.element.Modifier.PUBLIC;
import static javax.lang.model.element.Modifier.STATIC;
/**
* Created by luofan on 2017/11/24.
*/
public class InstanceProcessor implements IProcessor {
@Override
public void process(RoundEnvironment roundEnv, AnnotationProcessor mAbstractProcessor) {
String CLASS_NAME = "InstanceFactory";
TypeSpec.Builder tb = classBuilder(CLASS_NAME).addModifiers(PUBLIC, FINAL).addJavadoc("@ 实例化工厂 此类由apt自动生成");
MethodSpec.Builder methodBuilder1 = MethodSpec.methodBuilder("create")
.addJavadoc("@此方法由apt自动生成")
.returns(Object.class).addModifiers(PUBLIC, STATIC).addException(IllegalAccessException.class).addException(InstantiationException.class)
.addParameter(Class.class, "mClass");
List<ClassName> mList = new ArrayList<>();
CodeBlock.Builder blockBuilder = CodeBlock.builder();
blockBuilder.beginControlFlow(" switch (mClass.getSimpleName())");//括号开始
try {
for (TypeElement element : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(InstanceFactory.class))) {
// mAbstractProcessor.mMessager.printMessage(Diagnostic.Kind.NOTE, "正在处理: " + element.toString());
if (!Utils.isValidClass(mAbstractProcessor.mMessager, element)) return;
ClassName currentType = ClassName.get(element);
if (mList.contains(currentType)) continue;
mList.add(currentType);
// String className = null;
// try {
// Class<?> clazz = element.getAnnotation(InstanceFactory.class).value();
// className = clazz.getCanonicalName();
// } catch (MirroredTypeException mte) {
// DeclaredType classTypeMirror = (DeclaredType) mte.getTypeMirror();
// TypeElement classTypeElement = (TypeElement) classTypeMirror.asElement();
// className = classTypeElement.getQualifiedName().toString();
// } catch (Exception e) {
// }
// if (className != null && !className.equals(InstanceFactory.class.getName())) {
// blockBuilder.addStatement("case $S: return new $T()", currentType.simpleName(), Utils.getType(className));//初始化Repository
// } else {
blockBuilder.addStatement("case $S: return new $T()", currentType.simpleName(), currentType);//初始化Presenter
// }
}
// methodBuilder1.returns(ClassName.get("com.dayu.bigfish.base","BasePresenter"));
blockBuilder.addStatement("default: return mClass.newInstance()");
blockBuilder.endControlFlow();
methodBuilder1.addCode(blockBuilder.build());
tb.addMethod(methodBuilder1.build());
JavaFile javaFile = JavaFile.builder(Utils.PackageName, tb.build()).build();// 生成源代码
javaFile.writeTo(mAbstractProcessor.mFiler);// 在 app module/build/generated/source/apt 生成一份源代码
} catch (FilerException e) {
} catch (IOException e) {
e.printStackTrace();
} catch (Exception e) {
e.printStackTrace();
}
}
}
apt/src/main/java/com/app/apt/util/NoPackageNameException.java deleted 100755 → 0
package com.app.apt.util;
import javax.lang.model.element.TypeElement;
public class NoPackageNameException extends Exception {
public NoPackageNameException(TypeElement typeElement) {
super("The package of " + typeElement.getSimpleName() + " has no name");
}
}
apt/src/main/java/com/app/apt/util/Utils.java deleted 100644 → 0
package com.app.apt.util;
import com.squareup.javapoet.ClassName;
import javax.annotation.processing.Messager;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
import javax.tools.Diagnostic;
import static javax.lang.model.element.Modifier.ABSTRACT;
import static javax.lang.model.element.Modifier.PUBLIC;
/**
* Created by baixiaokang on 16/8/3.
*/
public class Utils {
public static final String PackageName = "com.apt";
public static final String ANNOTATION = "@";
public static boolean isPublic(TypeElement element) {
return element.getModifiers().contains(PUBLIC);
}
public static boolean isAbstract(TypeElement element) {
return element.getModifiers().contains(ABSTRACT);
}
public static boolean isValidClass(Messager messager, TypeElement element) {
if (element.getKind() != ElementKind.CLASS) {
return false;
}
if (!isPublic(element)) {
String message = String.format("Classes annotated with %s must be public.", ANNOTATION);
messager.printMessage(Diagnostic.Kind.ERROR, message, element);
return false;
}
if (isAbstract(element)) {
String message = String.format("Classes annotated with %s must not be abstract.", ANNOTATION);
messager.printMessage(Diagnostic.Kind.ERROR, message, element);
return false;
}
return true;
}
public static String getPackageName(Elements elements, TypeElement typeElement) throws NoPackageNameException {
PackageElement pkg = elements.getPackageOf(typeElement);
if (pkg.isUnnamed()) {
throw new NoPackageNameException(typeElement);
}
return pkg.getQualifiedName().toString();
}
public static String getClassName(TypeElement typeElement) throws ClassNotFoundException {
return ClassName.get(typeElement).simpleName();
}
public static ClassName getType(String className) {
return ClassName.get(className.substring(0, className.lastIndexOf(".")),
className.substring(className.lastIndexOf(".") + 1, className.length()));
}
}
baseSDK/src/main/java/com/dayu/base/api/ServerException.java
......@@ -88,58 +88,58 @@ public class ServerException extends Exception {
/**全局错误*/
case "GLOBAL0001":
message = "未知错误GLOBAL0001"; //参数错误
message = BaseApplication.getContext().getString(R.string.global0001); //参数错误
break;
case "GLOBAL0002":
message = "未知错误GLOBAL0002"; //格式化序列化错误
message = BaseApplication.getContext().getString(R.string.global0002); //格式化序列化错误
break;
case "GLOBAL0003":
message = "未知错误GLOBAL0003"; //业务错误
message = BaseApplication.getContext().getString(R.string.global0003); //业务错误
break;
case "GLOBAL0004":
message = "未知错误GLOBAL0004"; //全局错误
message = BaseApplication.getContext().getString(R.string.global0004); //全局错误
break;
case "GLOBAL0100":
message = "未知错误GLOBAL0100"; //远程调用失败
message = BaseApplication.getContext().getString(R.string.global0100); //远程调用失败
break;
case "GLOBAL0101":
message = "验证码错误"; //短信验证失败
message = BaseApplication.getContext().getString(R.string.global0101); //短信验证失败
break;
case "GLOBAL0102":
message = "未知错误GLOBAL0102"; // unknowable error type
message = BaseApplication.getContext().getString(R.string.global0102); // unknowable error type
break;
case "GLOBAL0103":
message = "验证码错误";
message = BaseApplication.getContext().getString(R.string.global0103);
break;
case "GLOBAL0104":
message = "用户名和密码错误";
message = BaseApplication.getContext().getString(R.string.global0104);
break;
case "GLOBAL0400":
message = "未知错误GLOBAL0400"; //Bad Request!
message = BaseApplication.getContext().getString(R.string.global0400); //Bad Request!
break;
case "GLOBAL0406":
message = "未知错误GLOBAL0406"; //not Acceptable
message = BaseApplication.getContext().getString(R.string.global0406); //not Acceptable
break;
case "GLOBAL0405":
message = "未知错误GLOBAL0405"; //Method Not Allowed
message = BaseApplication.getContext().getString(R.string.global0405); //Method Not Allowed
break;
case "GLOBAL0500":
message = "未知错误GLOBAL0500"; //Method Not Allowed
message = BaseApplication.getContext().getString(R.string.global0500); //Method Not Allowed
break;
case "GLOBAL1001":
message = "未知错误GLOBAL1001"; //空指针异常
message = BaseApplication.getContext().getString(R.string.global1001); //空指针异常
break;
case "GLOBAL1002":
message = "未知错误GLOBAL1002"; //类型转换异
message = BaseApplication.getContext().getString(R.string.global1002); //类型转换异
break;
case "GLOBAL1003":
message = "未知错误GLOBAL1003"; //IO异常
message = BaseApplication.getContext().getString(R.string.global1003); //IO异常
break;
case "GLOBAL1004":
message = "未知错误GLOBAL1004"; //未知方法异
message = BaseApplication.getContext().getString(R.string.global1004); //未知方法异
break;
case "GLOBAL1005":
message = "未知错误GLOBAL1005"; //数据越界异
message = BaseApplication.getContext().getString(R.string.global1005); //数据越界异
break;
default:
message = BaseApplication.getContext().getString(R.string.get_info_failed);
......
baseSDK/src/main/java/com/dayu/utils/AppUtils.java
......@@ -4,6 +4,7 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.telephony.TelephonyManager;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
......@@ -35,7 +36,7 @@ public class AppUtils {
return packageName;
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return "解析版本号失败";
return BaseApplication.getContext().getString(R.string.error_verison_code);
}
......
baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
......@@ -34,26 +34,4 @@ public class GlideImageLoader {
.apply(options)
.into(view);
}
// *//**
// * 下载图片转换圆角
// * @param mContext
// * @param imageRes
// * @param view
// * @param radius
// *//*
// public static void loadAdapterRadius(Context mContext, @DrawableRes int imageRes, ImageView view, int radius){
// DrawableRequestBuilder requestBuilder = Glide.with(mContext)
// .load(imageRes)
// .centerCrop()
// .crossFade()
// .transform(new GlideRoundTransform(mContext, radius))
// .diskCacheStrategy(DiskCacheStrategy.ALL);
// requestBuilder.into(view);
// }
//
// public static void clear(Context mContext) {
// Glide.get(mContext).clearMemory();
// }*/
}
baseSDK/src/main/java/com/dayu/utils/NetworkConnectChangedReceiver.java
package com.dayu.utils;
/**
* Created by yu on 2017/10/24.
package com.dayu.utils; /**
* Created by yu
* on 2017/10/24.
*/
import android.content.BroadcastReceiver;
......@@ -13,6 +12,9 @@ import android.net.wifi.WifiManager;
import android.os.Parcelable;
import android.util.Log;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
/**
* 网络改变监控广播
* <p>
......@@ -25,9 +27,9 @@ public class NetworkConnectChangedReceiver extends BroadcastReceiver {
private String getConnectionType(int type) {
String connType = "";
if (type == ConnectivityManager.TYPE_MOBILE) {
connType = "3G网络数据";
connType = BaseApplication.getContext().getString(R.string.net_3G);
} else if (type == ConnectivityManager.TYPE_WIFI) {
connType = "WIFI网络";
connType = BaseApplication.getContext().getString(R.string.net_wifi);
}
return connType;
}
......@@ -76,7 +78,7 @@ public class NetworkConnectChangedReceiver extends BroadcastReceiver {
}
} else {
ToastUtils.showShortToast("网络断开,请检查网络");
ToastUtils.showShortToast(BaseApplication.getContext().getString(R.string.net_not_connect));
}
}
}
......
baseSDK/src/main/java/com/dayu/utils/ProgressUtil.java
......@@ -16,6 +16,7 @@ import android.view.WindowManager;
import android.widget.TextView;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
import java.util.List;
......@@ -162,7 +163,7 @@ public class ProgressUtil {
Message mssage = new Message();
mssage.what = START_DIALOG;
mssage.obj = "加载中...";
mssage.obj = BaseApplication.getContext().getString(R.string.loading);
handler.sendMessage(mssage);
}
......
baseSDK/src/main/java/com/dayu/utils/TimeCountUtil.java
......@@ -7,6 +7,7 @@ import android.text.SpannableString;
import android.widget.Button;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
/**
......@@ -42,7 +43,7 @@ public class TimeCountUtil extends CountDownTimer {
@Override
public void onFinish() {
btn.setText("重新发送");
btn.setText(BaseApplication.getContext().getString(R.string.send_again));
btn.setClickable(true);//重新获得点击
btn.setBackgroundResource(R.drawable.btn_register_selector);
}
......
baseSDK/src/main/java/com/dayu/widgets/CustomDialog.java
......@@ -89,12 +89,12 @@ public class CustomDialog extends Dialog implements View.OnClickListener {
}
private void initView() {
contentTxt = (TextView) findViewById(R.id.content);
titleTxt = (TextView) findViewById(R.id.title);
contentTxt = findViewById(R.id.content);
titleTxt = findViewById(R.id.title);
line = findViewById(R.id.v_line);
submitTxt = (TextView) findViewById(R.id.submit);
submitTxt = findViewById(R.id.submit);
submitTxt.setOnClickListener(this);
cancelTxt = (TextView) findViewById(R.id.cancel);
cancelTxt = findViewById(R.id.cancel);
cancelTxt.setOnClickListener(this);
contentTxt.setText(content);
......
baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java
......@@ -18,6 +18,7 @@ import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.adapter.TypeSelector;
import com.dayu.base.ui.presenter.BaseListPresenter;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
import com.dayu.utils.ProgressUtil;
import com.dayu.widgets.listener.OnItemClickListener;
import com.dayu.widgets.listener.OnRefreshListener;
......@@ -97,10 +98,10 @@ public class LRecyclerView<M, B> extends FrameLayout {
//初始化recycleview
View layout = inflate(context, R.layout.lrecycle_layout, this);
swipeRefresh = (SwipeRefreshLayout) layout.findViewById(R.id.swiperefresh);
recyclerview = (RecyclerView) layout.findViewById(R.id.recyclerview);
ll_emptyView = (LinearLayout) layout.findViewById(R.id.ll_emptyview);
ll_faileView = (LinearLayout) layout.findViewById(R.id.ll_faileview);
swipeRefresh = layout.findViewById(R.id.swiperefresh);
recyclerview = layout.findViewById(R.id.recyclerview);
ll_emptyView = layout.findViewById(R.id.ll_emptyview);
ll_faileView = layout.findViewById(R.id.ll_faileview);
swipeRefresh.setColorSchemeResources(R.color.cl_receiving_order_item_data);
mLayoutManager = new LinearLayoutManager(context);
......@@ -114,7 +115,7 @@ public class LRecyclerView<M, B> extends FrameLayout {
setViewType(itemType);
recyclerview.setAdapter(mCoreAdapter);
} else {
throw new RuntimeException("提示:需要先传入itemtype");
throw new RuntimeException(BaseApplication.getContext().getString(R.string.first_afferent_itemtype));
}
}
if (isReverse) {
......
baseSDK/src/main/res/layout/lrecycle_layout.xml
......@@ -41,7 +41,7 @@
android:layout_below="@id/iv_empty"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_13"
android:text="暂无数据(点击刷新)"
android:text="@string/no_data_press_refresh"
android:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
</LinearLayout>
......@@ -66,7 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:text="加载出错啦"
android:text="@string/load_error"
android:textColor="#c9c9c9"
android:textSize="17.3sp" />
......@@ -80,7 +80,7 @@
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="4dp"
android:text="重新加载"
android:text="@string/load_again"
android:textSize="15.4sp" />
</LinearLayout>
......
baseSDK/src/main/res/layout/lrecycler_foot.xml
......@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:clickable="@{item == null?true:false}"
android:text='@{item !=null? (item?"正在加载" :"没有更多数据"):"加载失败(再次上拉试试~)"}' />
android:text='@{item !=null? (item?@string/is_loading :@string/have_no_data):@string/try_load_again}' />
</LinearLayout>
......
baseSDK/src/main/res/values/strings.xml
......@@ -96,6 +96,17 @@
<string name="get_account_list_error">获取账户列表失败!</string>
<string name="error_serve">服务器异常!</string>
<string name="error_loadmore">亲，已经到最底部了!</string>
<string name="net_3G">3G网络数据</string>
<string name="net_wifi">WIFI网络</string>
<string name="net_not_connect">网络断开，请检查网络</string>
<string name="send_again">重新发送</string>
<string name="first_afferent_itemtype">提示:需要先传入itemtype</string>
<string name="no_data_press_refresh">暂无数据(点击刷新)</string>
<string name="load_error">加载出错了啦</string>
<string name="load_again">重新加载</string>
<string name="is_loading">正在加载</string>
<string name="have_no_data">没有更多数据</string>
<string name="try_load_again">加载失败(再次上拉试试~)</string>
<!--提现账户-->
<string name="title_withdrawals">提现账户</string>
<string name="alipay_account">支付宝账号</string>
......@@ -212,7 +223,7 @@
<string name="submit_order">提交验收</string>
<string name="find_customer_mobile">搜索客户手机号</string>
<string name="pre_look">预览</string>
<string name="loading">加载中</string>
<string name="loading">加载中...</string>
<string name="order_subsidy">工单补贴</string>
<string name="order_save_success">数据保存成功</string>
<string name="no_data">暂无数据</string>
......@@ -259,6 +270,32 @@
<string name="modify_part_info">修改信息</string>
<string name="customer_acceptance">客户验收</string>
<string name="scan_code_for_appointment">请扫描二维码验收</string>
<string name="order_record">工单记录</string>
<string name="order_num">工单编号</string>
<string name="order_state">工单状态</string>
<string name="server_name">服务名称</string>
<string name="prodcut">产&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;品</string>
<string name="prodcut_type">类&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;型</string>
<string name="door_time">上门时间</string>
<string name="order_remark">工单备注</string>
<string name="order_attachment">附&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;件</string>
<string name="customer_info">客户信息</string>
<string name="customer_type">客户类型</string>
<string name="customer_name">客户姓名</string>
<string name="lookforword_time">期望时间</string>
<string name="prodcut_info">产品信息</string>
<string name="prodcut_brand">品&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;牌</string>
<string name="prodcut_num">型&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;号</string>
<string name="quality_assurance_info">质保信息</string>
<string name="sn_num">SN&#160;&#160;&#160;&#160;&#160;&#160;码</string>
<string name="charge_record">收费记录</string>
<string name="total_money">总金额数</string>
<string name="door_money">上门费用</string>
<string name="server_money">服务费用</string>
<string name="material_money">材料费用</string>
<string name="other_money">其他费用</string>
<string name="remark">备&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;注</string>
<string name="no_charge_record">暂无收费记录</string>
<!--消息-->
......@@ -336,6 +373,10 @@
<string name="identity_not_empty">身份证号不能为空</string>
<string name="identity_error">请输入正确的身份证号码</string>
<string name="identityurl_not_empty">身份证照片不能为空</string>
<string name="modify_header_failed">修改头像失败</string>
<string name="input_real_name">请输入真实姓名</string>
<string name="input_identity">请输入证件号</string>
<string name="no_header">暂无头像</string>
<!--error-->
......@@ -373,6 +414,27 @@
<string name="perameter_is_null">参数为空</string>
<string name="identity_is_error">身份证号不合法</string>
<string name="not_audite_aviliable">该工程师不处于审核拒绝状态</string>
<string name="error_verison_code">解析版本号失败</string>
<string name="global0001">未知错误GLOBAL0001</string>
<string name="global0002">未知错误GLOBAL0002</string>
<string name="global0003">未知错误GLOBAL0003</string>
<string name="global0004">未知错误GLOBAL0004</string>
<string name="global0100">未知错误GLOBAL0100</string>
<string name="global0101">验证码错误</string>
<string name="global0102">未知错误GLOBAL0102</string>
<string name="global0103">验证码错误</string>
<string name="global0104">用户名和密码错误</string>
<string name="global0400">未知错误GLOBAL0400</string>
<string name="global0406">未知错误GLOBAL0406</string>
<string name="global0405">未知错误GLOBAL0405</string>
<string name="global0500">未知错误GLOBAL0500</string>
<string name="global1001">未知错误GLOBAL1001</string>
<string name="global1002">未知错误GLOBAL1002</string>
<string name="global1003">未知错误GLOBAL1003</string>
<string name="global1004">未知错误GLOBAL1004</string>
<string name="global1005">未知错误GLOBAL1005</string>
<string name="agreement">
......
locationComponent/src/main/AndroidManifest.xml
......@@ -4,5 +4,9 @@
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true"/>
android:supportsRtl="true">
<activity
android:name=".base.BasicMapActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
locationComponent/src/main/java/com/dayu/location/base/BasicMapActivity.java 0 → 100644
package com.dayu.location.base;
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.util.Log;
import com.amap.api.location.AMapLocation;
import com.amap.api.location.AMapLocationClient;
import com.amap.api.location.AMapLocationClientOption;
import com.amap.api.location.AMapLocationListener;
import com.amap.api.maps2d.AMap;
import com.amap.api.maps2d.CameraUpdateFactory;
import com.amap.api.maps2d.LocationSource;
import com.amap.api.maps2d.MapView;
import com.amap.api.maps2d.model.MyLocationStyle;
import com.dayu.location.R;
/**
* AMapV1地图中介绍如何显示世界图
*/
public class BasicMapActivity extends Activity implements LocationSource,AMapLocationListener{
private MapView mapView;
private AMap aMap;
private OnLocationChangedListener mListener;
private AMapLocationClient mlocationClient;
private AMapLocationClientOption mLocationOption;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.basicmap_activity);
mapView = findViewById(R.id.map);
mapView.onCreate(savedInstanceState);// 此方法必须重写
init();
}
/**
* 初始化AMap对象
*/
private void init() {
if (aMap == null) {
aMap = mapView.getMap();
setUpMap();
addMarkersToMap();// 往地图上添加marker
}
}
/**
* 设置一些amap的属性
*/
private void setUpMap() {
aMap.setLocationSource(this);// 设置定位监听
aMap.getUiSettings().setMyLocationButtonEnabled(true);// 设置默认定位按钮是否显示
aMap.setMyLocationEnabled(true);// 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
setupLocationStyle();
}
private void setupLocationStyle(){
// 自定义系统定位蓝点
MyLocationStyle myLocationStyle = new MyLocationStyle();
// 自定义定位蓝点图标
// myLocationStyle.myLocationIcon(BitmapDescriptorFactory.
// fromResource(R.drawable.gps_point));
// 自定义精度范围的圆形边框颜色
// myLocationStyle.strokeColor(STROKE_COLOR);
//自定义精度范围的圆形边框宽度
myLocationStyle.strokeWidth(5);
// 设置圆形的填充颜色
myLocationStyle.radiusFillColor(Color.TRANSPARENT);
// 将自定义的 myLocatio、nStyle 对象添加到地图上
aMap.setMyLocationStyle(myLocationStyle);
}
/**
* 在地图上添加marker
*/
private void addMarkersToMap() {
// markerOption = new MarkerOptions().icon(BitmapDescriptorFactory
// .defaultMarker(BitmapDescriptorFactory.HUE_AZURE))
// .position(latlng)
// .draggable(true);
// aMap.addMarker(markerOption);
}
/**
* 方法必须重写
*/
@Override
protected void onResume() {
super.onResume();
mapView.onResume();
}
/**
* 方法必须重写
*/
@Override
protected void onPause() {
super.onPause();
mapView.onPause();
deactivate();
}
/**
* 方法必须重写
*/
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
mapView.onSaveInstanceState(outState);
}
/**
* 方法必须重写
*/
@Override
protected void onDestroy() {
super.onDestroy();
mapView.onDestroy();
if(null != mlocationClient){
mlocationClient.onDestroy();
}
}
@Override
public void onLocationChanged(AMapLocation amapLocation) {
if (mListener != null && amapLocation != null) {
if (amapLocation != null
&& amapLocation.getErrorCode() == 0) {
mListener.onLocationChanged(amapLocation);// 显示系统小蓝点
aMap.moveCamera(CameraUpdateFactory.zoomTo(18));
} else {
String errText = "定位失败," + amapLocation.getErrorCode()+ ": " + amapLocation.getErrorInfo();
Log.e("AmapErr",errText);
}
}
}
@Override
public void activate(OnLocationChangedListener onLocationChangedListener) {
mListener = onLocationChangedListener;
if (mlocationClient == null) {
mlocationClient = new AMapLocationClient(this);
mLocationOption = new AMapLocationClientOption();
//设置定位监听
mlocationClient.setLocationListener(this);
//设置为高精度定位模式
mLocationOption.setLocationMode(AMapLocationClientOption.AMapLocationMode.Hight_Accuracy);
//设置定位参数
mlocationClient.setLocationOption(mLocationOption);
// 此方法为每隔固定时间会发起一次定位请求，为了减少电量消耗或网络流量消耗，
// 注意设置合适的定位时间的间隔（最小间隔支持为2000ms），并且在合适时间调用stopLocation()方法来取消定位请求
// 在定位结束后，在合适的生命周期调用onDestroy()方法
// 在单次定位情况下，定位无论成功与否，都无需调用stopLocation()方法移除请求，定位sdk内部会移除
mlocationClient.startLocation();
}
}
@Override
public void deactivate() {
mListener = null;
if (mlocationClient != null) {
mlocationClient.stopLocation();
mlocationClient.onDestroy();
}
mlocationClient = null;
}
}
locationComponent/src/main/java/com/dayu/location/base/OpenLocalMapUtil.java 0 → 100644
package com.dayu.location.base;
import java.io.File;
/**
* Created by luofan
* on 2018/2/28.
*/
public class OpenLocalMapUtil {
/**
* 地图应用是否安装
* @return
*/
public static boolean isGdMapInstalled(){
return isInstallPackage("com.autonavi.minimap");
}
public static boolean isBaiduMapInstalled(){
return isInstallPackage("com.baidu.BaiduMap");
}
private static boolean isInstallPackage(String packageName) {
return new File("/data/data/" + packageName).exists();
}
/**
* 获取打开百度地图应用uri [http://lbsyun.baidu.com/index.php?title=uri/api/android]
* @param originLat
* @param originLon
* @param desLat
* @param desLon
* @return
*/
public static String getBaiduMapUri(String originLat, String originLon, String originName, String desLat, String desLon, String destination, String region, String src){
String uri = "intent://map/direction?origin=latlng:%1$s,%2$s|name:%3$s" +
"&destination=latlng:%4$s,%5$s|name:%6$s&mode=driving&region=%7$s&src=%8$s#Intent;" +
"scheme=bdapp;package=com.baidu.BaiduMap;end";
return String.format(uri, originLat, originLon, originName, desLat, desLon, destination, region, src);
}
/**
* 获取打开高德地图应用uri
*/
public static String getGdMapUri(String appName, String slat, String slon, String sname, String dlat, String dlon, String dname){
String uri = "androidamap://route?sourceApplication=%1$s&slat=%2$s&slon=%3$s&sname=%4$s&dlat=%5$s&dlon=%6$s&dname=%7$s&dev=0&m=0&t=2";
return String.format(uri, appName, slat, slon, sname, dlat, dlon, dname);
}
/**
* 网页版百度地图 有经纬度
* @param originLat
* @param originLon
* @param originName ->注：必填
* @param desLat
* @param desLon
* @param destination
* @param region : 当给定region时，认为起点和终点都在同一城市，除非单独给定起点或终点的城市。-->注：必填，不填不会显示导航路线
* @param appName
* @return
*/
public static String getWebBaiduMapUri(String originLat, String originLon, String originName, String desLat, String desLon, String destination, String region, String appName) {
String uri = "http://api.map.baidu.com/direction?origin=latlng:%1$s,%2$s|name:%3$s" +
"&destination=latlng:%4$s,%5$s|name:%6$s&mode=driving&region=%7$s&output=html" +
"&src=%8$s";
return String.format(uri, originLat, originLon, originName, desLat, desLon, destination, region, appName);
}
/**
* 百度地图定位经纬度转高德经纬度
* @param bd_lat
* @param bd_lon
* @return
*/
public static double[] bdToGaoDe(double bd_lat, double bd_lon) {
double[] gd_lat_lon = new double[2];
double PI = 3.14159265358979324 * 3000.0 / 180.0;
double x = bd_lon - 0.0065, y = bd_lat - 0.006;
double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * PI);
double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * PI);
gd_lat_lon[0] = z * Math.cos(theta);
gd_lat_lon[1] = z * Math.sin(theta);
return gd_lat_lon;
}
/**
* 高德地图定位经纬度转百度经纬度
* @param gd_lon
* @param gd_lat
* @return
*/
public static double[] gaoDeToBaidu(double gd_lon, double gd_lat) {
double[] bd_lat_lon = new double[2];
double PI = 3.14159265358979324 * 3000.0 / 180.0;
double x = gd_lon, y = gd_lat;
double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * PI);
double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * PI);
bd_lat_lon[0] = z * Math.cos(theta) + 0.0065;
bd_lat_lon[1] = z * Math.sin(theta) + 0.006;
return bd_lat_lon;
}
}
locationComponent/src/main/res/layout/basicmap_activity.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.amap.api.maps2d.MapView
android:id="@+id/map"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</RelativeLayout>
messageCenter/src/main/res/layout/activity_message_detail.xml
......@@ -42,7 +42,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_7"
android:text="2017-08-12"
android:textColor="@color/text_color"
android:textSize="10sp"
/>
......@@ -55,7 +54,6 @@
android:layout_marginRight="@dimen/dp_30"
android:layout_marginTop="35.7dp"
android:layout_weight="1"
android:text="2017-08-12"
android:textColor="@color/cl_home_title_text_color"
android:textSize="13.3sp"
/>
......
messageCenter/src/main/res/layout/item_message_layout.xml
......@@ -89,7 +89,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/dp_21.3"
android:layout_toRightOf="@id/message_text_content"
android:text="未读"
android:text="@string/not_read"
android:textColor="@color/cl_tab_read"
android:textSize="@dimen/sp_10"
android:visibility='@{item.read ==1?View.GONE:View.VISIBLE}'
......
orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
......@@ -124,11 +124,11 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
params.put("id", orderId);
params.put("isPay", isPay);
params.put("materialCost", materialCost);
params.put("materialCostComment", "暂无");
params.put("materialCostComment", "");
params.put("otherPrice", otherPrice);
params.put("otherPriceComment", "暂无");
params.put("otherPriceComment", "");
params.put("servicePrice", servicePrice);
params.put("servicePriceComment", "暂无");
params.put("servicePriceComment", "");
//照片上传
if (imageUrl != null) {
StringBuilder str = new StringBuilder();
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
......@@ -53,6 +53,7 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
public void initDataView(OrderDetail dataBean) {
mBind.tvOrderState.setText(getStaus(dataBean.getStatus()));
mBind.tvLookMore.setOnClickListener(o -> lookMore());
mBind.tvCustomerAddress.setOnClickListener(o -> openMap());
mBind.llServerInstruction.setOnClickListener(v -> dumpToServerInstruction());
if (dataBean.getStatus() == 4 && dataBean.getSubStatus() == 6) {
mBind.customerAcceptance.setVisibility(View.VISIBLE);
......@@ -86,6 +87,10 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
}
}
private void openMap() {
}
public void lookMore() {
if (mFlag) {
mFlag = false;
......@@ -132,7 +137,7 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, mDetail.getSpuId());
Intent intent = new Intent(mActivity, ServerInstructionActivity.class);
intent.putExtra(Constants.BUNDLE,bundle);
intent.putExtra(Constants.BUNDLE, bundle);
startActivity(intent);
}
}
orderCenter/src/main/res/layout/activity_order_record.xml
......@@ -25,7 +25,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/text_title"
android:text="工单记录" />
android:text="@string/order_record" />
<ImageView
android:id="@+id/title_back"
......
orderCenter/src/main/res/layout/activity_test.xml
......@@ -6,7 +6,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="测试一下"
/>
</FrameLayout>
orderCenter/src/main/res/layout/fragment_order_datails.xml
......@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<ScrollView
<android.support.v4.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
......@@ -55,7 +55,7 @@
android:layout_below="@id/text_title_order"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="工单编号"
android:text="@string/order_num"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -78,7 +78,7 @@
android:layout_below="@id/text_one"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="工单状态"
android:text="@string/order_state"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -100,7 +100,7 @@
android:layout_below="@id/text_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="服务名称"
android:text="@string/server_name"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -123,7 +123,7 @@
android:layout_below="@id/tv_serve_name"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="产 品"
android:text="@string/prodcut"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -146,7 +146,7 @@
android:layout_below="@id/text_three"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="类 型"
android:text="@string/prodcut_type"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -168,7 +168,7 @@
android:layout_below="@id/tv_type"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="上门时间"
android:text="@string/door_time"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -192,7 +192,7 @@
android:layout_below="@id/tv_door_time"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="工单备注"
android:text="@string/order_remark"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -222,7 +222,7 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tv_order_rmark"
android:gravity="center_horizontal"
android:text="查看更多"
android:text="@string/look_more"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="13.3sp"
android:visibility="gone" />
......@@ -242,7 +242,7 @@
android:id="@+id/tv_fujian"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="附 件"
android:text="@string/order_attachment"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -274,7 +274,7 @@
android:layout_below="@id/line_one"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_10"
android:text="客户信息"
android:text="@string/customer_info"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -285,7 +285,7 @@
android:layout_below="@id/two_text_one"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="客户类型"
android:text="@string/customer_type"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -308,7 +308,7 @@
android:layout_below="@id/two_text_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="客户姓名"
android:text="@string/customer_name"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -331,7 +331,7 @@
android:layout_below="@id/two_text_three"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="联系方式"
android:text="@string/tv_two_text_three"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -354,7 +354,7 @@
android:layout_below="@id/two_text_four"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="客户地址"
android:text="@string/tv_two_text_foure"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -379,7 +379,7 @@
android:layout_below="@id/two_text_five"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="期望时间"
android:text="@string/lookforword_time"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -411,7 +411,7 @@
android:layout_below="@id/line_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_10"
android:text="产品信息"
android:text="@string/prodcut_info"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -422,7 +422,7 @@
android:layout_below="@id/three_text_one"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="品 牌"
android:text="@string/prodcut_brand"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -446,7 +446,7 @@
android:layout_below="@id/three_text_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="型 号"
android:text="@string/prodcut_num"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -470,7 +470,7 @@
android:layout_below="@id/three_two_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="质保信息"
android:text="@string/quality_assurance_info"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -492,7 +492,7 @@
android:layout_below="@id/three_four_four"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="SN码"
android:text="@string/sn_num"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -529,7 +529,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_10"
android:text="收费记录"
android:text="@string/charge_record"
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_13.3" />
......@@ -540,7 +540,7 @@
android:layout_below="@id/four_text_one"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="总金额数"
android:text="@string/total_money"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -563,7 +563,7 @@
android:layout_below="@id/four_text_two"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="上门费用"
android:text="@string/door_money"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -587,7 +587,7 @@
android:layout_below="@id/four_text_three"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="服务费用"
android:text="@string/server_money"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -610,7 +610,7 @@
android:layout_below="@id/four_text_five"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="材料费用"
android:text="@string/material_money"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -633,7 +633,7 @@
android:layout_below="@id/four_text_seven"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="其他费用"
android:text="@string/other_money"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -656,7 +656,7 @@
android:layout_below="@id/four_text_nine"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_13"
android:text="备 注"
android:text="@string/remark"
android:textColor="@color/cl_order_text_one"
android:textSize="@dimen/sp_13.3" />
......@@ -686,14 +686,14 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20"
android:text="暂无收费记录"
android:text="@string/no_charge_record"
android:textColor="@color/cl_black"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</ScrollView>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/customer_acceptance"
......
userCenter/src/main/java/com/dayu/usercenter/presenter/modifyperson/ModifyPersonPresenter.java
......@@ -94,7 +94,7 @@ public class ModifyPersonPresenter extends ModifyPersonContract.Presenter {
if (list != null && list.size() > 0) {
modifyUserInfo(mRealName.get(), mIdentity.get(), list.get(0));
} else {
mView.showToast("修改头像失败");
mView.showToast(R.string.modify_header_failed);
}
}));
}
......
userCenter/src/main/java/com/dayu/usercenter/presenter/myhead/MyHeadPresenter.java
......@@ -4,6 +4,7 @@ import android.databinding.ObservableField;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.event.UserInfo;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.utils.UserManager;
......@@ -40,7 +41,7 @@ public class MyHeadPresenter extends MyHeadContract.Presenter {
if (list != null && list.size() > 0) {
modifyHead(list.get(0));
} else {
mView.showToast("修改头像失败");
mView.showToast(R.string.modify_header_failed);
}
}));
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomePersonFragment.java
......@@ -245,7 +245,6 @@ public class HomePersonFragment extends BaseFragment<HomePersonPresenter, Fragme
starImg.setImageBitmap(bm);
starLinearLayout.addView(starImg, layoutParams);
}
}
@Override
......
userCenter/src/main/res/layout/activity_modify_person_activity.xml
......@@ -73,7 +73,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入真实姓名"
android:hint="@string/input_real_name"
android:textColor="@color/default_editext_color"
android:text="@={presenter.mRealName}"
android:textSize="15sp" />
......@@ -107,7 +107,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="35dp"
android:background="@null"
android:hint="请输入证件号"
android:hint="@string/input_identity"
android:text="@={presenter.mIdentity}"
android:textColor="@color/default_editext_color"
android:textSize="15sp" />
......
userCenter/src/main/res/layout/activity_test.xml
......@@ -6,7 +6,6 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="测试一下"
/>
</FrameLayout>
userCenter/src/main/res/layout/fragment_personal_center.xml
......@@ -71,7 +71,7 @@
android:layout_height="15dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="149.3dp"
android:text="个人资料"
android:text="@string/personal_info"
android:textColor="@color/white"
android:textSize="11sp" />
......
userCenter/src/main/res/layout/my_header_activity.xml
......@@ -83,7 +83,7 @@
android:layout_below="@id/iv_empty"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_13"
android:text="暂无头像"
android:text="@string/no_header"
android:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
</LinearLayout>
......
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