Merge branch 'dev_merge_extension_entrance' into dev

合并了右侧顶部的几个view，合并到了EntranceFragment中，ExtensionFragment暂时不使用了 # Conflicts: # modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
2020-07-01 15:13:16 +08:00
parent aff9c5f576 49986bfc24
commit 32528ff385
8 changed files with 455 additions and 253 deletions
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -7,6 +7,7 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,7 +41,9 @@ import com.mogo.module.common.map.Scene;
 import com.mogo.module.extensions.ExtensionsModuleConst;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.navi.NaviInfoView;
+import com.mogo.module.extensions.userinfo.UserInfo;
 import com.mogo.module.extensions.utils.TopViewAnimHelper;
+import com.mogo.module.share.manager.ServiceApisManager;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
@@ -56,6 +59,7 @@ import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.LaunchUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.UiThreadHandler;
+import com.mogo.utils.glide.GlideApp;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.roadcondition.service.DelayService;

@@ -109,6 +113,17 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
    private EntrancePresenter mEntrancePresenter;
    private IMogoStatusManager mStatusManager;

+    public static final int MAX_DISPLAY_MSG_AMOUNT = 99;
+
+    private View mWeatherContainer;
+    private ImageView mWeatherIcon;
+    private TextView mWeatherTemp;
+
+    private View mMsgContainer;
+    private TextView mMsgCounter;
+
+    private ImageView mUserHeadImg;
+

    /**
     * 搜索莫模块
@@ -404,6 +419,32 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
                e.printStackTrace();
            }
        } );
+
+        mWeatherContainer = findViewById( R.id.module_ext_id_weather_container );
+        mWeatherIcon = findViewById( R.id.module_ext_id_weather_icon );
+        mWeatherTemp = findViewById( R.id.module_ext_id_weather_temp );
+
+        mUserHeadImg = findViewById(R.id.ivUserHeadImg);
+
+        mMsgContainer = findViewById( R.id.module_ext_id_msg );
+
+        mMsgContainer.setOnClickListener( view -> {
+            ARouter.getInstance().build( "/push/ui/message" ).navigation( getContext() );
+        } );
+        mMsgCounter = findViewById( R.id.module_ext_id_msg_counter );
+        mUserHeadImg.setOnClickListener(view ->{
+            try {
+                LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal");
+                // 埋点
+                final Map<String, Object> properties = new HashMap<>();
+                properties.put("type", 3);
+                ServiceApisManager.serviceApis.getAnalyticsApi().track( "Launcher_APP_Icon", properties );
+            } catch (Exception e) {
+                Logger.e(TAG, e, "打开个人中心Exception");
+            }
+        });
+
+        mUserHeadImg.setVisibility(DebugConfig.isLauncher()?View.VISIBLE:View.GONE);
    }

    public void showShareDialog() {
@@ -610,4 +651,34 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
        // 30s 后无论成功与否，停止动画
        mUploadFrameAnimHandler.sendEmptyMessageDelayed( MSG_STOP_ANIM, 30_000 );
    }
+
+    @Override
+    public void renderWeatherInfo( String temp, String desc, int iconId ) {
+        boolean hidden = false;
+        if ( iconId != 0 ) {
+            mWeatherIcon.setImageResource( iconId );
+            mWeatherIcon.setVisibility( View.VISIBLE );
+        } else {
+            mWeatherIcon.setVisibility( View.GONE );
+            hidden |= true;
+        }
+        hidden |= TextUtils.isEmpty( temp );
+        hidden |= TextUtils.isEmpty( desc );
+        mWeatherTemp.setText( temp );
+        mWeatherContainer.setVisibility( hidden ? View.GONE : View.VISIBLE );
+    }
+
+    @Override
+    public void renderMsgInfo( boolean hasMsg, int amount ) {
+        mMsgContainer.setVisibility( hasMsg ? View.VISIBLE : View.GONE );
+        mMsgCounter.setText( amount > MAX_DISPLAY_MSG_AMOUNT ? getString( R.string.module_ext_str_dots ) : String.valueOf( amount ) );
+    }
+
+    @Override
+    public void renderUserInfo(UserInfo userInfo) {
+        if(userInfo != null){
+            Logger.d(TAG, "renderUserInfo: " + userInfo);
+            GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).placeholder(R.drawable.model_ext_default_user_head).circleCrop().into(mUserHeadImg);
+        }
+    }
 }
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntrancePresenter.java
@@ -1,11 +1,38 @@
 package com.mogo.module.extensions.entrance;

 import android.content.Context;
+import android.util.ArrayMap;

 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;

+import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.module.extensions.R;
+import com.mogo.module.extensions.net.UserInfoNetApiServices;
+import com.mogo.module.extensions.userinfo.UserInfo;
+import com.mogo.module.extensions.userinfo.UserInfoConstant;
+import com.mogo.module.extensions.userinfo.UserInfoResponse;
+import com.mogo.module.extensions.utils.ExtensionsConfig;
+import com.mogo.module.extensions.weather.Phenomena;
+import com.mogo.module.extensions.weather.WeatherCallback;
+import com.mogo.module.extensions.weather.WeatherInfo;
+import com.mogo.module.extensions.weather.WeatherModel;
+import com.mogo.service.IMogoServiceApis;
+import com.mogo.service.MogoServicePaths;
+import com.mogo.service.network.IMogoNetwork;
+import com.mogo.service.statusmanager.IMogoMsgCenter;
+import com.mogo.service.statusmanager.IMogoMsgCenterListener;
+import com.mogo.utils.digest.DigestUtils;
+import com.mogo.utils.logger.Logger;
+import com.zhidao.auto.platform.util.DeviceUtil;
+
+import java.util.Map;
+
+import io.reactivex.SingleObserver;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;

 /**
 * @author congtaowang
@@ -13,23 +40,123 @@ import com.mogo.commons.mvp.Presenter;
 * <p>
 * 描述
 */
