Skip to content

android / dayu

Go to a project
Commit 96ae58af by 罗翻
Options

Base类修改

parent b0a3d150
Inline Side-by-side
Showing with 408 additions and 968 deletions
app/src/main/AndroidManifest.xml
......@@ -163,11 +163,11 @@
android:screenOrientation="portrait"
/>
<activity
android:name=".ui.AccountBalanceActivity"
android:name=".ui.AccountBalanceActivity1"
android:screenOrientation="portrait"
/>
<activity
android:name=".ui.AccountBalanceTest"
android:name=".ui.AccountBalanceActivity"
android:screenOrientation="portrait"
/>
<activity
......
app/src/main/java/com/dayu/bigfish/Constants.java
......@@ -84,7 +84,7 @@ public class Constants {
/***********************其他配置**********************************/
public final static int PAGESIZE = 10;
public final static int PAGESIZE = 20;
//相册选择照片删除时传递的key
public final static String BUNDLE_KEY_ID = "BUNDLE_KEY_ID";
//工程师的账户余额
......
app/src/main/java/com/dayu/bigfish/base/BaseActivity.java
package com.dayu.bigfish.base;
import android.app.Activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.databinding.ViewDataBinding;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
......@@ -15,27 +13,27 @@ import io.reactivex.disposables.CompositeDisposable;
/**
* Created by luofan on 17/11/02.
*/
public abstract class BaseActivity<P extends BasePresenter> extends AppCompatActivity {
public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingActivity<B> {
public P mPresenter;
protected Activity mActivity;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(this.getLayoutId());
mActivity = this;
protected void initPresenter() {
super.initPresenter();
if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass);
if (mPresenter != null) mPresenter.setView(this, mActivity);
if (mPresenter != null) {
mPresenter.setView(this, this);
}
}
this.initView();
}
@Override
protected void onDestroy() {
super.onDestroy();
......@@ -45,18 +43,6 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct
mDisposable.dispose();
}
@Override
public void setContentView(int layoutResID) {
super.setContentView(layoutResID);
}
public abstract int getLayoutId();
public abstract void initView();
public void showToast(String msg) {
ToastUtils.showShortToast(msg);
}
......@@ -68,4 +54,8 @@ public abstract class BaseActivity<P extends BasePresenter> extends AppCompatAct
public void hideDialog() {
ProgressUtil.stopLoad();
}
public void dumbBack() {
mActivity.finish();
}
}
app/src/main/java/com/dayu/bigfish/base/BaseBingFragment.java deleted 100755 → 0
package com.dayu.bigfish.base;
import android.databinding.ViewDataBinding;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType;
/**
* Created by luo on 2017/11/14.
*/
public abstract class BaseBingFragment<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingFragment<B> {
public P mPresenter;
@Override
protected void initPresenter() {
super.initPresenter();
if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass);
if (mPresenter != null) mPresenter.setView(this, mActivity);
}
}
@Override
public void onDestroy() {
super.onDestroy();
if (mPresenter != null) mPresenter.onDetached();
}
public void showToast(String msg) {
ToastUtils.showShortToast(msg);
}
public void showDialog() {
ProgressUtil.startLoad(mActivity);
}
public void hideDialog() {
ProgressUtil.stopLoad();
}
}
app/src/main/java/com/dayu/bigfish/base/BaseFragment.java
package com.dayu.bigfish.base;
import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.databinding.ViewDataBinding;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
......@@ -16,45 +8,15 @@ import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType;
import io.reactivex.disposables.CompositeDisposable;
/**
* Created by luo on 2017/11/14.
*/
public abstract class BaseFragment<P extends BasePresenter> extends Fragment {
protected Activity mActivity;
public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingFragment<B> {
public P mPresenter;
private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
onAttachToContext((Activity) context);
}
}
@SuppressWarnings("deprecation")
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onAttachToContext(activity);
}
}
private void onAttachToContext(Activity context) {
mActivity = context;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
isFirstLoad = true;
isPrepared = true;
protected void initPresenter() {
super.initPresenter();
if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
......@@ -65,74 +27,12 @@ public abstract class BaseFragment<P extends BasePresenter> extends Fragment {
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(getLayoutId(), container, false);
initView(view);
return view;
}
@Override
public void onDestroy() {
super.onDestroy();
if (mPresenter != null) mPresenter.onDetached();
mDisposable.dispose();
}
public abstract View initView(View view);
public abstract int getLayoutId();
/**
* 如果是与ViewPager一起使用，调用的是setUserVisibleHint
*/
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
/**
* 如果是通过FragmentTransaction的show和hide的方法来控制显示，调用的是onHiddenChanged.
* 若是初始就show的Fragment 为了触发该事件 需要先hide再show
*/
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
protected void onVisible() {
doInit();
}
protected void onInvisible() {
}
protected void doInit() {
if (!isPrepared || !isVisible || !isFirstLoad) {
return;
}
isFirstLoad = false;
lazyLoad();
}
protected abstract void lazyLoad();
public void showToast(String msg) {
ToastUtils.showShortToast(msg);
}
......
app/src/main/java/com/dayu/bigfish/base/BasePresenter.java
......@@ -42,8 +42,8 @@ public abstract class BasePresenter<V> {
}
public void dumpBack() {
if (mView instanceof BaseBingdActivity) {
((BaseBingdActivity) mView).dumbBack();
if (mView instanceof BaseActivity) {
((BaseActivity) mView).dumbBack();
}
}
......@@ -138,10 +138,10 @@ public abstract class BasePresenter<V> {
}
return exception;
}
if (mView instanceof BaseBingdActivity) {
((BaseBingdActivity) mView).showToast(message);
} else if (mView instanceof BaseBingFragment) {
((BaseBingFragment) mView).showToast(message);
if (mView instanceof BaseActivity) {
((BaseActivity) mView).showToast(message);
} else if (mView instanceof BaseFragment) {
((BaseFragment) mView).showToast(message);
}
return exception;
}
......
app/src/main/java/com/dayu/bigfish/base/BaseBingdActivity.java → app/src/main/java/com/dayu/bigfish/base/PreBaseActivity.java
package com.dayu.bigfish.base;
import android.databinding.ViewDataBinding;
import android.app.Activity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
......@@ -13,27 +15,27 @@ import io.reactivex.disposables.CompositeDisposable;
/**
* Created by luofan on 17/11/02.
*/
public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewDataBinding> extends DataBindingActivity<B> {
public abstract class PreBaseActivity<P extends BasePresenter> extends AppCompatActivity {
public P mPresenter;
protected Activity mActivity;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
protected void initPresenter() {
super.initPresenter();
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(this.getLayoutId());
mActivity = this;
if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass);
if (mPresenter != null) {
mPresenter.setView(this, this);
}
if (mPresenter != null) mPresenter.setView(this, mActivity);
}
this.initView();
}
@Override
protected void onDestroy() {
super.onDestroy();
......@@ -43,6 +45,18 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD
mDisposable.dispose();
}
@Override
public void setContentView(int layoutResID) {
super.setContentView(layoutResID);
}
public abstract int getLayoutId();
public abstract void initView();
public void showToast(String msg) {
ToastUtils.showShortToast(msg);
}
......@@ -54,8 +68,4 @@ public abstract class BaseBingdActivity<P extends BasePresenter, B extends ViewD
public void hideDialog() {
ProgressUtil.stopLoad();
}
public void dumbBack() {
mActivity.finish();
}
}
app/src/main/java/com/dayu/bigfish/base/PreBaseFragment.java 0 → 100755
package com.dayu.bigfish.base;
import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.dayu.bigfish.utils.InstanceUtil;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
import java.lang.reflect.ParameterizedType;
import io.reactivex.disposables.CompositeDisposable;
/**
* Created by luo on 2017/11/14.
*/
public abstract class PreBaseFragment<P extends BasePresenter> extends Fragment {
protected Activity mActivity;
public P mPresenter;
private boolean isVisible; //是否可见状态
private boolean isPrepared; //标志位，View已经初始化完成。
private boolean isFirstLoad = true;
protected CompositeDisposable mDisposable = new CompositeDisposable();
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
onAttachToContext((Activity) context);
}
}
@SuppressWarnings("deprecation")
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
onAttachToContext(activity);
}
}
private void onAttachToContext(Activity context) {
mActivity = context;
}
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
isFirstLoad = true;
isPrepared = true;
if (this instanceof BaseView &&
this.getClass().getGenericSuperclass() instanceof ParameterizedType &&
((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
.getGenericSuperclass())).getActualTypeArguments()[0];
mPresenter = InstanceUtil.getInstance(mPresenterClass);
if (mPresenter != null) mPresenter.setView(this, mActivity);
}
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(getLayoutId(), container, false);
initView(view);
return view;
}
@Override
public void onDestroy() {
super.onDestroy();
if (mPresenter != null) mPresenter.onDetached();
mDisposable.dispose();
}
public abstract View initView(View view);
public abstract int getLayoutId();
/**
* 如果是与ViewPager一起使用，调用的是setUserVisibleHint
*/
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser);
if (getUserVisibleHint()) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
/**
* 如果是通过FragmentTransaction的show和hide的方法来控制显示，调用的是onHiddenChanged.
* 若是初始就show的Fragment 为了触发该事件 需要先hide再show
*/
@Override
public void onHiddenChanged(boolean hidden) {
super.onHiddenChanged(hidden);
if (!hidden) {
isVisible = true;
onVisible();
} else {
isVisible = false;
onInvisible();
}
}
protected void onVisible() {
doInit();
}
protected void onInvisible() {
}
protected void doInit() {
if (!isPrepared || !isVisible || !isFirstLoad) {
return;
}
isFirstLoad = false;
lazyLoad();
}
protected abstract void lazyLoad();
public void showToast(String msg) {
ToastUtils.showShortToast(msg);
}
public void showDialog() {
ProgressUtil.startLoad(mActivity);
}
public void hideDialog() {
ProgressUtil.stopLoad();
}
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/BridgeHandler.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
public interface BridgeHandler {
void handler(String data, CallBackFunction function);
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/BridgeUtil.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
import android.content.Context;
import android.webkit.WebView;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
public class BridgeUtil {
final static String YY_OVERRIDE_SCHEMA = "yy://";
final static String YY_RETURN_DATA = YY_OVERRIDE_SCHEMA + "return/";//格式为 yy://return/{function}/returncontent
final static String YY_FETCH_QUEUE = YY_RETURN_DATA + "_fetchQueue/";
final static String EMPTY_STR = "";
final static String UNDERLINE_STR = "_";
final static String SPLIT_MARK = "/";
final static String CALLBACK_ID_FORMAT = "JAVA_CB_%s";
final static String JS_HANDLE_MESSAGE_FROM_JAVA = "javascript:WebViewJavascriptBridge._handleMessageFromNative('%s');";
final static String JS_FETCH_QUEUE_FROM_JAVA = "javascript:WebViewJavascriptBridge._fetchQueue();";
public final static String JAVASCRIPT_STR = "javascript:";
public static String parseFunctionName(String jsUrl){
return jsUrl.replace("javascript:WebViewJavascriptBridge.", "").replaceAll("\\(.*\\);", "");
}
public static String getDataFromReturnUrl(String url) {
if(url.startsWith(YY_FETCH_QUEUE)) {
return url.replace(YY_FETCH_QUEUE, EMPTY_STR);
}
String temp = url.replace(YY_RETURN_DATA, EMPTY_STR);
String[] functionAndData = temp.split(SPLIT_MARK);
if(functionAndData.length >= 2) {
StringBuilder sb = new StringBuilder();
for (int i = 1; i < functionAndData.length; i++) {
sb.append(functionAndData[i]);
}
return sb.toString();
}
return null;
}
public static String getFunctionFromReturnUrl(String url) {
String temp = url.replace(YY_RETURN_DATA, EMPTY_STR);
String[] functionAndData = temp.split(SPLIT_MARK);
if(functionAndData.length >= 1){
return functionAndData[0];
}
return null;
}
/**
* js 文件将注入为第一个script引用
* @param view
* @param url
*/
public static void webViewLoadJs(WebView view, String url){
String js = "var newscript = document.createElement(\"script\");";
js += "newscript.src=\"" + url + "\";";
js += "document.scripts[0].parentNode.insertBefore(newscript,document.scripts[0]);";
view.loadUrl("javascript:" + js);
}
public static void webViewLoadLocalJs(WebView view, String path){
String jsContent = assetFile2Str(view.getContext(), path);
view.loadUrl("javascript:" + jsContent);
}
public static String assetFile2Str(Context c, String urlStr){
InputStream in = null;
try{
in = c.getAssets().open(urlStr);
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(in));
String line = null;
StringBuilder sb = new StringBuilder();
do {
line = bufferedReader.readLine();
if (line != null && !line.matches("^\\s*\\/\\/.*")) {
sb.append(line);
}
} while (line != null);
bufferedReader.close();
in.close();
return sb.toString();
} catch (Exception e) {
e.printStackTrace();
} finally {
if(in != null) {
try {
in.close();
} catch (IOException e) {
}
}
}
return null;
}
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/BridgeWebView.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Build;
import android.os.Looper;
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.webkit.WebView;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@SuppressLint("SetJavaScriptEnabled")
public class BridgeWebView extends WebView implements WebViewJavascriptBridge {
private final String TAG = "BridgeWebView";
public static final String toLoadJs = "WebViewJavascriptBridge.js";
Map<String, CallBackFunction> responseCallbacks = new HashMap<String, CallBackFunction>();
Map<String, BridgeHandler> messageHandlers = new HashMap<String, BridgeHandler>();
BridgeHandler defaultHandler = new DefaultHandler();
private List<Message> startupMessage = new ArrayList<Message>();
public List<Message> getStartupMessage() {
return startupMessage;
}
public void setStartupMessage(List<Message> startupMessage) {
this.startupMessage = startupMessage;
}
private long uniqueId = 0;
public BridgeWebView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public BridgeWebView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
init();
}
public BridgeWebView(Context context) {
super(context);
init();
}
/**
*
* @param handler
* default handler,handle messages send by js without assigned handler name,
* if js message has handler name, it will be handled by named handlers registered by native
*/
public void setDefaultHandler(BridgeHandler handler) {
this.defaultHandler = handler;
}
private void init() {
this.setVerticalScrollBarEnabled(false);
this.setHorizontalScrollBarEnabled(false);
this.getSettings().setJavaScriptEnabled(true);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
WebView.setWebContentsDebuggingEnabled(true);
}
this.setWebViewClient(generateBridgeWebViewClient());
}
protected BridgeWebViewClient generateBridgeWebViewClient() {
return new BridgeWebViewClient(this);
}
void handlerReturnData(String url) {
String functionName = BridgeUtil.getFunctionFromReturnUrl(url);
CallBackFunction f = responseCallbacks.get(functionName);
String data = BridgeUtil.getDataFromReturnUrl(url);
if (f != null) {
f.onCallBack(data);
responseCallbacks.remove(functionName);
return;
}
}
@Override
public void send(String data) {
send(data, null);
}
@Override
public void send(String data, CallBackFunction responseCallback) {
doSend(null, data, responseCallback);
}
private void doSend(String handlerName, String data, CallBackFunction responseCallback) {
Message m = new Message();
if (!TextUtils.isEmpty(data)) {
m.setData(data);
}
if (responseCallback != null) {
String callbackStr = String.format(BridgeUtil.CALLBACK_ID_FORMAT, ++uniqueId + (BridgeUtil.UNDERLINE_STR + SystemClock.currentThreadTimeMillis()));
responseCallbacks.put(callbackStr, responseCallback);
m.setCallbackId(callbackStr);
}
if (!TextUtils.isEmpty(handlerName)) {
m.setHandlerName(handlerName);
}
queueMessage(m);
}
private void queueMessage(Message m) {
if (startupMessage != null) {
startupMessage.add(m);
} else {
dispatchMessage(m);
}
}
void dispatchMessage(Message m) {
String messageJson = m.toJson();
//escape special characters for json string
messageJson = messageJson.replaceAll("(\\\\)([^utrn])", "\\\\\\\\$1$2");
messageJson = messageJson.replaceAll("(?<=[^\\\\])(\")", "\\\\\"");
String javascriptCommand = String.format(BridgeUtil.JS_HANDLE_MESSAGE_FROM_JAVA, messageJson);
if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
this.loadUrl(javascriptCommand);
}
}
void flushMessageQueue() {
if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
loadUrl(BridgeUtil.JS_FETCH_QUEUE_FROM_JAVA, new CallBackFunction() {
@Override
public void onCallBack(String data) {
// deserializeMessage
List<Message> list = null;
try {
list = Message.toArrayList(data);
} catch (Exception e) {
e.printStackTrace();
return;
}
if (list == null || list.size() == 0) {
return;
}
for (int i = 0; i < list.size(); i++) {
Message m = list.get(i);
String responseId = m.getResponseId();
// 是否是response
if (!TextUtils.isEmpty(responseId)) {
CallBackFunction function = responseCallbacks.get(responseId);
String responseData = m.getResponseData();
function.onCallBack(responseData);
responseCallbacks.remove(responseId);
} else {
CallBackFunction responseFunction = null;
// if had callbackId
final String callbackId = m.getCallbackId();
if (!TextUtils.isEmpty(callbackId)) {
responseFunction = new CallBackFunction() {
@Override
public void onCallBack(String data) {
Message responseMsg = new Message();
responseMsg.setResponseId(callbackId);
responseMsg.setResponseData(data);
queueMessage(responseMsg);
}
};
} else {
responseFunction = new CallBackFunction() {
@Override
public void onCallBack(String data) {
// do nothing
}
};
}
BridgeHandler handler;
if (!TextUtils.isEmpty(m.getHandlerName())) {
handler = messageHandlers.get(m.getHandlerName());
} else {
handler = defaultHandler;
}
if (handler != null){
handler.handler(m.getData(), responseFunction);
}
}
}
}
});
}
}
public void loadUrl(String jsUrl, CallBackFunction returnCallback) {
this.loadUrl(jsUrl);
responseCallbacks.put(BridgeUtil.parseFunctionName(jsUrl), returnCallback);
}
/**
* register handler,so that javascript can call it
*
* @param handlerName
* @param handler
*/
public void registerHandler(String handlerName, BridgeHandler handler) {
if (handler != null) {
messageHandlers.put(handlerName, handler);
}
}
/**
* call javascript registered handler
*
* @param handlerName
* @param data
* @param callBack
*/
public void callHandler(String handlerName, String data, CallBackFunction callBack) {
doSend(handlerName, data, callBack);
}
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/BridgeWebViewClient.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
import android.graphics.Bitmap;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
/**
* Created by bruce on 10/28/15.
*/
public class BridgeWebViewClient extends WebViewClient {
private BridgeWebView webView;
public BridgeWebViewClient(BridgeWebView webView) {
this.webView = webView;
}
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
try {
url = URLDecoder.decode(url, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
if (url.startsWith(BridgeUtil.YY_RETURN_DATA)) { // 如果是返回数据
webView.handlerReturnData(url);
return true;
} else if (url.startsWith(BridgeUtil.YY_OVERRIDE_SCHEMA)) { //
webView.flushMessageQueue();
return true;
} else {
return super.shouldOverrideUrlLoading(view, url);
}
}
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon);
}
@Override
public void onPageFinished(WebView view, String url) {
super.onPageFinished(view, url);
if (BridgeWebView.toLoadJs != null) {
BridgeUtil.webViewLoadLocalJs(view, BridgeWebView.toLoadJs);
}
//
if (webView.getStartupMessage() != null) {
for (Message m : webView.getStartupMessage()) {
webView.dispatchMessage(m);
}
webView.setStartupMessage(null);
}
}
@Override
public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
super.onReceivedError(view, errorCode, description, failingUrl);
}
}
\ No newline at end of file
app/src/main/java/com/dayu/bigfish/base/jsbridge/CallBackFunction.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
public interface CallBackFunction {
public void onCallBack(String data);
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/DefaultHandler.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
public class DefaultHandler implements BridgeHandler {
String TAG = "DefaultHandler";
@Override
public void handler(String data, CallBackFunction function) {
if(function != null){
function.onCallBack("DefaultHandler response data");
}
}
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/Message.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
/**
* data of bridge
* @author haoqing
*
*/
public class Message {
private String callbackId; //callbackId
private String responseId; //responseId
private String responseData; //responseData
private String data; //data of message
private String handlerName; //name of handler
private final static String CALLBACK_ID_STR = "callbackId";
private final static String RESPONSE_ID_STR = "responseId";
private final static String RESPONSE_DATA_STR = "responseData";
private final static String DATA_STR = "data";
private final static String HANDLER_NAME_STR = "handlerName";
public String getResponseId() {
return responseId;
}
public void setResponseId(String responseId) {
this.responseId = responseId;
}
public String getResponseData() {
return responseData;
}
public void setResponseData(String responseData) {
this.responseData = responseData;
}
public String getCallbackId() {
return callbackId;
}
public void setCallbackId(String callbackId) {
this.callbackId = callbackId;
}
public String getData() {
return data;
}
public void setData(String data) {
this.data = data;
}
public String getHandlerName() {
return handlerName;
}
public void setHandlerName(String handlerName) {
this.handlerName = handlerName;
}
public String toJson() {
JSONObject jsonObject= new JSONObject();
try {
jsonObject.put(CALLBACK_ID_STR, getCallbackId());
jsonObject.put(DATA_STR, getData());
jsonObject.put(HANDLER_NAME_STR, getHandlerName());
jsonObject.put(RESPONSE_DATA_STR, getResponseData());
jsonObject.put(RESPONSE_ID_STR, getResponseId());
return jsonObject.toString();
} catch (JSONException e) {
e.printStackTrace();
}
return null;
}
public static Message toObject(String jsonStr) {
Message m = new Message();
try {
JSONObject jsonObject = new JSONObject(jsonStr);
m.setHandlerName(jsonObject.has(HANDLER_NAME_STR) ? jsonObject.getString(HANDLER_NAME_STR):null);
m.setCallbackId(jsonObject.has(CALLBACK_ID_STR) ? jsonObject.getString(CALLBACK_ID_STR):null);
m.setResponseData(jsonObject.has(RESPONSE_DATA_STR) ? jsonObject.getString(RESPONSE_DATA_STR):null);
m.setResponseId(jsonObject.has(RESPONSE_ID_STR) ? jsonObject.getString(RESPONSE_ID_STR):null);
m.setData(jsonObject.has(DATA_STR) ? jsonObject.getString(DATA_STR):null);
return m;
} catch (JSONException e) {
e.printStackTrace();
}
return m;
}
public static List<Message> toArrayList(String jsonStr){
List<Message> list = new ArrayList<Message>();
try {
JSONArray jsonArray = new JSONArray(jsonStr);
for(int i = 0; i < jsonArray.length(); i++){
Message m = new Message();
JSONObject jsonObject = jsonArray.getJSONObject(i);
m.setHandlerName(jsonObject.has(HANDLER_NAME_STR) ? jsonObject.getString(HANDLER_NAME_STR):null);
m.setCallbackId(jsonObject.has(CALLBACK_ID_STR) ? jsonObject.getString(CALLBACK_ID_STR):null);
m.setResponseData(jsonObject.has(RESPONSE_DATA_STR) ? jsonObject.getString(RESPONSE_DATA_STR):null);
m.setResponseId(jsonObject.has(RESPONSE_ID_STR) ? jsonObject.getString(RESPONSE_ID_STR):null);
m.setData(jsonObject.has(DATA_STR) ? jsonObject.getString(DATA_STR):null);
list.add(m);
}
} catch (JSONException e) {
e.printStackTrace();
}
return list;
}
}
app/src/main/java/com/dayu/bigfish/base/jsbridge/WebViewJavascriptBridge.java deleted 100755 → 0
package com.dayu.bigfish.base.jsbridge;
public interface WebViewJavascriptBridge {
public void send(String data);
public void send(String data, CallBackFunction responseCallback);
}
app/src/main/java/com/dayu/bigfish/presenter/login/LoginContract.java
......@@ -38,10 +38,13 @@ public interface LoginContract {
/**
* 验证码发送成功
*
* @param flag
*/
void sendCodeSuccess(boolean flag);
void sendCodeSuccess();
/**
* 验证码发送成功
*/
void sendVoiceCodeSuccess();
/**
* 验证码发送失败.
......@@ -75,6 +78,7 @@ public interface LoginContract {
/**
* 跳转到主界面并保存用户信息.
*
* @param info
*/
void dumpAndSave(UserInfo info);
......@@ -85,7 +89,8 @@ public interface LoginContract {
/**
* 发送验证码.
*
* @param userPhone
* @param userPhone 手机号
* @param type 1：短信,2:语音验证码.
*/
public abstract void sendCode(String userPhone, int type);
......
app/src/main/java/com/dayu/bigfish/presenter/login/LoginPresenter.java
package com.dayu.bigfish.presenter.login;
import android.text.TextUtils;
import android.util.Log;
import com.app.annotation.apt.InstanceFactory;
import com.apt.ApiFactory;
......@@ -42,7 +41,11 @@ public class LoginPresenter extends LoginContract.Presenter {
ApiFactory.sendCode(userPhone, type).subscribe(baseObserver(new Consumer<Boolean>() {
@Override
public void accept(Boolean aBoolean) throws Exception {
mView.sendCodeSuccess(aBoolean);
if (type == 1) {
mView.sendCodeSuccess();
} else if (type == 2) {
mView.sendVoiceCodeSuccess();
}
}
}, throwable -> mView.sendCodeFail(throwable)));
}
......@@ -65,7 +68,6 @@ public class LoginPresenter extends LoginContract.Presenter {
dumpAndSave(userInfo);
}
}, throwable -> {
Log.d("request", throwable.toString());
mView.loginFail(throwable);
}));
}
......
app/src/main/java/com/dayu/bigfish/ui/AboutUs.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.AboutUsBinding;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivityAboutUsBinding;
/**
* 关于我们
* Created by luofan on 2017/12/06.
*/
public class AboutUs extends DataBindingActivity<ActivityAboutUsBinding> {
public class AboutUs extends DataBindingActivity<AboutUsBinding> {
@Override
public int getLayoutId() {
......
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity.java
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.databinding.ActivityAccountbalanceLayoutBinding;
import com.dayu.bigfish.databinding.AccountbalanceLayoutBinding;
import com.dayu.bigfish.presenter.accountbalance.AccountBalanceContract;
import com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter;
import com.dayu.bigfish.ui.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
/**
* Created by luofan on 2017/11/1.
*/
public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceLayoutBinding> implements AccountBalanceContract.View
, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class AccountBalanceActivity extends BaseActivity<AccountBalancePresenter, AccountbalanceLayoutBinding>
implements AccountBalanceContract.View {
private int mUserId;
private AccountBalanceAdapter mAdapter;
private int mPage = 1;
private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override
public int getLayoutId() {
......@@ -43,58 +32,29 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
@Override
public void initView() {
mBind.setPresenter(mPresenter);
initData();
ProgressUtil.startLoad(mActivity);
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
initData();
}
private void initData() {
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
mBind.tvAccountBalance.setText("￥" + balance);
mAdapter = new AccountBalanceAdapter(R.layout.item_account_balance_layout11, null);
mBind.rlBalance.setLayoutManager(new LinearLayoutManager(this));
mBind.rlBalance.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mBind.rlBalance);
mBind.swipeRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mBind.rlBalance);
mAdapter.setEnableLoadMore(false);
mBind.rlBalance.setRefreshListener(() -> {
mPage = 1;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
});
mBind.rlBalance.setOnLoadMoreListener(() -> mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId));
}
@Override
public void getBalanceSuccess(BasePageBean<AccountBalance> balance) {
mTotalPage = balance.getTotalPages();
mPageSize = balance.getPageSize();
if (mRefreshState == 1) {
mBind.swipeRefersh.setRefreshing(false);
mAdapter.setNewData(balance.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(balance.getData());
}
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
mPage += 1;
}
mPage += 1;
if (balance.getData().size() == 0) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(R.layout.tips_empty, null);
TextView tip = (TextView) view.findViewById(R.id.tv_empty);
tip.setText(getString(R.string.no_record));
mAdapter.setEmptyView(view);
}
mPage++;
mBind.rlBalance.setPageData(balance);
}
@Override
public void getBalanceError() {
mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.loadMoreFail();
ToastUtils.showShortToast(getString(R.string.get_account_list_error));
mBind.lineOne.setVisibility(View.VISIBLE);
mBind.rlBalance.setDataFail();
}
@Override
......@@ -108,18 +68,4 @@ public class AccountBalanceActivity extends BaseBingdActivity<AccountBalancePres
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
return "￥" + balance;
}
@Override
public void onRefresh() {
mRefreshState = 1;
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
@Override
public void onLoadMoreRequested() {
mRefreshState = 2;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
}
app/src/main/java/com/dayu/bigfish/ui/AccountBalanceTest.java → app/src/main/java/com/dayu/bigfish/ui/AccountBalanceActivity1.java
package com.dayu.bigfish.ui;
import android.content.Intent;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.AccountBalance;
import com.dayu.bigfish.databinding.ActivityAccountbalanceTestBinding;
import com.dayu.bigfish.databinding.ActivityAccountbalanceLayout1Binding;
import com.dayu.bigfish.presenter.accountbalance.AccountBalanceContract;
import com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter;
import com.dayu.bigfish.ui.adapter.AccountBalanceAdapter;
import com.dayu.bigfish.utils.GetUserInfo;
import com.dayu.bigfish.utils.ProgressUtil;
import com.dayu.bigfish.utils.ToastUtils;
/**
* Created by luofan on 2017/11/1.
*/
public class AccountBalanceTest extends BaseBingdActivity<AccountBalancePresenter, ActivityAccountbalanceTestBinding>
implements AccountBalanceContract.View {
public class AccountBalanceActivity1 extends BaseActivity<AccountBalancePresenter, ActivityAccountbalanceLayout1Binding> implements AccountBalanceContract.View
, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private int mUserId;
private AccountBalanceAdapter mAdapter;
private int mPage = 1;
private int mPageSize = Constants.PAGESIZE;
private int mTotalPage = 1;
private int mRefreshState = 1; //1:刷新，2:下拉加载
@Override
public int getLayoutId() {
return R.layout.activity_accountbalance_test;
return R.layout.activity_accountbalance_layout1;
}
@Override
public void initView() {
mBind.setPresenter(mPresenter);
initData();
ProgressUtil.startLoad(mActivity);
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
initData();
}
private void initData() {
mBind.rlBalance.setRefreshListener(() -> {
mPage = 1;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
});
mBind.rlBalance.setOnLoadMoreListener(() -> mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId));
mUserId = GetUserInfo.getACCOUNT_ID(MyApplication.getContext());
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
mBind.tvAccountBalance.setText("￥" + balance);
mAdapter = new AccountBalanceAdapter(R.layout.item_account_balance_layout11, null);
mBind.rlBalance.setLayoutManager(new LinearLayoutManager(this));
mBind.rlBalance.setAdapter(mAdapter);
mAdapter.disableLoadMoreIfNotFullPage(mBind.rlBalance);
mBind.swipeRefersh.setOnRefreshListener(this);
mAdapter.setOnLoadMoreListener(this, mBind.rlBalance);
mAdapter.setEnableLoadMore(false);
}
@Override
public void getBalanceSuccess(BasePageBean<AccountBalance> balance) {
mPage++;
mBind.rlBalance.setPageData(balance);
mTotalPage = balance.getTotalPages();
mPageSize = balance.getPageSize();
if (mRefreshState == 1) {
mBind.swipeRefersh.setRefreshing(false);
mAdapter.setNewData(balance.getData());
mAdapter.loadMoreEnd();
mAdapter.setEnableLoadMore(true);
} else {
mAdapter.addData(balance.getData());
}
if (mPage >= mTotalPage) {
mAdapter.loadMoreEnd();
} else {
mAdapter.loadMoreComplete();
mPage += 1;
}
mPage += 1;
if (balance.getData().size() == 0) {
LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(R.layout.tips_empty, null);
TextView tip = (TextView) view.findViewById(R.id.tv_empty);
tip.setText(getString(R.string.no_record));
mAdapter.setEmptyView(view);
}
}
@Override
public void getBalanceError() {
mBind.rlBalance.setDataFail();
mAdapter.setEmptyView(R.layout.tips_loading_failed);
mAdapter.loadMoreFail();
ToastUtils.showShortToast(getString(R.string.get_account_list_error));
mBind.lineOne.setVisibility(View.VISIBLE);
}
@Override
......@@ -68,4 +108,18 @@ public class AccountBalanceTest extends BaseBingdActivity<AccountBalancePresente
int balance = getIntent().getIntExtra(Constants.ACCOUNT_BALANCE, 0);
return "￥" + balance;
}
@Override
public void onRefresh() {
mRefreshState = 1;
mPage = 1;
mAdapter.setEnableLoadMore(false);
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
@Override
public void onLoadMoreRequested() {
mRefreshState = 2;
mPresenter.getAccountBalanceList(mPage, mPageSize, mUserId);
}
}
app/src/main/java/com/dayu/bigfish/ui/FeedBackActivity.java
package com.dayu.bigfish.ui;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.databinding.ActivityFeedbackBinding;
import com.dayu.bigfish.presenter.feedback.FeedBackContract;
import com.dayu.bigfish.presenter.feedback.FeedBackPresenter;
......@@ -15,7 +15,7 @@ import com.dayu.bigfish.utils.UtilsUserAccountMatcher;
* Created by yu
*/
public class FeedBackActivity extends BaseBingdActivity<FeedBackPresenter, ActivityFeedbackBinding> implements FeedBackContract.View {
public class FeedBackActivity extends BaseActivity<FeedBackPresenter, ActivityFeedbackBinding> implements FeedBackContract.View {
private String mComment;
private String userName;
private String userPhone;
......
app/src/main/java/com/dayu/bigfish/ui/LoginActivity.java
......@@ -3,10 +3,10 @@ package com.dayu.bigfish.ui;
import android.content.Intent;
import android.text.TextUtils;
import com.dayu.bigfish.LoginBinding;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.UserInfo;
import com.dayu.bigfish.databinding.ActivityLoginBinding;
import com.dayu.bigfish.presenter.login.LoginContract;
import com.dayu.bigfish.presenter.login.LoginPresenter;
import com.dayu.bigfish.utils.ProgressUtil;
......@@ -22,11 +22,7 @@ import com.hyphenate.chat.EMClient;
* 2017/11/08.
*/
public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLoginBinding>
implements LoginContract.View {
private int mType;
private String mPhone;
private String mCode;
public class LoginActivity extends BaseActivity<LoginPresenter, LoginBinding> implements LoginContract.View {
@Override
public int getLayoutId() {
......@@ -36,25 +32,6 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog
@Override
public void initView() {
mBind.setPresenter(mPresenter);
mBind.btnSendCode.setOnClickListener(o -> {
getData();
mType = 1;
sendCode(mPhone, mType);
});
mBind.tvVoiceCode.setOnClickListener(o -> {
getData();
mType = 2;
sendCode(mPhone, mType);
});
mBind.btnLogin.setOnClickListener(o -> {
getData();
login(mPhone, mCode);
});
}
private void getData() {
mPhone = mBind.etPhone.getText().toString();
mCode = mBind.etCode.getText().toString();
}
@Override
......@@ -75,13 +52,13 @@ public class LoginActivity extends BaseBingdActivity<LoginPresenter, ActivityLog
@Override
public void sendCodeSuccess(boolean flag) {
if (mType == 1) {
ToastUtils.showShortToast(getString(R.string.login_sms_success));
} else if (mType == 2) {
mBind.tvVoiceCode.setText(getString(R.string.login_voice_sms_success));
}
public void sendCodeSuccess() {
ToastUtils.showShortToast(getString(R.string.login_sms_success));
}
@Override
public void sendVoiceCodeSuccess() {
mBind.tvVoiceCode.setText(getString(R.string.login_voice_sms_success));
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -2,7 +2,6 @@ package com.dayu.bigfish.ui;
import android.Manifest;
import android.annotation.TargetApi;
import android.app.Dialog;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
......@@ -25,7 +24,7 @@ import com.dayu.bigfish.BuildConfig;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.DownloadService;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.InformBean;
import com.dayu.bigfish.bean.Order;
......@@ -60,7 +59,7 @@ import static com.dayu.bigfish.InitializeActivity.SDK_PERMISSION_REQUEST;
* Created by luofan on 2017/11/20.
*/
public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
private int mPosition = 0;
private FragmentManager mFragmentManger;
private Fragment[] mFragments;
......@@ -347,21 +346,18 @@ public class MainActivity extends BaseBingdActivity<MainPresenter, ActivityMainB
}
if (!flag) {
CustomDialog dialog = new CustomDialog(mActivity, R.style.custom_dialog2, getString(R.string.please_open__permission)
, new CustomDialog.OnCloseListener() {
@Override
public void onClick(Dialog dialog, boolean confirm) {
if (confirm) {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + getPackageName()));
startActivity(intent);
dialog.dismiss();
} else {
Toast.makeText(mActivity, getString(R.string.no_permission), Toast.LENGTH_SHORT).show();
finish();
dialog.dismiss();
}
}
});
, (dialog1, confirm) -> {
if (confirm) {
Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
intent.setData(Uri.parse("package:" + getPackageName()));
startActivity(intent);
dialog1.dismiss();
} else {
Toast.makeText(mActivity, getString(R.string.no_permission), Toast.LENGTH_SHORT).show();
finish();
dialog1.dismiss();
}
});
dialog.setTitle(getString(R.string.notice))
.setNegativeButton(getString(R.string.cancle))
.setPositiveButton(getString(R.string.go_setting));
......
app/src/main/java/com/dayu/bigfish/ui/OrderRecordActivity.java
......@@ -13,7 +13,7 @@ import android.view.inputmethod.InputMethodManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.databinding.ActivityOrderRecordBinding;
......@@ -30,7 +30,7 @@ import java.util.ArrayList;
* on 2017/9/29.
*/
public class OrderRecordActivity extends BaseBingdActivity<WorksRecordPresenter, ActivityOrderRecordBinding>
public class OrderRecordActivity extends BaseActivity<WorksRecordPresenter, ActivityOrderRecordBinding>
implements WroksRecordContract.View, BaseQuickAdapter.RequestLoadMoreListener, SwipeRefreshLayout.OnRefreshListener {
public ArrayList<Order> mList = new ArrayList<>();
private int siteId;
......
app/src/main/java/com/dayu/bigfish/ui/ProcessOrderActivity.java
......@@ -11,7 +11,7 @@ import android.widget.RelativeLayout;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshTab;
......@@ -48,7 +48,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_NOCONTACT_FIN
* on 2017/9/15.
* Created by yu
*/
public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresenter, ActivityProcessOrderBinding>
public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, ActivityProcessOrderBinding>
implements ProcessOrderContract.View {
private int orderId;
......@@ -247,18 +247,8 @@ public class ProcessOrderActivity extends BaseBingdActivity<ProcessOrderPresente
@Override
public void getOrderInfoSuccess(OrderDetail detail) {
brandName = detail.getBrandName();
serveName = detail.getProviderName();
categoryName = detail.getCategoryName();
mBind.setItem(detail);
mAnyContacts = detail.getAnyContacts();
mBind.tvProduct.setText(categoryName);
mBind.tvBrand.setText(brandName);
mBind.tvServe.setText(serveName);
if (detail.getSubStatus() == 5) {
mBind.tvModifySop.setVisibility(View.VISIBLE);
} else {
mBind.tvModifySop.setVisibility(View.GONE);
}
}
@Override
......
app/src/main/java/com/dayu/bigfish/ui/ReceivingActivity.java
......@@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.APIException;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshApoiment;
......@@ -34,7 +34,7 @@ import java.util.List;
* Created by yu
*/
public class ReceivingActivity extends BaseBingdActivity<ReceivingPresenter, ActivityReceivingBinding> implements
public class ReceivingActivity extends BaseActivity<ReceivingPresenter, ActivityReceivingBinding> implements
ReceivingContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private int userId;
private int siteId;
......
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
......@@ -6,7 +6,7 @@ import android.os.Environment;
import android.text.TextUtils;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.databinding.ActivitySettingBinding;
import com.dayu.bigfish.presenter.setting.SettingContract;
import com.dayu.bigfish.presenter.setting.SettingPresenter;
......@@ -29,7 +29,7 @@ import io.reactivex.Observable;
* 2017/9/2.
*/
public class SettingActivity extends BaseBingdActivity<SettingPresenter, ActivitySettingBinding>
public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySettingBinding>
implements SettingContract.View {
private String mHxAccount;
private String mHxPwd;
......
app/src/main/java/com/dayu/bigfish/ui/SubcribeTimeActivity.java
......@@ -9,7 +9,7 @@ import com.bigkoo.pickerview.TimePickerView;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.api.APIException;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.event.OrderState;
import com.dayu.bigfish.bean.event.RefreshApoiment;
import com.dayu.bigfish.bean.event.RefreshServe;
......@@ -40,7 +40,7 @@ import static com.dayu.bigfish.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
* on 2017/9/12.
*/
public class SubcribeTimeActivity extends BaseBingdActivity<SubcribeTimePresenter, ActivitySubscribeTimeBinding>
public class SubcribeTimeActivity extends BaseActivity<SubcribeTimePresenter, ActivitySubscribeTimeBinding>
implements SubcribeContract.View {
private int orderId;
private String mInfo;
......
app/src/main/java/com/dayu/bigfish/ui/WithdrawalsActivity.java
......@@ -5,7 +5,7 @@ import android.text.TextUtils;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingdActivity;
import com.dayu.bigfish.base.BaseActivity;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.databinding.ActivityWithdrawalsBinding;
import com.dayu.bigfish.presenter.Withdrawals.WithdrawalsContract;
......@@ -27,7 +27,7 @@ import okhttp3.RequestBody;
* Created by luofan on 2017/11/1.
*/
public class WithdrawalsActivity extends BaseBingdActivity<WithdrawalsPresenter, ActivityWithdrawalsBinding>
public class WithdrawalsActivity extends BaseActivity<WithdrawalsPresenter, ActivityWithdrawalsBinding>
implements WithdrawalsContract.View {
private String mAccount;
private String mName;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/BigFishMessageFragment.java
......@@ -9,7 +9,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.databinding.FragmentMessageSystemBinding;
......@@ -25,7 +25,7 @@ import com.dayu.bigfish.utils.ProgressUtil;
* on 2017/10/11.
*/
public class BigFishMessageFragment extends BaseBingFragment<messagePresenter, FragmentMessageSystemBinding>
public class BigFishMessageFragment extends BaseFragment<messagePresenter, FragmentMessageSystemBinding>
implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private SystemMessageAdapter mAdapter;
private String hxUserId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeFirstTabFragment.java
......@@ -4,7 +4,7 @@ import android.os.Bundle;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.databinding.FragmentFirstBinding;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstContract;
import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
......@@ -13,7 +13,7 @@ import com.dayu.bigfish.presenter.homefirsttab.HomeFirstPresenter;
* Created by luofan on 2017/11/20.
*/
public class HomeFirstTabFragment extends BaseBingFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
public class HomeFirstTabFragment extends BaseFragment<HomeFirstPresenter, FragmentFirstBinding> implements HomeFirstContract.View {
public static HomeFirstTabFragment newInstance() {
Bundle args = new Bundle();
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomeOrderFragment.java
......@@ -11,7 +11,7 @@ import android.view.View;
import android.widget.TextView;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.Tab;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentOrderHomeBinding;
......@@ -36,7 +36,7 @@ import static com.dayu.bigfish.R.id.tabicon;
* Created by luofan on 2017/11/20.
*/
public class HomeOrderFragment extends BaseBingFragment<HomeOrderPresenter, FragmentOrderHomeBinding>
public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, FragmentOrderHomeBinding>
implements HomeOrderContract.View {
public List<Fragment> list_fragments;
private FragmentHomeAdapter adapter;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/HomePersonFragment.java
......@@ -18,7 +18,7 @@ import com.bumptech.glide.request.RequestOptions;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.MyApplication;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.AlipayInfo;
import com.dayu.bigfish.bean.EngineerInfo;
import com.dayu.bigfish.bean.OrderRecord;
......@@ -27,7 +27,7 @@ import com.dayu.bigfish.bean.TodayBalance;
import com.dayu.bigfish.databinding.FragmentPersonalCenterBinding;
import com.dayu.bigfish.presenter.homefourtab.HomeFourContract;
import com.dayu.bigfish.presenter.homefourtab.HomeFourPresenter;
import com.dayu.bigfish.ui.AccountBalanceTest;
import com.dayu.bigfish.ui.AccountBalanceActivity;
import com.dayu.bigfish.ui.OrderRecordActivity;
import com.dayu.bigfish.ui.SettingActivity;
import com.dayu.bigfish.ui.WithdrawalsActivity;
......@@ -40,7 +40,7 @@ import com.dayu.bigfish.utils.SPUtils;
* Created by luofan on 2017/11/20.
*/
public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, FragmentPersonalCenterBinding>
public class HomePersonFragment extends BaseFragment<HomeFourPresenter, FragmentPersonalCenterBinding>
implements HomeFourContract.View {
private int userId;
private int siteId;
......@@ -174,7 +174,7 @@ public class HomePersonFragment extends BaseBingFragment<HomeFourPresenter, Frag
@Override
public void dumpToAccount() {
Intent intent = new Intent(mActivity, AccountBalanceTest.class);
Intent intent = new Intent(mActivity, AccountBalanceActivity.class);
intent.putExtra(Constants.ACCOUNT_BALANCE, mAccountBalance);
startActivity(intent);
}
......
app/src/main/java/com/dayu/bigfish/ui/fragment/MessageFragment.java
......@@ -5,7 +5,7 @@ import android.view.View;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.databinding.LrecyclerViewBinding;
......@@ -20,7 +20,7 @@ import com.dayu.bigfish.utils.ProgressUtil;
* on 2017/10/11.
*/
public class MessageFragment extends BaseBingFragment<messagePresenter, LrecyclerViewBinding>
public class MessageFragment extends BaseFragment<messagePresenter, LrecyclerViewBinding>
implements messageContract.View {
private String hxUserId;
private int mPage = 1;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsFragment.java
......@@ -5,7 +5,7 @@ import android.text.TextUtils;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.CoreAdapter;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderDatailsBinding;
......@@ -20,7 +20,7 @@ import com.dayu.bigfish.utils.UIUtils;
* on 2017/9/13.
*/
public class OrderDatailsFragment extends BaseBingFragment<OrderDetailPresenter, FragmentOrderDatailsBinding>
public class OrderDatailsFragment extends BaseFragment<OrderDetailPresenter, FragmentOrderDatailsBinding>
implements OrderDetailContract.View {
private int orderId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderDatailsServeFragment.java
......@@ -4,7 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.OrderDetail;
import com.dayu.bigfish.databinding.FragmentOrderServeBinding;
import com.dayu.bigfish.presenter.orderdetailserve.OrderDetailServeContract;
......@@ -17,7 +17,7 @@ import com.dayu.bigfish.utils.ProgressUtil;
* on 2017/9/13.
*/
public class OrderDatailsServeFragment extends BaseBingFragment<OrderDetailServePresenter, FragmentOrderServeBinding> implements OrderDetailServeContract.View {
public class OrderDatailsServeFragment extends BaseFragment<OrderDetailServePresenter, FragmentOrderServeBinding> implements OrderDetailServeContract.View {
private int orderId;
private ServeDatailsAdapter mAdapter;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFirstTabFragment.java
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshApoiment;
......@@ -30,7 +30,7 @@ import org.greenrobot.eventbus.ThreadMode;
* 待预约的Fragment
*/
public class OrderFirstTabFragment extends BaseBingFragment<AppointmentPresenter,FragmentRecyclerBinding> implements AppointmentContract.View,
public class OrderFirstTabFragment extends BaseFragment<AppointmentPresenter,FragmentRecyclerBinding> implements AppointmentContract.View,
SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private OrderDoingAdapter mAdapter;
private int siteId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderFourTabFragment.java
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.RefreshTab;
......@@ -28,7 +28,7 @@ import org.greenrobot.eventbus.EventBus;
* on 2017/8/31.
*/
public class OrderFourTabFragment extends BaseBingFragment<AppointmentPresenter, FragmentRecyclerBinding> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class OrderFourTabFragment extends BaseFragment<AppointmentPresenter, FragmentRecyclerBinding> implements AppointmentContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private OrderFourTabAdapter mAdapter;
private int siteId;
private int userId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderSecondTabFragment.java
......@@ -8,7 +8,7 @@ import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.Order;
import com.dayu.bigfish.bean.event.OrderState;
......@@ -40,7 +40,7 @@ import static com.dayu.bigfish.ui.fragment.HomeOrderFragment.ORDER_YUYUE;
* on 2017/8/31.
*/
public class OrderSecondTabFragment extends BaseBingFragment<ServerOrderPresenter,FragmentRecyclerBinding> implements ServerorderContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
public class OrderSecondTabFragment extends BaseFragment<ServerOrderPresenter,FragmentRecyclerBinding> implements ServerorderContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private OrderDoingAdapter mAdapter;
private int siteId;
private int userId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/OrderThreeTabFragment.java
......@@ -6,7 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.bean.ErrorOrder;
import com.dayu.bigfish.bean.event.RefreshTab;
import com.dayu.bigfish.databinding.FragmentRecyclerBinding;
......@@ -27,7 +27,7 @@ import java.util.List;
* on 2017/8/31.
*/
public class OrderThreeTabFragment extends BaseBingFragment<ErrorOrderPresenter,FragmentRecyclerBinding> implements ErrorOrderContract.View, SwipeRefreshLayout.OnRefreshListener {
public class OrderThreeTabFragment extends BaseFragment<ErrorOrderPresenter,FragmentRecyclerBinding> implements ErrorOrderContract.View, SwipeRefreshLayout.OnRefreshListener {
private OrderThreeTabAdapter mAdapter;
private int siteId;
private int userId;
......
app/src/main/java/com/dayu/bigfish/ui/fragment/SystemMessageFragment.java
......@@ -9,7 +9,7 @@ import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.dayu.bigfish.Constants;
import com.dayu.bigfish.R;
import com.dayu.bigfish.base.BaseBingFragment;
import com.dayu.bigfish.base.BaseFragment;
import com.dayu.bigfish.base.BasePageBean;
import com.dayu.bigfish.bean.NewMessage;
import com.dayu.bigfish.databinding.FragmentMessageSystemBinding;
......@@ -26,7 +26,7 @@ import com.dayu.bigfish.utils.ProgressUtil;
* on 2017/10/11.
*/
public class SystemMessageFragment extends BaseBingFragment<messagePresenter, FragmentMessageSystemBinding>
public class SystemMessageFragment extends BaseFragment<messagePresenter, FragmentMessageSystemBinding>
implements messageContract.View, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener {
private SystemMessageAdapter mAdapter;
private String hxUserId;
......
app/src/main/res/layout/activity_about_us.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data class=".AboutUsBinding"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/activity_accountbalance_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<data>
<data class="AccountbalanceLayoutBinding">>
<import type="com.dayu.bigfish.presenter.accountbalance.AccountBalancePresenter"/>
<variable
name="presenter"
type="AccountBalancePresenter"/>
</data>
<LinearLayout
......@@ -54,6 +56,7 @@
android:layout_width="match_parent"
android:layout_height="100dp"
android:gravity="center"
android:text="@{presenter.totalPrice}"
android:textColor="#ffbe2d"
android:textSize="40sp"
/>
......@@ -67,19 +70,15 @@
android:visibility="gone"
/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refersh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<com.dayu.bigfish.ui.views.LRecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:itemType="@layout/item_account_balance_layout"
app:needCoreAdapter="true"
>
</com.dayu.bigfish.ui.views.LRecyclerView>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_accountbalance_test.xml → app/src/main/res/layout/activity_accountbalance_layout1.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
<data>
......@@ -10,7 +9,6 @@
<variable
name="presenter"
type="AccountBalancePresenter"/>
</data>
<LinearLayout
......@@ -57,7 +55,6 @@
android:layout_height="100dp"
android:gravity="center"
android:textColor="#ffbe2d"
android:text="@{presenter.totalPrice}"
android:textSize="40sp"
/>
......@@ -70,15 +67,19 @@
android:visibility="gone"
/>
<com.dayu.bigfish.ui.views.LRecyclerView
android:id="@+id/rl_balance"
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe_refersh"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:needCoreAdapter="true"
app:itemType="@layout/item_account_balance_layout"
>
</com.dayu.bigfish.ui.views.LRecyclerView>
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_balance"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_login.xml
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<data class=".LoginBinding">
<import type="com.dayu.bigfish.presenter.login.LoginPresenter"/>
......@@ -59,9 +59,10 @@
android:id="@+id/et_phone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_marginBottom="15dp"
android:background="@null"
android:drawableLeft="@mipmap/denglu_shouji_icon"
android:drawablePadding="@dimen/size_login_clearedittext_dp"
......@@ -112,6 +113,7 @@
android:layout_marginBottom="@dimen/size_login_register_button_mb"
android:layout_marginRight="@dimen/size_login_register_button_mr"
android:background="@drawable/btn_register_selector"
android:onClick="@{()->presenter.sendCode(etPhone.getText().toString(),1)}"
android:text="@string/tv_login_register_button_text"
android:textColor="@color/cl_white"
android:textSize="@dimen/size_login_register_button_text"/>
......@@ -125,6 +127,7 @@
android:layout_below="@+id/linear"
android:layout_centerInParent="true"
android:layout_marginTop="3dp"
android:onClick="@{()->presenter.sendCode(etPhone.getText().toString(),2)}"
android:text="@string/voice_code_notice"
android:textColor="@color/cl_receiving_order_item_data"
android:textSize="12sp"
......@@ -139,6 +142,7 @@
android:layout_marginTop="@dimen/size_login_button_mt"
android:background="@drawable/btn_login_selector"
android:gravity="center"
android:onClick="@{()->presenter.login(etPhone.getText().toString(),etCode.getText().toString())}"
android:text="@string/tv_login"
android:textColor="@color/cl_white"
android:textSize="@dimen/size_login_button_text"
......
app/src/main/res/layout/activity_main.xml
......@@ -2,11 +2,14 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
<import type="com.dayu.bigfish.presenter.main.MainPresenter"/>
<variable
name="presenter"
type="MainPresenter"/>
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/activity_process_order.xml
......@@ -4,10 +4,15 @@
<data>
<import type="com.dayu.bigfish.presenter.processorder.ProcessOrderPresenter"/>
<import type="android.view.View"/>
<variable
name="presenter"
type="ProcessOrderPresenter"/>
<variable
name="item"
type="com.dayu.bigfish.bean.OrderDetail"/>
</data>
<RelativeLayout
......@@ -41,11 +46,11 @@
android:layout_below="@id/title_finish"
android:background="@color/cl_receiving_order_item_data"
android:gravity="center"
android:onClick="@{()->presenter.dumpToSop()}"
android:text="@string/sop_finish"
android:textColor="@color/white"
android:textSize="13.3sp"
android:onClick="@{()->presenter.dumpToSop()}"
android:visibility="gone"/>
android:visibility="@{item.subStatus == 5?View.VISIBLE:View.GONE}"/>
<ImageView
style="@style/card_line"
......@@ -100,7 +105,7 @@
android:layout_marginStart="22dp"
android:layout_toEndOf="@+id/text_one_text"
android:layout_toRightOf="@+id/text_one_text"
android:text="@string/now_no"
android:text="@{item.categoryName??@string/now_no}"
android:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15"/>
</RelativeLayout>
......@@ -137,7 +142,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_two_text"
android:text="@string/now_no"
android:text="@{item.brandName??@string/now_no}"
android:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15"
/>
......@@ -176,7 +181,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/dp_21.3"
android:layout_toRightOf="@id/text_six_text"
android:text="@string/now_no"
android:text="@{item.providerName??@string/now_no}"
android:textColor="@color/cl_selector_hui"
android:textSize="@dimen/sp_15"
/>
......@@ -568,8 +573,8 @@
android:layout_marginTop="@dimen/dp_33"
android:background="@mipmap/save_back"
android:gravity="center"
android:text="@string/tv_save_back"
android:onClick="@{()->presenter.saveOrder()}"
android:text="@string/tv_save_back"
android:textColor="@color/cl_tab_line"
/>
......@@ -582,8 +587,8 @@
android:layout_marginRight="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_33"
android:background="@mipmap/save_submit"
android:text="@string/submit_order"
android:onClick="@{()->presenter.submitOrder()}"
android:text="@string/submit_order"
android:textColor="@color/cl_white"
android:textSize="@dimen/sp_13.3"
/>
......
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