Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java

@@ -19,7 +19,6 @@ import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
 import java.util.List;
 
-import me.yokeyword.fragmentation.ISupportFragment;
 import me.yokeyword.fragmentation.SupportActivity;
 
 /**
@@ -122,16 +121,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
         }
     }
 
-    private long mTime = 0;
-
-    @Override
-    public void start(ISupportFragment toFragment) {
-        if ((System.currentTimeMillis() - mTime) > 1000) {
-            mTime = System.currentTimeMillis();
-            super.start(toFragment);
-        }
-    }
-
     @Override
     protected void onResume() {
         if (SPUtils.getInstance().getBoolean(C.SYSTEM.DIALOGISDISMISS)) {

app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java

@@ -1009,7 +1009,7 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
 
     @Override
     public String getDRAW_URL() {
-        return "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx552cf715dd0107d0&redirect_uri=http://demo.51zzd.cn/wx&response_type=code&scope=snsapi_base&state=4" + LoginPresenter.loginReturnBean.getShopMapId() + "#wechat_redirect";
+        return "http://tk.demo.xingdata.com/wx/jump.html?sid=" + LoginPresenter.loginReturnBean.getShopMapId() ;
     }
 
     @Override