-public class EntrancePresenter extends Presenter<EntranceView> {
+public class EntrancePresenter extends Presenter<EntranceView> implements WeatherCallback,
+        IMogoMsgCenterListener {
+    private static final String TAG = "EntrancePresenter";
+
+    private WeatherModel mWeatherModel;
+
+    private IMogoMsgCenter mMsgCenter;
+
+    private IMogoNetwork mNetWork;

    public EntrancePresenter(Context context, EntranceView view) {
        super(view);
+        mWeatherModel = new WeatherModel( getContext() );
+        mNetWork =
+                ((IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(view.getContext())).getNetworkApi();
    }

-
-    @Override
-    public void onResume(@NonNull LifecycleOwner owner) {
-        super.onResume(owner);
-    }
-
-
    @Override
    public void onCreate(@NonNull LifecycleOwner owner) {
        super.onCreate(owner);
+        mWeatherModel.init( this );
+        mWeatherModel.queryWeatherInformation();
+        mMsgCenter = ( IMogoMsgCenter ) ARouter.getInstance().build( MogoServicePaths.PATH_MSG_CENTER ).navigation();
+        mMsgCenter.registerMsgCenterListener( this );
    }

+    @Override
+    public void onWeatherLoaded( WeatherInfo weatherInfo ) {
+        if ( weatherInfo == null ) {
+            return;
+        }
+        String temp = getContext().getResources().getString( R.string.module_ext_str_weather_temp_format, weatherInfo.getTemperature() );
+        Phenomena phenomena = Phenomena.getById( weatherInfo.getPhenomena() );
+        String desc = phenomena == null ? "" : phenomena.nameCn;
+        int resId = phenomena.resId;
+        mView.renderWeatherInfo( temp, desc, resId );
+    }
+
+    @Override
+    public void onMsgChanged( boolean hasMsg, int amount ) {
+        if ( mView != null ) {
+            mView.renderMsgInfo( hasMsg, amount );
+        }
+    }
+
+    @Override
+    public void onResume( @NonNull LifecycleOwner owner ) {
+        super.onResume( owner );
+        if(ExtensionsConfig.needRequestUserInfo()){
+            // 相当于每次onResume都会请求一下个人信息，目的是能够相对及时的同步手机端的个人信息修改
+            requestUserInfo();
+        }
+    }
+
+    @Override
+    public void onPause( @NonNull LifecycleOwner owner ) {
+        super.onPause( owner );
+    }
+
+    @Override
+    public void onDestroy( @NonNull LifecycleOwner owner ) {
+        super.onDestroy( owner );
+        if ( mWeatherModel != null ) {
+            mWeatherModel.destroy();
+        }
+        if ( mMsgCenter != null ) {
+            mMsgCenter.unregisterMsgCenterListener( this );
+        }
+    }
+
+    private UserInfo userInfo;
+    public void requestUserInfo() {
+        Map<String, String> params = new ArrayMap<>();
+        params.put("sn", DeviceUtil.getSn());
+        params.put("source", "2");
+        String sign = createSign(params, "JGqZw9");
+        params.put("sig", sign);
+        mNetWork.create(UserInfoNetApiServices.class, UserInfoConstant.getUserInfoBaseUrl()).requestUserInfo(params).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()).subscribe(new SingleObserver<UserInfoResponse>() {
+            @Override
+            public void onSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onSuccess(UserInfoResponse userInfoBaseResponse) {
+                userInfo = userInfoBaseResponse.getResult();
+                if(userInfo!=null) {
+                    Logger.d(TAG, "获取个人信息成功: " + userInfo);
+                    mView.renderUserInfo(userInfo);
+                }else{
+                    Logger.e(TAG,"获取个人信息失败");
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                e.printStackTrace();
+                Logger.e(TAG, e, "获取个人信息失败==");
+            }
+        });
+    }
+
+    private String createSign(Map<String, String> map, String salt) {
+        try {
+            StringBuilder queryString = new StringBuilder();
+            for (Map.Entry<String, String> entry : map.entrySet()) {
+                queryString.append(entry.getKey())
+                        .append("=")
+                        .append(entry.getValue())
+                        .append("&");
+            }
+            queryString.append("key=").append(DigestUtils.shaHex(salt));
+            return DigestUtils.shaHex(queryString.toString()).toUpperCase();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Logger.e(TAG, e, "createSign()");
+            return "";
+        }
+    }

 }
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceView.java
@@ -1,6 +1,7 @@
 package com.mogo.module.extensions.entrance;

 import com.mogo.commons.mvp.IView;
+import com.mogo.module.extensions.ExtensionsView;
 import com.mogo.module.extensions.userinfo.UserInfo;

 /**
@@ -9,5 +10,5 @@ import com.mogo.module.extensions.userinfo.UserInfo;
 * <p>
 * 描述
 */
-public interface EntranceView extends IView {
+public interface EntranceView extends ExtensionsView {
 }