1 修改报名相关逻辑

杨帅
1 parent 3338979a
Showing 10 changed files with 194 additions and 63 deletions
app/build.gradle
app/src/main/java/com/example/modulepedometer/MainActivity.java
app/src/main/java/com/example/modulepedometer/MyApp.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RegistrationInfoPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/ApiServiceBaiDu.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/SubscriptionRequest.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/BaiduTraceBean.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/Sha1Util.java
@@ -28,7 +28,8 @@ android {
             buildConfigField("String", "APP_ID", stringValue("802_jhbqccxw08"))
             buildConfigField("String", "APP_KEY", stringValue("9c5619e9be747bb3b925dd215ca5923d86f12c09b9394f"))
             buildConfigField("String", "APP_SCERET", stringValue("1e6380cb347255e777f72b5aa60f41daa68443a132aaea"))
-//            BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2" //测试
+            buildConfigField("String", "BAIDU_MAP_APP_KEY", stringValue("2IIsTtvX2FA88yvDrPZedc2ZvMhxyDbN"))
+// BAIDU_MAP_APP_KEY: "OeotXc38bbnU7WmyKGA0VMahk4v35VG2" //测试
  
             manifestPlaceholders = [
  
@@ -45,6 +46,8 @@ android {
             buildConfigField("String", "APP_ID", stringValue("769_jetj7bq525"))
             buildConfigField("String", "APP_KEY", stringValue("0d57b045ec0c3988a682d94c644e66b9b8e0d2b8ef937d"))
             buildConfigField("String", "APP_SCERET", stringValue("275e8dc29274a1186d82f65bc607c231d02bcb3bfd8976"))
+            buildConfigField("String", "BAIDU_MAP_APP_KEY", stringValue("Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"))
+
             manifestPlaceholders = [
                     BAIDU_MAP_APP_KEY: "Q7y9SGcZVs0tmhbNTiaz0jHm4S1xGzE2"
 //                    BAIDU_MAP_APP_KEY: "0bWeo04KKKHqTwozcqgyLZVd0oVhv3rZ"
@@ -24,14 +24,16 @@ public class MainActivity extends AppCompatActivity {
         findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(MainActivity.this, RunLineActivity.class);
-                startActivity(intent);
+//                Intent intent = new Intent(MainActivity.this, RunLineActivity.class);
+//                startActivity(intent);
+                RunLineActivity.newInstance(MainActivity.this,"358916",null,null,null);
             }
         });
         findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 RaceListActivity.newInstance(MainActivity.this,"10513196",null,null);
+
                 //跳转界面
 //                CollRunningFinishActivity.startActivity(MainActivity.this);
             }
@@ -13,7 +13,7 @@ public class MyApp extends Application {
         super.onCreate();
         String userId = "";
         AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
-                0, BuildConfig.DEBUG, "", "",
+                0, BuildConfig.DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "",
                 userId, "", "", "", "","","","");
         initARouter();
         //在使用SDK各组件之前初始化context信息，传入ApplicationContext
 package com.cnlive.moudle.pedometer.frame.presenter;
  
+import android.app.Activity;
 import android.content.Context;
+import android.util.Log;
 import android.widget.Toast;
  
+import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.moudle.pedometer.frame.view.RegistrationInfoView;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.net.ApiServiceBaiDu;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaiduTraceBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.utils.Sha1Util;
+import com.example.moudle_pedometer.BuildConfig;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
 import java.util.HashMap;
@@ -24,20 +32,20 @@ import io.reactivex.disposables.Disposable;
  */
 public class RegistrationInfoPresenter extends MvpBasePresenter<RegistrationInfoView> {
  
-    public void commitInfo(Context context,String eventId,String sid,String mobile,String sex,String birthday){
+    public void commitInfo(Context context, String eventId, String sid, String mobile, String sex, String birthday) {
         HashMap<String, String> map = new HashMap<>();
         map.put("eventId", eventId);
         map.put("sid", sid);
         map.put("mobile", mobile);
-        if(sex.equals("女")){
+        if (sex.equals("女")) {
             sex = "1";
-        }else if (sex.equals("男")){
+        } else if (sex.equals("男")) {
             sex = "0";
         }
         map.put("sex", sex);
-        if(birthday.contains("年")) birthday = birthday.replace("年","-");
-        if(birthday.contains("月")) birthday = birthday.replace("月","-");
-        if(birthday.contains("日")) birthday = birthday.replace("日","");
+        if (birthday.contains("年")) birthday = birthday.replace("年", "-");
+        if (birthday.contains("月")) birthday = birthday.replace("月", "-");
+        if (birthday.contains("日")) birthday = birthday.replace("日", "");
         map.put("birthday", birthday);
         Logic.create(map).action(new Logic.Action<Map<String, String>, BaseInfo>() {
             @Override
@@ -47,15 +55,53 @@ public class RegistrationInfoPresenter extends MvpBasePresenter&lt;RegistrationInfo
         }).<BaseInfo>event().setFailureCallback(new FailureCallback() {
             @Override
             public void onFailure(int code, String message) {
-                Toast.makeText(context,"报名失败",Toast.LENGTH_LONG).show();
+                Toast.makeText(context, "报名失败", Toast.LENGTH_LONG).show();
             }
         }).setSuccessCallback(new SuccessCallback<BaseInfo>() {
             @Override
             public void onSuccess(BaseInfo registerInfo) {
-                if (getView() != null){
+                if (getView() != null) {
                     getView().toResult();
                 }
             }
         }).start();
     }
+
+    public void addEntity(Activity context, String entityName, CallBack callBack) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("mcode", Sha1Util.getSHA1(context) + ";" + context.getPackageName());
+        map.put("ak", AppConfig.getBaiduAppKey());
+        map.put("service_id", Constant.SERVICE_ID + "");
+        map.put("entity_name", entityName);
+
+        Logic.create(map).action(new Logic.Action<Map<String, String>, BaiduTraceBean>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaiduTraceBean> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceBaiDu.class, api -> api.addEntity(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaiduTraceBean>event().setFailureCallback(new FailureCallback() {
+            @Override
+            public void onFailure(int code, String message) {
+                if (null == getView() || null == callBack) {
+                    return;
+                }
+                callBack.onFailed(message);
+
+            }
+        }).setSuccessCallback(new SuccessCallback<BaiduTraceBean>() {
+            @Override
+            public void onSuccess(BaiduTraceBean baiduTraceBean) {
+                if (null == getView() || null == callBack) {
+                    return;
+                }
+                callBack.onSuccess(baiduTraceBean.getStatus(), baiduTraceBean.getMessage());
+            }
+        }).start();
+    }
+
+    public interface CallBack {
+        void onSuccess(int state, String msg);
+
+        void onFailed(String msg);
+    }
 }
@@ -1028,9 +1028,19 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 isDifferentStreet = true;
             }
  
-        } else {
-            fragment.binding.tvRunNow.setText("立即开始");
+        }
+
+        if (null == runRaceDetailInfo) {
+            return;
+        }
+        if (runRaceDetailInfo.isSignResult()) {
             fragment.binding.rlScrollViewStartBtn.setTag("1");
+            fragment.binding.tvRunNow.setText("现在开始");
+            fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+        } else {
+            fragment.binding.rlScrollViewStartBtn.setTag("0");
+            fragment.binding.tvRunNow.setText("立即报名");
+            fragment.binding.tvGoTip.setVisibility(View.GONE);
         }
         //判断赛事是否已经结束
         checkTheRaceIsEnd();
@@ -1245,6 +1255,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.rlScrollViewStartBtn.setTag("1");
         fragment.binding.tvRunNow.setText("现在开始");
         fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+        if (null != runRaceDetailInfo) {
+            runRaceDetailInfo.setSignResult(true);
+        }
     }
  
 }
+package com.cnlive.moudle.pedometer.net;
+
+import com.cnlive.moudle.pedometer.net.bean.BaiduTraceBean;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.upload.StorageInfoData;
+import com.cnlive.moudle.pedometer.net.bean.upload.UploadAuthData;
+
+import java.util.List;
+import java.util.Map;
+
+import io.reactivex.Observable;
+import retrofit2.adapter.rxjava2.Result;
+import retrofit2.http.POST;
+import retrofit2.http.QueryMap;
+
+
+/**
+ * 百度官方接口
+ */
+public interface ApiServiceBaiDu {
+
+
+    /**
+     * 上传鉴权
+     *
+     * @param maps
+     * @return
+     */
+    @POST("api/v3/entity/add")
+    Observable<Result<BaiduTraceBean>> addEntity(@QueryMap Map<String, String> maps);
+
+
+}
@@ -37,6 +37,8 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
     public static final String SP_DEBUG_URL = "http://apiwjjtest.cnlive.com/";
     //OPEN API 接口域名
     private Observable observable;
+    //百度官方接口
+    public static final String BAIDU_TRACE_URL = "http://yingyan.baidu.com/";
  
     private static <T> String baseCMSEndpoint() {
         return AppConfig.isDebug() ? SP_CMS_URL_DEBUT : SP_CMS_URL;
@@ -49,6 +51,8 @@ public class SubscriptionRequest&lt;Observable extends io.reactivex.Observable&lt;Resu
     private static <T> String serviceEndpoint(Class<T> clazz) {
         if (clazz == ApiServiceOpen.class) {
             return OPEN_URL;
+        } else if (clazz == ApiServiceBaiDu.class) {
+            return BAIDU_TRACE_URL;
         } else {
             return baseEndpoint();
         }
+package com.cnlive.moudle.pedometer.net.bean;
+
+public class BaiduTraceBean  extends  BaseInfo{
+    private int status;
+    private String message;
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    @Override
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
@@ -24,6 +24,7 @@ import com.baidu.trace.model.LocationMode;
 import com.baidu.trace.model.OnTraceListener;
 import com.baidu.trace.model.PushMessage;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RegistrationInfoPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RegistrationInfoView;
@@ -68,16 +69,17 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
      * @param fenceId
      */
     public void addMonitorToFence(int fenceId) {
+        if (null == getPresenter()) {
+            return;
+        }
         QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
         LBSTraceClient mClient = new LBSTraceClient(getContext());
         // 设置定位和打包周期
         mClient.setInterval(Constant.GATHER_INTERVAL, Constant.PACK_INTERVAL);
         //设置定位模式
         mClient.setLocationMode(LocationMode.High_Accuracy);
-        Trace mTrace = new Trace(Constant.SERVICE_ID, CommonInfo.getUserId(getContext()));
         //将设备添加到围栏中
         AddMonitoredPersonRequest addMonitoredPersonRequest = AddMonitoredPersonRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, fenceId, CommonInfo.getUserId(getContext()));
-
         // 初始化围栏监听器
         OnFenceListener onFenceListener = new OnFenceListener() {
             // 创建围栏回调
@@ -125,7 +127,9 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                         //将设备添加到围栏中
                         mClient.addFenceMonitoredPerson(addMonitoredPersonRequest, this);
                     }
-                } else if (addMonitoredPersonResponse.getStatus() == 0) {
+                }
+                //成功
+                else if (addMonitoredPersonResponse.getStatus() == 0) {
                     QMUITipDialogUtil.dismessDialog();
                     getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "15210479774",
                             binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
@@ -144,62 +148,27 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
             public void onListMonitoredPersonCallback(ListMonitoredPersonResponse listMonitoredPersonResponse) {
             }
         };
-
-
-        //启动鹰眼服务
-        OnTraceListener traceListener = new OnTraceListener() {
-            @Override
-            public void onBindServiceCallback(int i, String s) {
-
-            }
-
-            @Override
-            public void onStartTraceCallback(int i, String s) {
-                if (0 == i) {
-                    //开启采集
-                    mClient.startGather(this);
-                } else {
-                    QMUITipDialogUtil.dismessDialog();
-                }
-            }
-
-            @Override
-            public void onStopTraceCallback(int i, String s) {
-
-            }
-
+        //将entity添加到百度服务中
+        getPresenter().addEntity(getActivity(), CommonInfo.getUserId(getActivity()), new RegistrationInfoPresenter.CallBack() {
             @Override
-            public void onStartGatherCallback(int i, String s) {
-                if (0 == i) {
-                    mClient.stopGather(this);
+            public void onSuccess(int state, String msg) {
+                QMUITipDialogUtil.dismessDialog();
+                if (0 == state || 3005 == state) {
                     //将设备添加到围栏中
                     mClient.addFenceMonitoredPerson(addMonitoredPersonRequest, onFenceListener);
-                } else {
-                    QMUITipDialogUtil.dismessDialog();
+                }else {
+                    AlertUtil.showDeftToast(getContext(), msg);
                 }
             }
  
             @Override
-            public void onStopGatherCallback(int i, String s) {
-                if (0 == i) {
-                    mClient.stopTrace(mTrace, this);
-                } else {
-                    QMUITipDialogUtil.dismessDialog();
-                }
+            public void onFailed(String msg) {
+                QMUITipDialogUtil.dismessDialog();
+                AlertUtil.showDeftToast(getContext(), msg);
             }
  
-            @Override
-            public void onPushCallback(byte b, PushMessage pushMessage) {
-
-            }
+        });
  
-            @Override
-            public void onInitBOSCallback(int i, String s) {
-
-            }
-        };
-        //启动鹰眼服务
-        mClient.startTrace(mTrace, traceListener);
  
     }
  
+package com.cnlive.moudle.pedometer.utils;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Locale;
+
+public class Sha1Util {
+    public static String getSHA1(Context context) {
+        try {
+            PackageInfo info = context.getPackageManager().getPackageInfo(
+                    context.getPackageName(), PackageManager.GET_SIGNATURES);
+            byte[] cert = info.signatures[0].toByteArray();
+            MessageDigest md = MessageDigest.getInstance("SHA1");
+            byte[] publicKey = md.digest(cert);
+            StringBuffer hexString = new StringBuffer();
+            for (int i = 0; i < publicKey.length; i++) {
+                String appendString = Integer.toHexString(0xFF & publicKey[i])
+                        .toUpperCase(Locale.US);
+                if (appendString.length() == 1)
+                    hexString.append("0");
+                hexString.append(appendString);
+                hexString.append(":");
+            }
+            String result = hexString.toString();
+            return result.substring(0, result.length() - 1);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+}