diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 978f4dc..79d11f0 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -22,6 +22,7 @@ diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index 24aa1b5..0db5fac 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -43,4 +43,7 @@ dependencies { implementation 'com.elegant.spi:api:1.0.9' annotationProcessor 'com.elegant.spi:compiler:1.0.3' + + implementation project(path: ':foudations:mogo-passport') + implementation project(path: ':foudations:mogo-commons') } \ No newline at end of file diff --git a/modules/mogo-tanlu/src/androidTest/java/com/mogo/tanlu/ExampleInstrumentedTest.java b/modules/mogo-tanlu/src/androidTest/java/com/mogo/cloud/ExampleInstrumentedTest.java similarity index 96% rename from modules/mogo-tanlu/src/androidTest/java/com/mogo/tanlu/ExampleInstrumentedTest.java rename to modules/mogo-tanlu/src/androidTest/java/com/mogo/cloud/ExampleInstrumentedTest.java index b8d4a9e..5643b64 100644 --- a/modules/mogo-tanlu/src/androidTest/java/com/mogo/tanlu/ExampleInstrumentedTest.java +++ b/modules/mogo-tanlu/src/androidTest/java/com/mogo/cloud/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.cloud; import android.content.Context; diff --git a/modules/mogo-tanlu/src/main/AndroidManifest.xml b/modules/mogo-tanlu/src/main/AndroidManifest.xml index 2120c43..0cca2d9 100644 --- a/modules/mogo-tanlu/src/main/AndroidManifest.xml +++ b/modules/mogo-tanlu/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.mogo.cloud"> \ No newline at end of file diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/UploadManager.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/UploadManager.java new file mode 100644 index 0000000..093bfa6 --- /dev/null +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/UploadManager.java @@ -0,0 +1,45 @@ +package com.mogo.cloud; + +import android.content.Context; + +import com.mogo.cloud.api.ITanluUploadCallback; +import com.mogo.cloud.bean.InformationBody; + +/** + * @author lixiaopeng + * @description + * @since 2021/1/21 + */ +public class UploadManager { + private static UploadManager sInstance; + private Context mContext; + + private UploadManager (Context context) { + mContext = context; + } + + public static UploadManager getInstance(Context context) { + if (sInstance == null) { + synchronized (UploadManager.class) { + sInstance = new UploadManager(context); + } + } + + return sInstance; + } + + /** + * + * @param sn + * @param informationBody + * @param callback + */ + public void loadUpload(String sn, InformationBody informationBody, ITanluUploadCallback callback) { + + } + + + + + +} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ILoadUpload.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ILoadUpload.java new file mode 100644 index 0000000..8ce92d4 --- /dev/null +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ILoadUpload.java @@ -0,0 +1,13 @@ +package com.mogo.cloud.api; + + +import com.mogo.cloud.bean.InformationBody; + +/** + * @author lixiaopeng + * @description + * @since 2021/1/20 + */ +public interface ILoadUpload { + void loadUpload(String sn, InformationBody informationBody, ITanluUploadCallback callback); +} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/IRoadInfoSearchCallback.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/IRoadInfoSearchCallback.java new file mode 100644 index 0000000..d07ec45 --- /dev/null +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/IRoadInfoSearchCallback.java @@ -0,0 +1,13 @@ +package com.mogo.cloud.api; + +import com.mogo.cloud.bean.RoadInfos; + +/** + * @author lixiaopeng + * @description + * @since 2021/1/20 + */ +public interface IRoadInfoSearchCallback { + void onSuccess(RoadInfos result); + void onFailure(int code); +} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ITanluUpload.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ITanluUploadCallback.java similarity index 56% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ITanluUpload.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ITanluUploadCallback.java index 9ced506..881a799 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ITanluUpload.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/api/ITanluUploadCallback.java @@ -1,13 +1,13 @@ -package com.mogo.tanlu.api; +package com.mogo.cloud.api; -import com.mogo.tanlu.bean.UploadResult; +import com.mogo.cloud.bean.UploadResult; /** * @author lixiaopeng * @description * @since 2021/1/20 */ -public interface ITanluUpload { +public interface ITanluUploadCallback { void onSuccess(UploadResult result); void onFailure(int code); } diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/InformationBody.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/InformationBody.java similarity index 99% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/InformationBody.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/InformationBody.java index 5d9b028..e34c349 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/InformationBody.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/InformationBody.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import java.io.Serializable; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWay.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWay.java similarity index 98% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWay.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWay.java index 2e93938..2a47056 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWay.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWay.java @@ -1,8 +1,8 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import android.text.TextUtils; -import com.mogo.tanlu.bean.location.MarkerLocation; +import com.mogo.cloud.bean.location.MarkerLocation; import java.io.Serializable; import java.util.List; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWayItem.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWayItem.java similarity index 97% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWayItem.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWayItem.java index 510a3cf..c610527 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerExploreWayItem.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerExploreWayItem.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import android.text.TextUtils; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerUserInfo.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerUserInfo.java similarity index 99% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerUserInfo.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerUserInfo.java index 60f1bb2..24088fb 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/MarkerUserInfo.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/MarkerUserInfo.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import android.text.TextUtils; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfoRequest.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfoRequest.java similarity index 94% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfoRequest.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfoRequest.java index 185a3ac..062f8e5 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfoRequest.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfoRequest.java @@ -1,6 +1,6 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; -import com.mogo.tanlu.bean.location.Location; +import com.mogo.cloud.bean.location.Location; import java.util.ArrayList; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfos.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfos.java similarity index 91% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfos.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfos.java index bbe3950..58922f9 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/RoadInfos.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/RoadInfos.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import java.util.List; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/UploadResult.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/UploadResult.java similarity index 93% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/UploadResult.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/UploadResult.java index 7c6631a..a66fe79 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/UploadResult.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/UploadResult.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean; +package com.mogo.cloud.bean; import java.io.Serializable; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/Location.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/Location.java similarity index 92% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/Location.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/Location.java index e1a3084..4bf7aa7 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/Location.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/Location.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean.location; +package com.mogo.cloud.bean.location; import java.io.Serializable; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MarkerLocation.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MarkerLocation.java similarity index 96% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MarkerLocation.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MarkerLocation.java index 428444b..d7ceaa0 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MarkerLocation.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MarkerLocation.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean.location; +package com.mogo.cloud.bean.location; import android.text.TextUtils; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MogoLocation.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MogoLocation.java similarity index 99% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MogoLocation.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MogoLocation.java index 7085274..69b26cb 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/bean/location/MogoLocation.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/bean/location/MogoLocation.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.bean.location; +package com.mogo.cloud.bean.location; import android.os.Parcel; import android.os.Parcelable; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/constant/HttpConstant.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/constant/HttpConstant.java similarity index 74% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/constant/HttpConstant.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/constant/HttpConstant.java index 1354ca4..ac934af 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/constant/HttpConstant.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/constant/HttpConstant.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu.constant; +package com.mogo.cloud.constant; /** * @author lixiaopeng diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/cloud/impl/LoadUploadImpl.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/impl/LoadUploadImpl.java new file mode 100644 index 0000000..8e8fc6f --- /dev/null +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/impl/LoadUploadImpl.java @@ -0,0 +1,13 @@ +package com.mogo.cloud.impl; + +import com.mogo.cloud.api.ILoadUpload; +import com.mogo.cloud.api.ITanluUploadCallback; +import com.mogo.cloud.bean.InformationBody; + +/** + * @author lixiaopeng + * @description 请求上报 + * @since 2021/1/20 + */ +public class LoadUploadImpl { +} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/net/TanluApiService.java similarity index 89% rename from modules/mogo-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java rename to modules/mogo-tanlu/src/main/java/com/mogo/cloud/net/TanluApiService.java index 5514fa9..5733af4 100644 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/net/TanluApiService.java +++ b/modules/mogo-tanlu/src/main/java/com/mogo/cloud/net/TanluApiService.java @@ -1,7 +1,7 @@ -package com.mogo.tanlu.net; +package com.mogo.cloud.net; -import com.mogo.tanlu.bean.RoadInfos; -import com.mogo.tanlu.bean.UploadResult; +import com.mogo.cloud.bean.RoadInfos; +import com.mogo.cloud.bean.UploadResult; import java.util.Map; diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/TestActivity.java b/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/TestActivity.java deleted file mode 100644 index 8b8d006..0000000 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/TestActivity.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.mogo.tanlu; - -import android.os.Bundle; -import android.os.PersistableBundle; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; - -import com.elegant.spi.AbstractDelegateManager; -import com.mogo.tanlu.api.ILoadUpload; -import com.mogo.tanlu.api.ITanluUpload; -import com.mogo.tanlu.bean.InformationBody; -import com.mogo.tanlu.bean.UploadResult; - -/** - * @author lixiaopeng - * @description 纯测试，没有注册类 - * @since 2021/1/20 - */ -public class TestActivity extends AppCompatActivity { - -// private TanluDelegateManager testDelegateManager; - private UploadDelegateManager uploadDelegateManager; - - @Override - public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) { - super.onCreate(savedInstanceState, persistentState); - -// testDelegateManager = new TanluDelegateManager(); - uploadDelegateManager = new UploadDelegateManager(); - } - - - //如何回调回去成功和失败， - //如何更加简化使用api - //是不是意味着使用方也需要添加spi - public class UploadDelegateManager extends AbstractDelegateManager { - public UploadDelegateManager() { - //加载实现了spi接口的自定义服务 - loadDelegates(TestActivity.this, ILoadUpload.class, new DelegateListener() { - @Override - public void onDelegate(String unit, ILoadUpload p) { - //加载成功，调用各个服务自定义show方法 TODO - p.loadUpload("F803EB2046PZD00228", new InformationBody()); - } - }); - } - } - - - //实现AbstractDelegateManager -// public class TanluDelegateManager extends AbstractDelegateManager { -// public TanluDelegateManager() { -// //加载实现了spi接口的自定义服务 -// loadDelegates(TestActivity.this, ITanluUpload.class, new DelegateListener() { -// @Override -// public void onDelegate(String unit, ITanluUpload p) { -// //加载成功，调用各个服务自定义show方法 -// p.onFailure(0); -// p.onSuccess(new UploadResult()); -// } -// }); -// } -// } - - -} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ILoadUpload.java b/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ILoadUpload.java deleted file mode 100644 index 1d40744..0000000 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/api/ILoadUpload.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mogo.tanlu.api; - - -import com.mogo.tanlu.bean.InformationBody; - -/** - * @author lixiaopeng - * @description - * @since 2021/1/20 - */ -public interface ILoadUpload { - void loadUpload(String sn, InformationBody informationBody); -} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/LoadUploadImpl.java b/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/LoadUploadImpl.java deleted file mode 100644 index f298ba0..0000000 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/LoadUploadImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.mogo.tanlu.impl; - -import android.util.Log; - -import com.elegant.spi.annotations.Service; -import com.mogo.tanlu.api.ILoadUpload; -import com.mogo.tanlu.bean.InformationBody; - -/** - * @author lixiaopeng - * @description 请求上报 - * @since 2021/1/20 - */ -@Service(value = LoadUploadImpl.class, unit = "tanlu") -public class LoadUploadImpl implements ILoadUpload { - @Override - public void loadUpload(String sn, InformationBody informationBody) { - //TODO - Log.d("liyz", "loadUpload sn = " + sn); - - } -} diff --git a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/TanluUploadImpl.java b/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/TanluUploadImpl.java deleted file mode 100644 index 5b8c96d..0000000 --- a/modules/mogo-tanlu/src/main/java/com/mogo/tanlu/impl/TanluUploadImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.tanlu.impl; - -import android.util.Log; - -import com.elegant.spi.annotations.Service; -import com.mogo.tanlu.api.ITanluUpload; -import com.mogo.tanlu.bean.UploadResult; - -/** - * @author lixiaopeng - * @description - * @since 2021/1/20 - */ -@Service(value = ITanluUpload.class, unit = "tanlu") -public class TanluUploadImpl implements ITanluUpload { - - @Override - public void onSuccess(UploadResult result) { - Log.d("liyz", "onSuccess ----->"); - } - - @Override - public void onFailure(int code) { - Log.e("liyz", "onFailure ----->"); - } - -} diff --git a/modules/mogo-tanlu/src/test/java/com/mogo/tanlu/ExampleUnitTest.java b/modules/mogo-tanlu/src/test/java/com/mogo/cloud/ExampleUnitTest.java similarity index 93% rename from modules/mogo-tanlu/src/test/java/com/mogo/tanlu/ExampleUnitTest.java rename to modules/mogo-tanlu/src/test/java/com/mogo/cloud/ExampleUnitTest.java index 6e1b89c..2802386 100644 --- a/modules/mogo-tanlu/src/test/java/com/mogo/tanlu/ExampleUnitTest.java +++ b/modules/mogo-tanlu/src/test/java/com/mogo/cloud/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.mogo.tanlu; +package com.mogo.cloud; import org.junit.Test;