diff --git a/app/app-release.apk b/app/app-release.apk deleted file mode 100644 index b2cf412..0000000 Binary files a/app/app-release.apk and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index a7832f7..989aac4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { compileSdkVersion 25 buildToolsVersion "25.0.3" defaultConfig { - applicationId "com.yundian.celebrity" + applicationId "com.cloudTop.starshare" minSdkVersion 16 targetSdkVersion 22 versionCode 20170830 @@ -95,12 +95,12 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:25.3.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.1.2@aar' //菜单栏 compile 'com.github.bumptech.glide:glide:3.6.1' //显示图片框架 + //compile 'com.github.jdsjlzx:LRecyclerView:1.4.3' compile 'com.android.support:multidex:1.0.0' //分包 @@ -118,11 +118,17 @@ dependencies { compile 'org.greenrobot:eventbus:3.0.0' compile files('libs/alipaySingle-20170510.jar') // compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { + // transitive = true; + // } + //fabric + //compile project(':qAMasterSDK') + //compile 'com.getui:sdk:2.10.2.0' + //compile 'org.greenrobot:greendao:3.2.2' // add library compile 'com.qiangxi.checkupdatelibrary:checkupdatelibrary:1.1.2@aar' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.1' @@ -135,9 +141,13 @@ dependencies { testCompile 'org.mockito:mockito-core:1.10.19' testCompile 'org.robolectric:robolectric:3.0' // required if you want to use Powermock for unit tests + // testCompile 'org.powermock:powermock-module-junit4:1.5.6' + // testCompile 'org.powermock:powermock-module-junit4-rule:1.5.6' + // testCompile 'org.powermock:powermock-api-mockito:1.5.6' + // compile 'com.google.dagger:dagger:2.0.2' compile 'javax.annotation:jsr250-api:1.0' apt 'com.google.dagger:dagger-compiler:2.0.2' @@ -145,27 +155,22 @@ dependencies { androidTestCompile 'com.github.fabioCollini:DaggerMock:0.6.1' compile project(':qAMasterSDK') compile project(path: ':library') - - testCompile 'org.powermock:powermock-module-junit4:1.6.2' testCompile 'org.powermock:powermock-module-junit4-rule:1.6.2' testCompile 'org.powermock:powermock-api-mockito:1.6.2' testCompile 'org.powermock:powermock-classloading-xstream:1.6.2' - compile files('libs/pldroid-shortvideo-1.2.1.jar') compile 'com.android.support:multidex:1.0.1' compile 'com.qiniu:qiniu-android-sdk:7.3.3' compile(name: 'kw-filter', ext: 'aar') compile(name: 'kw-tracker', ext: 'aar') compile 'com.qiniu:happy-dns:0.2.+' - compile 'com.shuyu:gsyVideoPlayer-java:2.0.5' - -//根据你的需求 + //根据你的需求 compile 'com.shuyu:gsyVideoPlayer-armv5:2.0.5' compile 'com.shuyu:gsyVideoPlayer-armv7a:2.0.5' compile 'com.shuyu:gsyVideoPlayer-arm64:2.0.5' compile 'com.shuyu:gsyVideoPlayer-x64:2.0.5' compile 'com.shuyu:gsyVideoPlayer-x86:2.0.5' - +// compile project(':kiwi') } diff --git a/app/src/androidTest/java/com/yundian/celebrity/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/cloudTop/starshare/ExampleInstrumentedTest.java similarity index 85% rename from app/src/androidTest/java/com/yundian/celebrity/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/cloudTop/starshare/ExampleInstrumentedTest.java index 2d04847..ff1dc04 100644 --- a/app/src/androidTest/java/com/yundian/celebrity/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/cloudTop/starshare/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity; +package com.cloudTop.starshare; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public void useAppContext() throws Exception { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("com.yundian.celebrity", appContext.getPackageName()); + assertEquals("com.cloudTop.starshare", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88aca04..bb8c833 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.cloudTop.starshare"> @@ -30,9 +30,9 @@ android:required="true" /> - + @@ -51,14 +51,14 @@ - + @@ -67,7 +67,7 @@ @@ -194,20 +194,20 @@ - + @@ -480,13 +480,13 @@ - + - + @@ -513,7 +513,7 @@ - - + + @@ -605,21 +605,21 @@ android:configChanges="keyboardHidden|orientation|screenSize|fontScale" android:screenOrientation="portrait" /> diff --git a/app/src/main/java/com/yundian/celebrity/WBShareActivity.java b/app/src/main/java/com/cloudTop/starshare/WBShareActivity.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/WBShareActivity.java rename to app/src/main/java/com/cloudTop/starshare/WBShareActivity.java index 4a86346..a126ef5 100644 --- a/app/src/main/java/com/yundian/celebrity/WBShareActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/WBShareActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity; +package com.cloudTop.starshare; //import com.umeng.socialize.media.WBShareCallBackActivity; diff --git a/app/src/main/java/com/cloudTop/starshare/alipay/PayResult.java b/app/src/main/java/com/cloudTop/starshare/alipay/PayResult.java new file mode 100644 index 0000000..de6741f --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/alipay/PayResult.java @@ -0,0 +1 @@ +package com.cloudTop.starshare.alipay; import android.text.TextUtils; import java.util.Map; public class PayResult { private String resultStatus; private String result; private String memo; public PayResult(Map rawResult) { if (rawResult == null) { return; } for (String key : rawResult.keySet()) { if (TextUtils.equals(key, "resultStatus")) { resultStatus = rawResult.get(key); } else if (TextUtils.equals(key, "result")) { result = rawResult.get(key); } else if (TextUtils.equals(key, "memo")) { memo = rawResult.get(key); } } } @Override public String toString() { return "resultStatus={" + resultStatus + "};memo={" + memo + "};result={" + result + "}"; } /** * @return the resultStatus */ public String getResultStatus() { return resultStatus; } /** * @return the memo */ public String getMemo() { return memo; } /** * @return the result */ public String getResult() { return result; } } \ No newline at end of file diff --git a/app/src/main/java/com/yundian/celebrity/app/ActionConstant.java b/app/src/main/java/com/cloudTop/starshare/app/ActionConstant.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/app/ActionConstant.java rename to app/src/main/java/com/cloudTop/starshare/app/ActionConstant.java index 63f78ca..3305852 100644 --- a/app/src/main/java/com/yundian/celebrity/app/ActionConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/app/ActionConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; public interface ActionConstant { String fileName1 = "file:///android_asset/role.html"; //access下的html diff --git a/app/src/main/java/com/yundian/celebrity/app/AppApplication.java b/app/src/main/java/com/cloudTop/starshare/app/AppApplication.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/app/AppApplication.java rename to app/src/main/java/com/cloudTop/starshare/app/AppApplication.java index 13dcb9a..e7ad72c 100644 --- a/app/src/main/java/com/yundian/celebrity/app/AppApplication.java +++ b/app/src/main/java/com/cloudTop/starshare/app/AppApplication.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; import android.app.ActivityManager; import android.content.BroadcastReceiver; @@ -36,34 +36,34 @@ import com.umeng.socialize.Config; import com.umeng.socialize.PlatformConfig; import com.umeng.socialize.UMShareAPI; -import com.yundian.celebrity.BuildConfig; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.baseapp.BaseApplication; -import com.yundian.celebrity.bean.CheckUpdateInfoEntity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.LoginReturnInfo; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.Host; -import com.yundian.celebrity.networkapi.NetworkAPIConfig; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.PrivatizationConfig; -import com.yundian.celebrity.ui.wangyi.common.util.crash.AppCrashHandler; -import com.yundian.celebrity.ui.wangyi.common.util.sys.SystemUtil; -import com.yundian.celebrity.ui.wangyi.config.ExtraOptions; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.ui.wangyi.contact.ContactHelper; -import com.yundian.celebrity.ui.wangyi.event.DemoOnlineStateContentProvider; -import com.yundian.celebrity.ui.wangyi.event.OnlineStateEventManager; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.Utils; -import com.yundian.celebrity.widget.emoji.IImageLoader; -import com.yundian.celebrity.widget.emoji.LQREmotionKit; +import com.cloudTop.starshare.BuildConfig; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.baseapp.BaseApplication; +import com.cloudTop.starshare.bean.CheckUpdateInfoEntity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.LoginReturnInfo; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.Host; +import com.cloudTop.starshare.networkapi.NetworkAPIConfig; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.PrivatizationConfig; +import com.cloudTop.starshare.ui.wangyi.common.util.crash.AppCrashHandler; +import com.cloudTop.starshare.ui.wangyi.common.util.sys.SystemUtil; +import com.cloudTop.starshare.ui.wangyi.config.ExtraOptions; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.ui.wangyi.contact.ContactHelper; +import com.cloudTop.starshare.ui.wangyi.event.DemoOnlineStateContentProvider; +import com.cloudTop.starshare.ui.wangyi.event.OnlineStateEventManager; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.Utils; +import com.cloudTop.starshare.widget.emoji.IImageLoader; +import com.cloudTop.starshare.widget.emoji.LQREmotionKit; import org.greenrobot.eventbus.EventBus; @@ -87,7 +87,7 @@ private void testProcress() { // initWangYiIM(); LogUtils.loge("------------processName:" + processName); if (processName != null) { - if (processName.equals("com.yundian.celebrity")) { + if (processName.equals("com.cloudTop.starshare")) { //Fabric.with(this, new Crashlytics()); //初始化logger LogUtils.logInit(BuildConfig.LOG_DEBUG); @@ -103,11 +103,11 @@ private void testProcress() { return; } LeakCanary.install(this); - } else if (processName.equals("com.yundian.celebrity:core")) { + } else if (processName.equals("com.cloudTop.starshare:core")) { - } else if (processName.equals("com.yundian.celebrity:cosine")) { + } else if (processName.equals("com.cloudTop.starshare:cosine")) { - } else if (processName.equals("com.yundian.celebrity:pushservice")) { + } else if (processName.equals("com.cloudTop.starshare:pushservice")) { } } diff --git a/app/src/main/java/com/yundian/celebrity/app/AppCache.java b/app/src/main/java/com/cloudTop/starshare/app/AppCache.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/app/AppCache.java rename to app/src/main/java/com/cloudTop/starshare/app/AppCache.java index e60a52b..4418eb2 100644 --- a/app/src/main/java/com/yundian/celebrity/app/AppCache.java +++ b/app/src/main/java/com/cloudTop/starshare/app/AppCache.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/app/AppConfig.java b/app/src/main/java/com/cloudTop/starshare/app/AppConfig.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/app/AppConfig.java rename to app/src/main/java/com/cloudTop/starshare/app/AppConfig.java index e2e7be6..98cb1f9 100644 --- a/app/src/main/java/com/yundian/celebrity/app/AppConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/app/AppConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; import android.os.Environment; diff --git a/app/src/main/java/com/yundian/celebrity/app/AppConstant.java b/app/src/main/java/com/cloudTop/starshare/app/AppConstant.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/app/AppConstant.java rename to app/src/main/java/com/cloudTop/starshare/app/AppConstant.java index 345fa25..05c3927 100644 --- a/app/src/main/java/com/yundian/celebrity/app/AppConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/app/AppConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; /** * des: diff --git a/app/src/main/java/com/yundian/celebrity/app/CommentConfig.java b/app/src/main/java/com/cloudTop/starshare/app/CommentConfig.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/app/CommentConfig.java rename to app/src/main/java/com/cloudTop/starshare/app/CommentConfig.java index 68d3ceb..3d8b3f6 100644 --- a/app/src/main/java/com/yundian/celebrity/app/CommentConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/app/CommentConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; /** diff --git a/app/src/main/java/com/yundian/celebrity/app/Constant.java b/app/src/main/java/com/cloudTop/starshare/app/Constant.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/app/Constant.java rename to app/src/main/java/com/cloudTop/starshare/app/Constant.java index 0224fec..123ccb6 100644 --- a/app/src/main/java/com/yundian/celebrity/app/Constant.java +++ b/app/src/main/java/com/cloudTop/starshare/app/Constant.java @@ -1,6 +1,6 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public interface Constant { diff --git a/app/src/main/java/com/yundian/celebrity/app/SocializeConstant.java b/app/src/main/java/com/cloudTop/starshare/app/SocializeConstant.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/app/SocializeConstant.java rename to app/src/main/java/com/cloudTop/starshare/app/SocializeConstant.java index 9fabfc2..cd5b20d 100644 --- a/app/src/main/java/com/yundian/celebrity/app/SocializeConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/app/SocializeConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; /** * @author : created by chuangWu diff --git a/app/src/main/java/com/yundian/celebrity/app/SocketAPIConstant.java b/app/src/main/java/com/cloudTop/starshare/app/SocketAPIConstant.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/app/SocketAPIConstant.java rename to app/src/main/java/com/cloudTop/starshare/app/SocketAPIConstant.java index 1bd9d62..c8af6be 100644 --- a/app/src/main/java/com/yundian/celebrity/app/SocketAPIConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/app/SocketAPIConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.app; +package com.cloudTop.starshare.app; /** * Created by yaowang on 2017/2/20. diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseActivity.java b/app/src/main/java/com/cloudTop/starshare/base/BaseActivity.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/base/BaseActivity.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseActivity.java index 46a033e..be3a638 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; /** * 基类 @@ -28,20 +28,20 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.baseapp.AppManager; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; -import com.yundian.celebrity.ui.main.activity.MainActivity; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.login.LogoutHelper; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.TUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.utils.daynightmodeutils.ChangeModeController; -import com.yundian.celebrity.widget.LoadingDialog; -import com.yundian.celebrity.widget.StatusBarCompat; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.baseapp.AppManager; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.ui.main.activity.MainActivity; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.login.LogoutHelper; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.TUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.utils.daynightmodeutils.ChangeModeController; +import com.cloudTop.starshare.widget.LoadingDialog; +import com.cloudTop.starshare.widget.StatusBarCompat; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseFragment.java b/app/src/main/java/com/cloudTop/starshare/base/BaseFragment.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/base/BaseFragment.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseFragment.java index ae78ad1..af99246 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; import android.content.Intent; import android.os.Bundle; @@ -13,11 +13,11 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.TUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.LoadingDialog; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.TUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.LoadingDialog; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseFragmentAdapter.java b/app/src/main/java/com/cloudTop/starshare/base/BaseFragmentAdapter.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/base/BaseFragmentAdapter.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseFragmentAdapter.java index 8d5423f..ff30b4e 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseFragmentAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseFragmentAdapter.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.app.FragmentTransaction; -import com.yundian.celebrity.utils.CollectionUtils; +import com.cloudTop.starshare.utils.CollectionUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseFragmentStateAdapter.java b/app/src/main/java/com/cloudTop/starshare/base/BaseFragmentStateAdapter.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/base/BaseFragmentStateAdapter.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseFragmentStateAdapter.java index fd77d69..06eb82b 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseFragmentStateAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseFragmentStateAdapter.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; -import com.yundian.celebrity.utils.CollectionUtils; +import com.cloudTop.starshare.utils.CollectionUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseModel.java b/app/src/main/java/com/cloudTop/starshare/base/BaseModel.java similarity index 66% rename from app/src/main/java/com/yundian/celebrity/base/BaseModel.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseModel.java index 224a4bb..af9568f 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseModel.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseModel.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; /** * des:baseModel diff --git a/app/src/main/java/com/cloudTop/starshare/base/BasePlayActivity.java b/app/src/main/java/com/cloudTop/starshare/base/BasePlayActivity.java new file mode 100644 index 0000000..6efadb4 --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/base/BasePlayActivity.java @@ -0,0 +1,27 @@ +package com.cloudTop.starshare.base; + +import android.app.Activity; +import android.os.Build; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.view.View; +import android.view.WindowManager; + +/** + * Created by Administrator on 2017/9/1. + */ + +public class BasePlayActivity extends Activity { + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + View decorView = getWindow().getDecorView(); + decorView.setSystemUiVisibility( + View.SYSTEM_UI_FLAG_HIDE_NAVIGATION + | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); + } + getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + } +} diff --git a/app/src/main/java/com/yundian/celebrity/base/BasePresenter.java b/app/src/main/java/com/cloudTop/starshare/base/BasePresenter.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/base/BasePresenter.java rename to app/src/main/java/com/cloudTop/starshare/base/BasePresenter.java index 39bfb26..441f85c 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BasePresenter.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BasePresenter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/base/BaseView.java b/app/src/main/java/com/cloudTop/starshare/base/BaseView.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/base/BaseView.java rename to app/src/main/java/com/cloudTop/starshare/base/BaseView.java index 0ade4b2..37551d3 100644 --- a/app/src/main/java/com/yundian/celebrity/base/BaseView.java +++ b/app/src/main/java/com/cloudTop/starshare/base/BaseView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base; +package com.cloudTop.starshare.base; /** * des:baseview diff --git a/app/src/main/java/com/yundian/celebrity/base/baseapp/AppManager.java b/app/src/main/java/com/cloudTop/starshare/base/baseapp/AppManager.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/base/baseapp/AppManager.java rename to app/src/main/java/com/cloudTop/starshare/base/baseapp/AppManager.java index ab32020..ebcb274 100644 --- a/app/src/main/java/com/yundian/celebrity/base/baseapp/AppManager.java +++ b/app/src/main/java/com/cloudTop/starshare/base/baseapp/AppManager.java @@ -1,5 +1,5 @@ -package com.yundian.celebrity.base.baseapp; +package com.cloudTop.starshare.base.baseapp; import android.app.Activity; import android.app.ActivityManager; diff --git a/app/src/main/java/com/yundian/celebrity/base/baseapp/BaseApplication.java b/app/src/main/java/com/cloudTop/starshare/base/baseapp/BaseApplication.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/base/baseapp/BaseApplication.java rename to app/src/main/java/com/cloudTop/starshare/base/baseapp/BaseApplication.java index 7f4c010..359bb27 100644 --- a/app/src/main/java/com/yundian/celebrity/base/baseapp/BaseApplication.java +++ b/app/src/main/java/com/cloudTop/starshare/base/baseapp/BaseApplication.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.base.baseapp; +package com.cloudTop.starshare.base.baseapp; import android.app.Application; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/bean/ActionItem.java b/app/src/main/java/com/cloudTop/starshare/bean/ActionItem.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/bean/ActionItem.java rename to app/src/main/java/com/cloudTop/starshare/bean/ActionItem.java index dbab1b9..81e75ed 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/ActionItem.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/ActionItem.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/AliPayReturnBean.java b/app/src/main/java/com/cloudTop/starshare/bean/AliPayReturnBean.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/AliPayReturnBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/AliPayReturnBean.java index cb50901..c3ab883 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/AliPayReturnBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/AliPayReturnBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/AssetDetailsBean.java b/app/src/main/java/com/cloudTop/starshare/bean/AssetDetailsBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/AssetDetailsBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/AssetDetailsBean.java index 374eb0c..ed35673 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/AssetDetailsBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/AssetDetailsBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/BankCardBean.java b/app/src/main/java/com/cloudTop/starshare/bean/BankCardBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/BankCardBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/BankCardBean.java index 2492857..ec1f7a8 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/BankCardBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/BankCardBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/BankInfoBean.java b/app/src/main/java/com/cloudTop/starshare/bean/BankInfoBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/BankInfoBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/BankInfoBean.java index 374c9df..d0e82fd 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/BankInfoBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/BankInfoBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/BookingStarListBean.java b/app/src/main/java/com/cloudTop/starshare/bean/BookingStarListBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/BookingStarListBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/BookingStarListBean.java index a672903..46c9131 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/BookingStarListBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/BookingStarListBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/CheckUpdateInfoEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/CheckUpdateInfoEntity.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/CheckUpdateInfoEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/CheckUpdateInfoEntity.java index 0c303a4..dd9c121 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/CheckUpdateInfoEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/CheckUpdateInfoEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; diff --git a/app/src/main/java/com/yundian/celebrity/bean/CircleFriendBean.java b/app/src/main/java/com/cloudTop/starshare/bean/CircleFriendBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/CircleFriendBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/CircleFriendBean.java index 785e244..5e077d6 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/CircleFriendBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/CircleFriendBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/bean/EventBusMessage.java b/app/src/main/java/com/cloudTop/starshare/bean/EventBusMessage.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/bean/EventBusMessage.java rename to app/src/main/java/com/cloudTop/starshare/bean/EventBusMessage.java index d33cf87..04381d0 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/EventBusMessage.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/EventBusMessage.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * eventBus消息类 diff --git a/app/src/main/java/com/yundian/celebrity/bean/FansAskBean.java b/app/src/main/java/com/cloudTop/starshare/bean/FansAskBean.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/bean/FansAskBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/FansAskBean.java index e6d907e..4d57ab5 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/FansAskBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/FansAskBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; @@ -43,6 +43,8 @@ public class FansAskBean implements Parcelable { private String uask; private int uid; private String video_url; + private String thumbnail; //提问缩略图 + private String thumbnailS; //回答缩略图 public int getA_type() { return a_type; @@ -164,6 +166,21 @@ public void setVideo_url(String video_url) { this.video_url = video_url; } + public String getThumbnail() { + return thumbnail; + } + + public void setThumbnail(String thumbnail) { + this.thumbnail = thumbnail; + } + + public String getThumbnailS() { + return thumbnailS; + } + + public void setThumbnailS(String thumbnailS) { + this.thumbnailS = thumbnailS; + } @Override public int describeContents() { @@ -187,6 +204,8 @@ public void writeToParcel(Parcel dest, int flags) { dest.writeString(this.uask); dest.writeInt(this.uid); dest.writeString(this.video_url); + dest.writeString(this.thumbnail); + dest.writeString(this.thumbnailS); } public FansAskBean() { @@ -208,6 +227,8 @@ protected FansAskBean(Parcel in) { this.uask = in.readString(); this.uid = in.readInt(); this.video_url = in.readString(); + this.thumbnail = in.readString(); + this.thumbnailS = in.readString(); } public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { diff --git a/app/src/main/java/com/yundian/celebrity/bean/HaveStarUsersBean.java b/app/src/main/java/com/cloudTop/starshare/bean/HaveStarUsersBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/HaveStarUsersBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/HaveStarUsersBean.java index 2d28237..5ec1d28 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/HaveStarUsersBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/HaveStarUsersBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/IdentityInfoBean.java b/app/src/main/java/com/cloudTop/starshare/bean/IdentityInfoBean.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/IdentityInfoBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/IdentityInfoBean.java index c4e513a..06f5cbf 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/IdentityInfoBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/IdentityInfoBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/IncomeReturnBean.java b/app/src/main/java/com/cloudTop/starshare/bean/IncomeReturnBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/IncomeReturnBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/IncomeReturnBean.java index dfdf1a6..356f4c9 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/IncomeReturnBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/IncomeReturnBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/LoginReturnInfo.java b/app/src/main/java/com/cloudTop/starshare/bean/LoginReturnInfo.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/LoginReturnInfo.java rename to app/src/main/java/com/cloudTop/starshare/bean/LoginReturnInfo.java index dec455f..dff2511 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/LoginReturnInfo.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/LoginReturnInfo.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/5/9. diff --git a/app/src/main/java/com/yundian/celebrity/bean/MeetOrderListBean.java b/app/src/main/java/com/cloudTop/starshare/bean/MeetOrderListBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/MeetOrderListBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/MeetOrderListBean.java index af81f8d..dc4ce63 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/MeetOrderListBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/MeetOrderListBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/MoneyDetailListBean.java b/app/src/main/java/com/cloudTop/starshare/bean/MoneyDetailListBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/MoneyDetailListBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/MoneyDetailListBean.java index 1260e47..773dca5 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/MoneyDetailListBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/MoneyDetailListBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/MyAddressBean.java b/app/src/main/java/com/cloudTop/starshare/bean/MyAddressBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/MyAddressBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/MyAddressBean.java index 4d0ee2c..7eebefc 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/MyAddressBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/MyAddressBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/8/19. diff --git a/app/src/main/java/com/yundian/celebrity/bean/MyIpBean.java b/app/src/main/java/com/cloudTop/starshare/bean/MyIpBean.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/bean/MyIpBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/MyIpBean.java index 78469e0..f53b8aa 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/MyIpBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/MyIpBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/8/19. diff --git a/app/src/main/java/com/yundian/celebrity/bean/MyPopupMenuEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/MyPopupMenuEntity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/bean/MyPopupMenuEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/MyPopupMenuEntity.java index 4bad5d6..45e06eb 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/MyPopupMenuEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/MyPopupMenuEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/OrderListReturnBean.java b/app/src/main/java/com/cloudTop/starshare/bean/OrderListReturnBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/OrderListReturnBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/OrderListReturnBean.java index 48518bb..d530b64 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/OrderListReturnBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/OrderListReturnBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/OrderReturnBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/OrderReturnBeen.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/OrderReturnBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/OrderReturnBeen.java index 4941b33..b6c239f 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/OrderReturnBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/OrderReturnBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/bean/OrderSucReturnBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/OrderSucReturnBeen.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/bean/OrderSucReturnBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/OrderSucReturnBeen.java index f26c5da..8d22319 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/OrderSucReturnBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/OrderSucReturnBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/6/16. diff --git a/app/src/main/java/com/yundian/celebrity/bean/QiNiuAdressBean.java b/app/src/main/java/com/cloudTop/starshare/bean/QiNiuAdressBean.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/QiNiuAdressBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/QiNiuAdressBean.java index a24a79b..01dff76 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/QiNiuAdressBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/QiNiuAdressBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/8/19. diff --git a/app/src/main/java/com/yundian/celebrity/bean/QiNiuImageToken.java b/app/src/main/java/com/cloudTop/starshare/bean/QiNiuImageToken.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/bean/QiNiuImageToken.java rename to app/src/main/java/com/cloudTop/starshare/bean/QiNiuImageToken.java index 896bca3..0df1018 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/QiNiuImageToken.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/QiNiuImageToken.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by sll on 2017/7/20. diff --git a/app/src/main/java/com/yundian/celebrity/bean/RegisterReturnBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnBeen.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/bean/RegisterReturnBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnBeen.java index e7fe7a5..f681a67 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/RegisterReturnBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/5/9. diff --git a/app/src/main/java/com/yundian/celebrity/bean/RegisterReturnWangYiBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnWangYiBeen.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/RegisterReturnWangYiBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnWangYiBeen.java index 45aa34e..be02bcb 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/RegisterReturnWangYiBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/RegisterReturnWangYiBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/RegisterVerifyCodeBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/RegisterVerifyCodeBeen.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/RegisterVerifyCodeBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/RegisterVerifyCodeBeen.java index 6843ea1..fdb01bc 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/RegisterVerifyCodeBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/RegisterVerifyCodeBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/RequestResultBean.java b/app/src/main/java/com/cloudTop/starshare/bean/RequestResultBean.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/bean/RequestResultBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/RequestResultBean.java index c1da92a..f44d206 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/RequestResultBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/RequestResultBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by sll on 2017/5/28. diff --git a/app/src/main/java/com/yundian/celebrity/bean/ResultBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/ResultBeen.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/bean/ResultBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/ResultBeen.java index 8915f79..a26143c 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/ResultBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/ResultBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/6/15. diff --git a/app/src/main/java/com/yundian/celebrity/bean/ResultCodeBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/ResultCodeBeen.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/bean/ResultCodeBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/ResultCodeBeen.java index 1d1f5f0..cbfc52e 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/ResultCodeBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/ResultCodeBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/6/19. diff --git a/app/src/main/java/com/yundian/celebrity/bean/SubmitAddressTimeInfo.java b/app/src/main/java/com/cloudTop/starshare/bean/SubmitAddressTimeInfo.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/bean/SubmitAddressTimeInfo.java rename to app/src/main/java/com/cloudTop/starshare/bean/SubmitAddressTimeInfo.java index 860d5c1..eb83710 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/SubmitAddressTimeInfo.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/SubmitAddressTimeInfo.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/5/9. diff --git a/app/src/main/java/com/yundian/celebrity/bean/TabEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/TabEntity.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/bean/TabEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/TabEntity.java index 7fe030a..473d63c 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/TabEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/TabEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import com.flyco.tablayout.listener.CustomTabEntity; diff --git a/app/src/main/java/com/yundian/celebrity/bean/UptokenBean.java b/app/src/main/java/com/cloudTop/starshare/bean/UptokenBean.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/bean/UptokenBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/UptokenBean.java index be22b74..c49afc0 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/UptokenBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/UptokenBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/8/19. diff --git a/app/src/main/java/com/yundian/celebrity/bean/User.java b/app/src/main/java/com/cloudTop/starshare/bean/User.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/User.java rename to app/src/main/java/com/cloudTop/starshare/bean/User.java index b566264..dd92090 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/User.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/User.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.bean;// +package com.cloudTop.starshare.bean;// // Source code recreated from a .class file by IntelliJ IDEA // (powered by Fernflower decompiler) // -import com.yundian.celebrity.utils.JsonUtils; +import com.cloudTop.starshare.utils.JsonUtils; import java.util.ArrayList; import java.util.Iterator; diff --git a/app/src/main/java/com/yundian/celebrity/bean/UserinfoBean.java b/app/src/main/java/com/cloudTop/starshare/bean/UserinfoBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/UserinfoBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/UserinfoBean.java index e3a3a6a..0005db2 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/UserinfoBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/UserinfoBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/WXAccessTokenEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/WXAccessTokenEntity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/WXAccessTokenEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/WXAccessTokenEntity.java index 95f461a..c471548 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WXAccessTokenEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WXAccessTokenEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/WXPayReturnEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/WXPayReturnEntity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/WXPayReturnEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/WXPayReturnEntity.java index c8d208a..e429d34 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WXPayReturnEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WXPayReturnEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/WXUserInfoEntity.java b/app/src/main/java/com/cloudTop/starshare/bean/WXUserInfoEntity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/WXUserInfoEntity.java rename to app/src/main/java/com/cloudTop/starshare/bean/WXUserInfoEntity.java index a435658..329aa6d 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WXUserInfoEntity.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WXUserInfoEntity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/WXinLoginReturnBeen.java b/app/src/main/java/com/cloudTop/starshare/bean/WXinLoginReturnBeen.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/bean/WXinLoginReturnBeen.java rename to app/src/main/java/com/cloudTop/starshare/bean/WXinLoginReturnBeen.java index 0070ad9..2673aa4 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WXinLoginReturnBeen.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WXinLoginReturnBeen.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; /** * Created by Administrator on 2017/5/18. diff --git a/app/src/main/java/com/yundian/celebrity/bean/WithDrawCashHistoryBean.java b/app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashHistoryBean.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/bean/WithDrawCashHistoryBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashHistoryBean.java index ca015ba..8cb9dff 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WithDrawCashHistoryBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashHistoryBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/bean/WithDrawCashReturnBean.java b/app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashReturnBean.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/bean/WithDrawCashReturnBean.java rename to app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashReturnBean.java index aa809d8..a164adc 100644 --- a/app/src/main/java/com/yundian/celebrity/bean/WithDrawCashReturnBean.java +++ b/app/src/main/java/com/cloudTop/starshare/bean/WithDrawCashReturnBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.bean; +package com.cloudTop.starshare.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/yundian/celebrity/event/AudioMessageEvent.java b/app/src/main/java/com/cloudTop/starshare/event/AudioMessageEvent.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/event/AudioMessageEvent.java rename to app/src/main/java/com/cloudTop/starshare/event/AudioMessageEvent.java index def27a8..2665088 100644 --- a/app/src/main/java/com/yundian/celebrity/event/AudioMessageEvent.java +++ b/app/src/main/java/com/cloudTop/starshare/event/AudioMessageEvent.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.event; +package com.cloudTop.starshare.event; /** * eventBus消息类 diff --git a/app/src/main/java/com/yundian/celebrity/event/VideoMessageEvent.java b/app/src/main/java/com/cloudTop/starshare/event/VideoMessageEvent.java similarity index 63% rename from app/src/main/java/com/yundian/celebrity/event/VideoMessageEvent.java rename to app/src/main/java/com/cloudTop/starshare/event/VideoMessageEvent.java index 4ac4f67..d7db572 100644 --- a/app/src/main/java/com/yundian/celebrity/event/VideoMessageEvent.java +++ b/app/src/main/java/com/cloudTop/starshare/event/VideoMessageEvent.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.event; +package com.cloudTop.starshare.event; /** * eventBus消息类 @@ -6,10 +6,16 @@ */ public class VideoMessageEvent { private final String url; + private final String frameUrl; private int position; - public VideoMessageEvent(int position, String url) { + public VideoMessageEvent(int position, String url,String frameUrl) { this.position = position; this.url = url; + this.frameUrl = frameUrl; + } + + public String getFrameUrl() { + return frameUrl; } public String getUrl() { diff --git a/app/src/main/java/com/yundian/celebrity/helper/CheckInfoHelper.java b/app/src/main/java/com/cloudTop/starshare/helper/CheckInfoHelper.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/helper/CheckInfoHelper.java rename to app/src/main/java/com/cloudTop/starshare/helper/CheckInfoHelper.java index eecea42..81c2efb 100644 --- a/app/src/main/java/com/yundian/celebrity/helper/CheckInfoHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/helper/CheckInfoHelper.java @@ -1,18 +1,7 @@ -package com.yundian.celebrity.helper; +package com.cloudTop.starshare.helper; -import android.content.Context; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.view.View; -import android.widget.EditText; - -import com.yundian.celebrity.utils.StringUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.utils.Utils; -import com.yundian.celebrity.widget.CheckException; -import com.yundian.celebrity.widget.SimpleTextWatcher; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.utils.Utils; +import com.cloudTop.starshare.widget.CheckException; /** diff --git a/app/src/main/java/com/yundian/celebrity/helper/CheckViewHelper.java b/app/src/main/java/com/cloudTop/starshare/helper/CheckViewHelper.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/helper/CheckViewHelper.java rename to app/src/main/java/com/cloudTop/starshare/helper/CheckViewHelper.java index 826e214..5d2c901 100644 --- a/app/src/main/java/com/yundian/celebrity/helper/CheckViewHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/helper/CheckViewHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.helper; +package com.cloudTop.starshare.helper; import android.content.Context; import android.text.Editable; @@ -7,12 +7,11 @@ import android.view.View; import android.widget.EditText; -import com.yundian.celebrity.utils.StringUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.utils.Utils; -import com.yundian.celebrity.widget.CheckException; -import com.yundian.celebrity.widget.SimpleTextWatcher; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.utils.StringUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.CheckException; +import com.cloudTop.starshare.widget.SimpleTextWatcher; +import com.cloudTop.starshare.widget.WPEditText; /** diff --git a/app/src/main/java/com/yundian/celebrity/listener/IDataRequestListener.java b/app/src/main/java/com/cloudTop/starshare/listener/IDataRequestListener.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/listener/IDataRequestListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/IDataRequestListener.java index 8790e8f..1e46a38 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/IDataRequestListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/IDataRequestListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; /** * * @ClassName: IDataRequestListener diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnAPIListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnAPIListener.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/listener/OnAPIListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnAPIListener.java index 0725fb5..b2c390e 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnAPIListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnAPIListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; /** * @author : Created by 180 diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnChildViewClickListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnChildViewClickListener.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/listener/OnChildViewClickListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnChildViewClickListener.java index 72a4f7f..a8ccd06 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnChildViewClickListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnChildViewClickListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; import android.view.View; diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnErrorListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnErrorListener.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/listener/OnErrorListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnErrorListener.java index 8fc13c1..29610e2 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnErrorListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnErrorListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; /** * @author : Created by 180 diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnImageViewTouchListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnImageViewTouchListener.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/listener/OnImageViewTouchListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnImageViewTouchListener.java index 89f85d7..ee478f3 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnImageViewTouchListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnImageViewTouchListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; import android.graphics.ColorMatrixColorFilter; import android.view.MotionEvent; diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnPasswordInputFinish.java b/app/src/main/java/com/cloudTop/starshare/listener/OnPasswordInputFinish.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/listener/OnPasswordInputFinish.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnPasswordInputFinish.java index d9ab702..03761c3 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnPasswordInputFinish.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnPasswordInputFinish.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; /** * 自定义接口，用于给密码输入完成添加回掉事件 diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnSuccessListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnSuccessListener.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/listener/OnSuccessListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnSuccessListener.java index 5722779..f4aa583 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnSuccessListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnSuccessListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; /** * @author : Created by 180 diff --git a/app/src/main/java/com/yundian/celebrity/listener/OnTextChangeListener.java b/app/src/main/java/com/cloudTop/starshare/listener/OnTextChangeListener.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/listener/OnTextChangeListener.java rename to app/src/main/java/com/cloudTop/starshare/listener/OnTextChangeListener.java index f74d1e2..5b12bd6 100644 --- a/app/src/main/java/com/yundian/celebrity/listener/OnTextChangeListener.java +++ b/app/src/main/java/com/cloudTop/starshare/listener/OnTextChangeListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.listener; +package com.cloudTop.starshare.listener; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/DealAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/DealAPI.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/networkapi/DealAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/DealAPI.java index b8e506e..ab48738 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/DealAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/DealAPI.java @@ -1,27 +1,27 @@ -package com.yundian.celebrity.networkapi; - - -import com.yundian.celebrity.bean.AliPayReturnBean; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.BankCardBean; -import com.yundian.celebrity.bean.BankInfoBean; -import com.yundian.celebrity.bean.BookingStarListBean; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.bean.HaveStarUsersBean; -import com.yundian.celebrity.bean.IdentityInfoBean; -import com.yundian.celebrity.bean.IncomeReturnBean; -import com.yundian.celebrity.bean.MeetOrderListBean; -import com.yundian.celebrity.bean.MoneyDetailListBean; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.bean.ResultBeen; -import com.yundian.celebrity.bean.ResultCodeBeen; -import com.yundian.celebrity.bean.SubmitAddressTimeInfo; -import com.yundian.celebrity.bean.WXPayReturnEntity; -import com.yundian.celebrity.bean.WithDrawCashHistoryBean; -import com.yundian.celebrity.bean.WithDrawCashReturnBean; -import com.yundian.celebrity.listener.OnAPIListener; +package com.cloudTop.starshare.networkapi; + + +import com.cloudTop.starshare.bean.AliPayReturnBean; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.BankCardBean; +import com.cloudTop.starshare.bean.BankInfoBean; +import com.cloudTop.starshare.bean.BookingStarListBean; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.bean.HaveStarUsersBean; +import com.cloudTop.starshare.bean.IdentityInfoBean; +import com.cloudTop.starshare.bean.IncomeReturnBean; +import com.cloudTop.starshare.bean.MeetOrderListBean; +import com.cloudTop.starshare.bean.MoneyDetailListBean; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.bean.ResultBeen; +import com.cloudTop.starshare.bean.ResultCodeBeen; +import com.cloudTop.starshare.bean.SubmitAddressTimeInfo; +import com.cloudTop.starshare.bean.WXPayReturnEntity; +import com.cloudTop.starshare.bean.WithDrawCashHistoryBean; +import com.cloudTop.starshare.bean.WithDrawCashReturnBean; +import com.cloudTop.starshare.listener.OnAPIListener; import java.util.List; @@ -66,7 +66,7 @@ public interface DealAPI { void bankCardInfo(String cardNo, OnAPIListener listener);//获取银行账户信息 // - void bindCard(String bankUsername, String account, OnAPIListener listener);//获取银行账户信息 + void bindCard(String bankUsername, String account,String prov,String city, OnAPIListener listener);//获取银行账户信息 void unBindCard(OnAPIListener listener);//解绑操作 diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/Host.java b/app/src/main/java/com/cloudTop/starshare/networkapi/Host.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/networkapi/Host.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/Host.java index 301a219..622e9a9 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/Host.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/Host.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; /** @@ -65,8 +65,8 @@ public static String getSocketServerIp() { // return "tapi.smartdata-x.com";//线上正式 // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // if(BuildConfig.DEBUG){ - return "139.224.34.22"; //本地 -//// return "122.144.169.214"; //测试 +// return "139.224.34.22"; //本地 + return "nsb.smartdata-x.com"; //测试 // }else{ //// return "tapi.smartdata-x.com";//线上正式 // return "122.144.169.214"; //测试 @@ -85,10 +85,10 @@ public static short getSocketServerPort() { // return (short) 16006; //用户端 -// return (short) 16060; //本地明星端 +// return (short) 16080; //本地明星端 //dsf -// return (short) 16016; //明星端 - return (short) 16080; + return (short) 16016; //明星端 +// return (short) 16080; // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! // if(BuildConfig.DEBUG){ diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/InformationAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/InformationAPI.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/networkapi/InformationAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/InformationAPI.java index 7788788..31e7e34 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/InformationAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/InformationAPI.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; /** * Created by ysl . diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConfig.java b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConfig.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConfig.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConfig.java index f27ebfe..700caa6 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConstant.java b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConstant.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConstant.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConstant.java index 3bca080..edb027f 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; public interface NetworkAPIConstant { diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIException.java b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIException.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIException.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIException.java index 9bdcef8..7805bc5 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIException.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIException.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; public class NetworkAPIException extends Exception { diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactory.java b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactory.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactory.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactory.java index 3c635d9..770afeb 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactory.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactory.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; public interface NetworkAPIFactory { void initConfig(NetworkAPIConfig config); diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactoryImpl.java b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactoryImpl.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactoryImpl.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactoryImpl.java index 3a68999..fc513ae 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/NetworkAPIFactoryImpl.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/NetworkAPIFactoryImpl.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; -import com.yundian.celebrity.networkapi.socketapi.SocketAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.socketapi.SocketAPIFactoryImpl; public class NetworkAPIFactoryImpl { private static NetworkAPIFactory networkAPIFactory = null; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/SocializeAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/SocializeAPI.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/networkapi/SocializeAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/SocializeAPI.java index 16e4c6a..ab9b9e2 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/SocializeAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/SocializeAPI.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.networkapi; +package com.cloudTop.starshare.networkapi; -import com.yundian.celebrity.listener.OnAPIListener; +import com.cloudTop.starshare.listener.OnAPIListener; import org.json.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/UserAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/UserAPI.java similarity index 73% rename from app/src/main/java/com/yundian/celebrity/networkapi/UserAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/UserAPI.java index 338aeb9..862cc54 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/UserAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/UserAPI.java @@ -1,15 +1,15 @@ -package com.yundian.celebrity.networkapi; - - -import com.yundian.celebrity.bean.CheckUpdateInfoEntity; -import com.yundian.celebrity.bean.LoginReturnInfo; -import com.yundian.celebrity.bean.QiNiuAdressBean; -import com.yundian.celebrity.bean.RegisterReturnBeen; -import com.yundian.celebrity.bean.RegisterReturnWangYiBeen; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.bean.UptokenBean; -import com.yundian.celebrity.bean.WXinLoginReturnBeen; -import com.yundian.celebrity.listener.OnAPIListener; +package com.cloudTop.starshare.networkapi; + + +import com.cloudTop.starshare.bean.CheckUpdateInfoEntity; +import com.cloudTop.starshare.bean.LoginReturnInfo; +import com.cloudTop.starshare.bean.QiNiuAdressBean; +import com.cloudTop.starshare.bean.RegisterReturnBeen; +import com.cloudTop.starshare.bean.RegisterReturnWangYiBeen; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.bean.UptokenBean; +import com.cloudTop.starshare.bean.WXinLoginReturnBeen; +import com.cloudTop.starshare.listener.OnAPIListener; /** * 用户相关API接口 diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/http/BaseReqeustAbstract.java b/app/src/main/java/com/cloudTop/starshare/networkapi/http/BaseReqeustAbstract.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/networkapi/http/BaseReqeustAbstract.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/http/BaseReqeustAbstract.java index 787aba7..de908f8 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/http/BaseReqeustAbstract.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/http/BaseReqeustAbstract.java @@ -1,12 +1,12 @@ -package com.yundian.celebrity.networkapi.http; +package com.cloudTop.starshare.networkapi.http; import com.alibaba.fastjson.JSON; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.listener.OnErrorListener; -import com.yundian.celebrity.listener.OnSuccessListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.utils.NetWorkUtil; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.listener.OnErrorListener; +import com.cloudTop.starshare.listener.OnSuccessListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.utils.NetWorkUtil; import org.apache.http.conn.HttpHostConnectException; import org.json.JSONArray; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/http/NetworkHttpAPIFactoryImpl.java b/app/src/main/java/com/cloudTop/starshare/networkapi/http/NetworkHttpAPIFactoryImpl.java similarity index 75% rename from app/src/main/java/com/yundian/celebrity/networkapi/http/NetworkHttpAPIFactoryImpl.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/http/NetworkHttpAPIFactoryImpl.java index e9891ac..7dc978c 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/http/NetworkHttpAPIFactoryImpl.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/http/NetworkHttpAPIFactoryImpl.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.networkapi.http; +package com.cloudTop.starshare.networkapi.http; -import com.yundian.celebrity.networkapi.DealAPI; -import com.yundian.celebrity.networkapi.InformationAPI; -import com.yundian.celebrity.networkapi.NetworkAPIConfig; -import com.yundian.celebrity.networkapi.NetworkAPIFactory; -import com.yundian.celebrity.networkapi.UserAPI; +import com.cloudTop.starshare.networkapi.DealAPI; +import com.cloudTop.starshare.networkapi.InformationAPI; +import com.cloudTop.starshare.networkapi.NetworkAPIConfig; +import com.cloudTop.starshare.networkapi.NetworkAPIFactory; +import com.cloudTop.starshare.networkapi.UserAPI; public class NetworkHttpAPIFactoryImpl implements NetworkAPIFactory { private NetworkAPIConfig config; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketAPIFactoryImpl.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketAPIFactoryImpl.java similarity index 69% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketAPIFactoryImpl.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketAPIFactoryImpl.java index 8b7233d..5a1909e 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketAPIFactoryImpl.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketAPIFactoryImpl.java @@ -1,12 +1,12 @@ -package com.yundian.celebrity.networkapi.socketapi; +package com.cloudTop.starshare.networkapi.socketapi; -import com.yundian.celebrity.networkapi.DealAPI; -import com.yundian.celebrity.networkapi.InformationAPI; -import com.yundian.celebrity.networkapi.NetworkAPIConfig; -import com.yundian.celebrity.networkapi.NetworkAPIFactory; -import com.yundian.celebrity.networkapi.UserAPI; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPIRequestManage; +import com.cloudTop.starshare.networkapi.DealAPI; +import com.cloudTop.starshare.networkapi.InformationAPI; +import com.cloudTop.starshare.networkapi.NetworkAPIConfig; +import com.cloudTop.starshare.networkapi.NetworkAPIFactory; +import com.cloudTop.starshare.networkapi.UserAPI; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPIRequestManage; /** * Created by yaowang on 2017/2/20. diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketBaseAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketBaseAPI.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketBaseAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketBaseAPI.java index d082fef..a650064 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketBaseAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketBaseAPI.java @@ -1,14 +1,14 @@ -package com.yundian.celebrity.networkapi.socketapi; +package com.cloudTop.starshare.networkapi.socketapi; import android.os.Handler; import android.os.Looper; import com.alibaba.fastjson.JSON; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPIRequestManage; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPIResponse; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketDataPacket; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPIRequestManage; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPIResponse; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketDataPacket; +import com.cloudTop.starshare.utils.LogUtils; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketDealAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketDealAPI.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketDealAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketDealAPI.java index 6b4275d..9043173 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketDealAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketDealAPI.java @@ -1,32 +1,32 @@ -package com.yundian.celebrity.networkapi.socketapi; - - -import com.yundian.celebrity.app.SocketAPIConstant; -import com.yundian.celebrity.bean.AliPayReturnBean; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.BankCardBean; -import com.yundian.celebrity.bean.BankInfoBean; -import com.yundian.celebrity.bean.BookingStarListBean; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.bean.HaveStarUsersBean; -import com.yundian.celebrity.bean.IdentityInfoBean; -import com.yundian.celebrity.bean.IncomeReturnBean; -import com.yundian.celebrity.bean.MeetOrderListBean; -import com.yundian.celebrity.bean.MoneyDetailListBean; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.bean.ResultBeen; -import com.yundian.celebrity.bean.ResultCodeBeen; -import com.yundian.celebrity.bean.SubmitAddressTimeInfo; -import com.yundian.celebrity.bean.WXPayReturnEntity; -import com.yundian.celebrity.bean.WithDrawCashHistoryBean; -import com.yundian.celebrity.bean.WithDrawCashReturnBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.DealAPI; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketDataPacket; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; +package com.cloudTop.starshare.networkapi.socketapi; + + +import com.cloudTop.starshare.app.SocketAPIConstant; +import com.cloudTop.starshare.bean.AliPayReturnBean; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.BankCardBean; +import com.cloudTop.starshare.bean.BankInfoBean; +import com.cloudTop.starshare.bean.BookingStarListBean; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.bean.HaveStarUsersBean; +import com.cloudTop.starshare.bean.IdentityInfoBean; +import com.cloudTop.starshare.bean.IncomeReturnBean; +import com.cloudTop.starshare.bean.MeetOrderListBean; +import com.cloudTop.starshare.bean.MoneyDetailListBean; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.bean.ResultBeen; +import com.cloudTop.starshare.bean.ResultCodeBeen; +import com.cloudTop.starshare.bean.SubmitAddressTimeInfo; +import com.cloudTop.starshare.bean.WXPayReturnEntity; +import com.cloudTop.starshare.bean.WithDrawCashHistoryBean; +import com.cloudTop.starshare.bean.WithDrawCashReturnBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.DealAPI; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketDataPacket; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; import java.util.HashMap; import java.util.List; @@ -294,11 +294,13 @@ public void bankCardInfo(String cardNo, OnAPIListener listener) { } @Override - public void bindCard(String bankUsername, String account, OnAPIListener listener) { + public void bindCard(String bankUsername, String account,String prov,String city,OnAPIListener listener) { HashMap map = new HashMap<>(); map.put("id", SharePrefUtil.getInstance().getUserId()); map.put("token", SharePrefUtil.getInstance().getToken()); map.put("bankUsername", bankUsername); + map.put("prov", prov); + map.put("city", city); map.put("account", account); SocketDataPacket socketDataPacket = socketDataPacket(SocketAPIConstant.OperateCode.BindCard, SocketAPIConstant.ReqeutType.Bank, map); diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketInformationAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketInformationAPI.java similarity index 65% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketInformationAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketInformationAPI.java index 6703f4b..4985b79 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketInformationAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketInformationAPI.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.networkapi.socketapi; +package com.cloudTop.starshare.networkapi.socketapi; -import com.yundian.celebrity.app.SocketAPIConstant; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.InformationAPI; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketDataPacket; +import com.cloudTop.starshare.app.SocketAPIConstant; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.InformationAPI; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketDataPacket; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java index 6a9c392..75346e4 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIDecoder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; import java.nio.ByteOrder; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java index c19519d..fbd5de6 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIEncoder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; import io.netty.buffer.ByteBuf; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java index 0dc9d81..10c83a8 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyBootstrap.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; import android.os.SystemClock; -import com.yundian.celebrity.networkapi.NetworkAPIConfig; -import com.yundian.celebrity.networkapi.socketapi.SocketAPIFactoryImpl; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.networkapi.NetworkAPIConfig; +import com.cloudTop.starshare.networkapi.socketapi.SocketAPIFactoryImpl; +import com.cloudTop.starshare.utils.LogUtils; import java.net.InetSocketAddress; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java index bde27b9..03a1a28 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPINettyHandler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; import io.netty.channel.ChannelHandlerContext; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java similarity index 78% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java index 0913e6b..92301fe 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequest.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.networkapi.socketapi.SocketAPIFactoryImpl; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.networkapi.socketapi.SocketAPIFactoryImpl; +import com.cloudTop.starshare.utils.LogUtils; import java.util.Date; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java index 8db981f..d8d573e 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIRequestManage.java @@ -1,15 +1,15 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; import android.os.Handler; import android.os.Looper; import android.os.Message; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.utils.ErrorCodeUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ResultCodeUtil; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.utils.ErrorCodeUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ResultCodeUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java index 386259c..d38f73f 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketAPIResponse.java @@ -1,6 +1,6 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; -import com.yundian.celebrity.networkapi.NetworkAPIException; +import com.cloudTop.starshare.networkapi.NetworkAPIException; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketDataPacket.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketDataPacket.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketDataPacket.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketDataPacket.java index 087ce65..0f128a6 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketReqeust/SocketDataPacket.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketReqeust/SocketDataPacket.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.networkapi.socketapi.SocketReqeust; +package com.cloudTop.starshare.networkapi.socketapi.SocketReqeust; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.utils.LogUtils; import org.json.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketUserAPI.java b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketUserAPI.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketUserAPI.java rename to app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketUserAPI.java index 2669aca..994c5d6 100644 --- a/app/src/main/java/com/yundian/celebrity/networkapi/socketapi/SocketUserAPI.java +++ b/app/src/main/java/com/cloudTop/starshare/networkapi/socketapi/SocketUserAPI.java @@ -1,23 +1,23 @@ -package com.yundian.celebrity.networkapi.socketapi; - -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.app.SocketAPIConstant; -import com.yundian.celebrity.bean.CheckUpdateInfoEntity; -import com.yundian.celebrity.bean.LoginReturnInfo; -import com.yundian.celebrity.bean.QiNiuAdressBean; -import com.yundian.celebrity.bean.RegisterReturnBeen; -import com.yundian.celebrity.bean.RegisterReturnWangYiBeen; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.bean.UptokenBean; -import com.yundian.celebrity.bean.WXinLoginReturnBeen; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.UserAPI; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketDataPacket; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; +package com.cloudTop.starshare.networkapi.socketapi; + +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.app.SocketAPIConstant; +import com.cloudTop.starshare.bean.CheckUpdateInfoEntity; +import com.cloudTop.starshare.bean.LoginReturnInfo; +import com.cloudTop.starshare.bean.QiNiuAdressBean; +import com.cloudTop.starshare.bean.RegisterReturnBeen; +import com.cloudTop.starshare.bean.RegisterReturnWangYiBeen; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.bean.UptokenBean; +import com.cloudTop.starshare.bean.WXinLoginReturnBeen; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.UserAPI; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketDataPacket; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/AddBankCardActvivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddBankCardActvivity.java similarity index 76% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/AddBankCardActvivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddBankCardActvivity.java index eb60a93..6ee6e97 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/AddBankCardActvivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddBankCardActvivity.java @@ -1,26 +1,26 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.text.TextUtils; import android.view.View; import android.widget.Button; import android.widget.EditText; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.BankInfoBean; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.helper.CheckInfoHelper; -import com.yundian.celebrity.helper.CheckViewHelper; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.CountUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.CheckException; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.BankInfoBean; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.helper.CheckInfoHelper; +import com.cloudTop.starshare.helper.CheckViewHelper; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.CountUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.CheckException; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.Bind; import butterknife.OnClick; @@ -38,6 +38,11 @@ public class AddBankCardActvivity extends BaseActivity { EditText etUserName; @Bind(R.id.et_user_cardno) EditText etUserCardno; + + @Bind(R.id.et_city_bank) + EditText etUserCardCity; + @Bind(R.id.et_prov_bank) + EditText etUserCardProv; @Bind(R.id.et_user_phone) EditText etUserPhone; @Bind(R.id.et_code_msg) @@ -110,11 +115,15 @@ private void bindBankCard() { String account = etUserCardno.getText().toString().trim(); String phone = etUserPhone.getText().toString().trim(); String codeMsg = etCodeMsg.getText().toString().trim(); + String loginCity = etUserCardCity.getText().toString().trim(); + String loginRegion = etUserCardProv.getText().toString().trim(); +// String loginCity = SharePrefUtil.getInstance().getLoginCity(); +// String loginRegion = SharePrefUtil.getInstance().getLoginRegion(); - - NetworkAPIFactoryImpl.getDealAPI().bindCard(bankUsername, account, new OnAPIListener() { + NetworkAPIFactoryImpl.getDealAPI().bindCard(bankUsername, account,loginRegion,loginCity, new OnAPIListener() { @Override public void onError(Throwable ex) { + ToastUtils.showShort("绑定失败"); } @Override @@ -169,8 +178,11 @@ public void onError(Throwable ex) { @Override public void onSuccess(RegisterVerifyCodeBeen o) { verifyCodeBeen = o; - new CountUtil(btnGetCode).start(); //收到回调才开启计时 - LogUtils.logd("获取到--注册短信验证码,时间戳是:" + o.toString()); + LogUtils.logd("获取到--注册短信验证码,result是:" + o.getResult()); + if(o.getResult()==1){ + new CountUtil(btnGetCode).start(); //收到回调才开启计时 + LogUtils.logd("获取到--注册短信验证码,时间戳是:" + o.toString()); + } } }); } else { diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/AddMeetTypeActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddMeetTypeActivity.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/AddMeetTypeActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddMeetTypeActivity.java index 8646676..7fa0462 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/AddMeetTypeActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/AddMeetTypeActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.graphics.Color; import android.support.v4.widget.SwipeRefreshLayout; @@ -9,18 +9,17 @@ import android.widget.CheckBox; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.adapter.AddMeetTypeAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.adapter.AddMeetTypeAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/BankCardInfoActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/BankCardInfoActivity.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/BankCardInfoActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/BankCardInfoActivity.java index a93df62..ab1322c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/BankCardInfoActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/BankCardInfoActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.support.v4.widget.SwipeRefreshLayout; import android.text.TextUtils; @@ -7,17 +7,17 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.BankCardBean; -import com.yundian.celebrity.bean.BankInfoBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.view.RoundImageView; -import com.yundian.celebrity.utils.FormatUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.BankCardBean; +import com.cloudTop.starshare.bean.BankInfoBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.view.RoundImageView; +import com.cloudTop.starshare.utils.FormatUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.Bind; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashActivity.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/CashActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashActivity.java index 8e5d9b1..7cb7ca9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashActivity.java @@ -1,8 +1,6 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.content.Intent; -import android.icu.math.BigDecimal; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.InputType; @@ -14,25 +12,24 @@ import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.BankInfoBean; -import com.yundian.celebrity.bean.OrderReturnBeen; -import com.yundian.celebrity.bean.WithDrawCashReturnBean; -import com.yundian.celebrity.helper.CheckInfoHelper; -import com.yundian.celebrity.helper.CheckViewHelper; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.FormatUtil; -import com.yundian.celebrity.utils.JudgeIsSetPayPwd; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.NumberUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; -import com.yundian.celebrity.widget.PasswordView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.BankInfoBean; +import com.cloudTop.starshare.bean.OrderReturnBeen; +import com.cloudTop.starshare.bean.WithDrawCashReturnBean; +import com.cloudTop.starshare.helper.CheckViewHelper; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.FormatUtil; +import com.cloudTop.starshare.utils.JudgeIsSetPayPwd; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.NumberUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; +import com.cloudTop.starshare.widget.PasswordView; import butterknife.Bind; import butterknife.OnClick; @@ -208,7 +205,7 @@ public void onViewClicked(View view) { // #11 case R.id.tv_user_bank_cssount: //模拟测试数据 // ToastUtils.showShort("测试数据"); - startActivity(CashHistoryActivity_Test.class); +// startActivity(CashHistoryActivity_Test.class); break; } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity.java index 0c5885e..7e9e9ea 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.graphics.Color; import android.support.v4.widget.SwipeRefreshLayout; @@ -8,15 +8,15 @@ import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.WithDrawCashHistoryBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.adapter.CashHistoryAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.WithDrawCashHistoryBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.adapter.CashHistoryAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity_Test.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity_Test.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity_Test.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity_Test.java index e45fdaa..9ef8e13 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/CashHistoryActivity_Test.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/CashHistoryActivity_Test.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.graphics.Color; import android.support.v4.widget.SwipeRefreshLayout; @@ -8,15 +8,15 @@ import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.MoneyDetailListBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.adapter.TestAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.MoneyDetailListBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.adapter.TestAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/InComeDetailActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/InComeDetailActivity.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/InComeDetailActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/InComeDetailActivity.java index b96bb6d..65fadd8 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/InComeDetailActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/InComeDetailActivity.java @@ -1,19 +1,19 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.graphics.Color; import android.os.Bundle; import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.IncomeReturnBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.IncomeReturnBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.Bind; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/LoginActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/LoginActivity.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/LoginActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/LoginActivity.java index 917fd43..e9663dd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/LoginActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/LoginActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.graphics.Point; import android.text.TextUtils; @@ -11,20 +11,20 @@ import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.tencent.mm.opensdk.modelmsg.SendAuth; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.EventBusMessage; - -import com.yundian.celebrity.helper.CheckViewHelper; -import com.yundian.celebrity.ui.main.contract.LoginContract; -import com.yundian.celebrity.ui.main.presenter.LoginPresenter; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.utils.ViewConcurrencyUtils; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.EventBusMessage; + +import com.cloudTop.starshare.helper.CheckViewHelper; +import com.cloudTop.starshare.ui.main.contract.LoginContract; +import com.cloudTop.starshare.ui.main.presenter.LoginPresenter; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.utils.ViewConcurrencyUtils; +import com.cloudTop.starshare.widget.WPEditText; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/MainActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/MainActivity.java similarity index 75% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/MainActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/MainActivity.java index 6f7ee38..e260c09 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/MainActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/MainActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.Manifest; @@ -9,10 +9,32 @@ import android.os.Handler; import android.os.Message; import android.support.annotation.NonNull; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.text.TextUtils; import android.widget.Toast; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConstant; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.BankCardBean; +import com.cloudTop.starshare.bean.CheckUpdateInfoEntity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.TabEntity; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.fragment.ContactFansFragment; +import com.cloudTop.starshare.ui.main.fragment.FanAskFragment; +import com.cloudTop.starshare.ui.main.fragment.InComeInfoFragment; +import com.cloudTop.starshare.ui.main.fragment.MeetManageFragment; +import com.cloudTop.starshare.ui.view.ForceUpdateDialog; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomHelper; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.utils.CheckLoginUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; import com.flyco.tablayout.CommonTabLayout; import com.flyco.tablayout.listener.CustomTabEntity; import com.flyco.tablayout.listener.OnTabSelectListener; @@ -33,27 +55,6 @@ import com.netease.nimlib.sdk.uinfo.UserService; import com.netease.nimlib.sdk.uinfo.constant.UserInfoFieldEnum; import com.qiangxi.checkupdatelibrary.dialog.UpdateDialog; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConstant; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.BankCardBean; -import com.yundian.celebrity.bean.CheckUpdateInfoEntity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.TabEntity; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.fragment.ContactFansFragment; -import com.yundian.celebrity.ui.main.fragment.FanAskFragment; -import com.yundian.celebrity.ui.main.fragment.InComeInfoFragment; -import com.yundian.celebrity.ui.main.fragment.MeetManageFragment; -import com.yundian.celebrity.ui.view.ForceUpdateDialog; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomHelper; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.utils.CheckLoginUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -66,8 +67,8 @@ import butterknife.Bind; +import static com.cloudTop.starshare.ui.view.ForceUpdateDialog.FORCE_UPDATE_DIALOG_PERMISSION_REQUEST_CODE; import static com.qiangxi.checkupdatelibrary.dialog.UpdateDialog.UPDATE_DIALOG_PERMISSION_REQUEST_CODE; -import static com.yundian.celebrity.ui.view.ForceUpdateDialog.FORCE_UPDATE_DIALOG_PERMISSION_REQUEST_CODE; public class MainActivity extends BaseActivity { @Bind(R.id.tab_bottom_layout) @@ -108,6 +109,8 @@ public void run() { } }; private FanAskFragment fanAskFragment; + private List fragmentList; + private Fragment mContent; @Override @@ -156,35 +159,61 @@ public void onCreate(Bundle savedInstanceState) { Intent intent = getIntent(); match_info = intent.getIntExtra(AppConstant.MATCH_SUCESS_INFO, 0); if (match_info == 1) { - SwitchTo(2); +// SwitchTo(2); + switchContent(fragmentList.get(2)); tabLayout.setCurrentTab(2); } } private void initFragment(Bundle savedInstanceState) { - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); +// FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); int currentTabPosition = 0; if (savedInstanceState != null) { inComeInfoFragment = (InComeInfoFragment) getSupportFragmentManager().findFragmentByTag("InComeInfoFragment"); contactFansFragment = (ContactFansFragment) getSupportFragmentManager().findFragmentByTag("ContactFansFragment"); meetManageFragment = (MeetManageFragment) getSupportFragmentManager().findFragmentByTag("MeetManageFragment"); - fanAskFragment = (FanAskFragment) getSupportFragmentManager().findFragmentByTag("FanAskFragment"); currentTabPosition = savedInstanceState.getInt(AppConstant.HOME_CURRENT_TAB_POSITION); + LogUtils.loge("恢复currentTabPosition:"+currentTabPosition); + if(fragmentList==null){ + fragmentList=new ArrayList<>(); + fragmentList.add(inComeInfoFragment); + fragmentList.add(contactFansFragment); + fragmentList.add(meetManageFragment); + fragmentList.add(fanAskFragment); + } + + Fragment fragment = fragmentList.get(currentTabPosition); +// +// transaction.add(R.id.fl_main,fragment , fragment.getClass().getName()); +// transaction.show(fragment); +// transaction.commit(); + switchContent(fragment); + +// SwitchTo(currentTabPosition); } else { inComeInfoFragment = new InComeInfoFragment(); contactFansFragment = new ContactFansFragment(); meetManageFragment = new MeetManageFragment(); - fanAskFragment = new FanAskFragment(); - transaction.add(R.id.fl_main, inComeInfoFragment, "InComeInfoFragment"); - transaction.add(R.id.fl_main, contactFansFragment, "ContactFansFragment"); - transaction.add(R.id.fl_main, meetManageFragment, "MeetManageFragment"); - transaction.add(R.id.fl_main, fanAskFragment, "FanAskFragment"); + fanAskFragment =new FanAskFragment(); + + fragmentList = new ArrayList<>(); + fragmentList.add(inComeInfoFragment); + fragmentList.add(contactFansFragment); + fragmentList.add(meetManageFragment); + fragmentList.add(fanAskFragment); + + InComeInfoFragment inComeInfoFragment = (InComeInfoFragment) fragmentList.get(currentTabPosition); + switchContent(inComeInfoFragment); +// transaction.add(R.id.fl_main, inComeInfoFragment, "InComeInfoFragment"); +// transaction.add(R.id.fl_main, contactFansFragment, "ContactFansFragment"); +// transaction.add(R.id.fl_main, meetManageFragment, "MeetManageFragment"); +// transaction.add(R.id.fl_main, fanAskFragment, "FanAskFragment"); } - transaction.commit(); - SwitchTo(currentTabPosition); +// transaction.commit(); +// SwitchTo(currentTabPosition); tabLayout.setCurrentTab(currentTabPosition); } @@ -207,7 +236,8 @@ protected void onSaveInstanceState(Bundle outState) { LogUtils.loge("onSaveInstanceState进来了1"); if (tabLayout != null) { LogUtils.loge("onSaveInstanceState进来了2"); - outState.putInt(AppConstant.HOME_CURRENT_TAB_POSITION, tabLayout.getCurrentTab()); + int currentTab = tabLayout.getCurrentTab(); + outState.putInt(AppConstant.HOME_CURRENT_TAB_POSITION, currentTab); } } @@ -233,40 +263,85 @@ public void onEvent(Void v) { ChatRoomHelper.init(); } + + public void switchContent(Fragment to) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + if(mContent==null){ + if(!to.isAdded()){ + transaction.add(R.id.fl_main,to , to.getClass().getName()); + transaction.show(to); + transaction.commit(); + }else { + transaction.show(to).commit(); // 显示下一个 + + } + mContent=to; + +// InComeInfoFragment inComeInfoFragment = (InComeInfoFragment) fragmentList.get(currentTabPosition); + + + }else{ + if (mContent != to) { + +// FragmentTransaction transaction = getSupportFragmentManager().beginTransaction().setCustomAnimations( +// android.R.anim.fade_in, R.anim.slide_out); + + if (!to.isAdded()) { // 先判断是否被add过 + transaction.hide(mContent).add(R.id.fl_main, to,to.getClass().getName()).commit(); // 隐藏当前的fragment，add下一个到Activity中 + } else { + transaction.hide(mContent).show(to).commit(); // 隐藏当前的fragment，显示下一个 + } + mContent = to; + } + } + + } /** * 切换 */ private void SwitchTo(int position) { LogUtils.logd("主页菜单position" + position); FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + + + switch (position) { case 0: - transaction.hide(contactFansFragment); - transaction.hide(meetManageFragment); - transaction.hide(fanAskFragment); - transaction.show(inComeInfoFragment); +// transaction.hide(contactFansFragment); +// transaction.hide(meetManageFragment); +// transaction.hide(fanAskFragment); + InComeInfoFragment inComeInfoFragment = (InComeInfoFragment) fragmentList.get(position); + if(fragmentList.get(position).isAdded()){ + for (Fragment fragment:fragmentList) { + transaction.hide(fragment); + } + transaction.show(fragmentList.get(position)); + }else{ + transaction.add(R.id.fl_main,inComeInfoFragment , "InComeInfoFragment"); + transaction.show(inComeInfoFragment); + } transaction.commitAllowingStateLoss(); break; case 1: - transaction.hide(inComeInfoFragment); - transaction.hide(meetManageFragment); - transaction.hide(fanAskFragment); +// transaction.hide(inComeInfoFragment); +// transaction.hide(meetManageFragment); +// transaction.hide(fanAskFragment); transaction.show(contactFansFragment); transaction.commitAllowingStateLoss(); break; case 2: // CheckLoginUtil.checkLogin(this); - transaction.hide(contactFansFragment); - transaction.hide(inComeInfoFragment); - transaction.hide(fanAskFragment); +// transaction.hide(contactFansFragment); +// transaction.hide(inComeInfoFragment); +// transaction.hide(fanAskFragment); transaction.show(meetManageFragment); transaction.commitAllowingStateLoss(); break; case 3: // CheckLoginUtil.checkLogin(this); - transaction.hide(contactFansFragment); - transaction.hide(inComeInfoFragment); - transaction.hide(meetManageFragment); +// transaction.hide(contactFansFragment); +// transaction.hide(inComeInfoFragment); +// transaction.hide(meetManageFragment); transaction.show(fanAskFragment); transaction.commitAllowingStateLoss(); break; @@ -287,7 +362,9 @@ private void initTab() { tabLayout.setOnTabSelectListener(new OnTabSelectListener() { @Override public void onTabSelect(int position) { - SwitchTo(position); + + switchContent(fragmentList.get(position)); +// SwitchTo(position); } @Override @@ -391,7 +468,8 @@ protected void onDestroy() { public void ReciveMessageEventBus(final EventBusMessage eventBusMessage) { switch (eventBusMessage.Message) { case 2: //登录取消 - SwitchTo(0); +// SwitchTo(0); + switchContent(fragmentList.get(0)); tabLayout.setCurrentTab(0); break; case -11: @@ -407,9 +485,9 @@ public void ReciveMessageEventBus(final EventBusMessage eventBusMessage) { requestBankInfo(); //更新银行卡信息 requestBalance(); //更新余额信息 tabLayout.setCurrentTab(0); - inComeInfoFragment.getData(); - contactFansFragment.loadData(); - meetManageFragment.loadData(); +// inComeInfoFragment.getData(); +// contactFansFragment.loadData(); +// meetManageFragment.loadData(); break; } } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/MeetingFansDetailActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/MeetingFansDetailActivity.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/MeetingFansDetailActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/MeetingFansDetailActivity.java index 863bf26..32207cd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/MeetingFansDetailActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/MeetingFansDetailActivity.java @@ -1,23 +1,23 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.os.Bundle; import android.widget.Button; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.MeetOrderListBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.view.RoundImageView; -import com.yundian.celebrity.utils.BuyHandleStatuUtils; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.MeetOrderListBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.view.RoundImageView; +import com.cloudTop.starshare.utils.BuyHandleStatuUtils; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; @@ -73,7 +73,7 @@ private void initData() { if (bundle != null) { bean = (MeetOrderListBean) bundle.getParcelable(Constant.MEET_TYPE_DETAIL); - ImageLoaderUtils.display(this, headImage, bean.getHeadurl()); + ImageLoaderUtils.displayUrl(this, headImage, bean.getHeadurl()); tvPetname.setText(bean.getNickname()); tvMeetingDetailTime.setText(String.format(getString(R.string.meeting_detail_time), bean.getOrder_time())); tvMeetingDetailPlace.setText(String.format(getString(R.string.meeting_detail_please), bean.getMeet_city())); diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/PlayActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/PlayActivity.java similarity index 68% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/PlayActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/PlayActivity.java index 093534e..c656293 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/PlayActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/PlayActivity.java @@ -1,7 +1,6 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.annotation.TargetApi; -import android.app.Activity; import android.os.Build; import android.os.Bundle; import android.os.Handler; @@ -11,17 +10,28 @@ import android.view.WindowManager; import android.widget.ImageView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BasePlayActivity; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.ui.main.fragment.CustomAudioFragment; +import com.cloudTop.starshare.ui.main.fragment.VideoAskFragment; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.widget.customVideoPlayer.CustomUIVideo; +import com.cloudTop.starshare.widget.customVideoPlayer.OnTransitionListener; import com.shuyu.gsyvideoplayer.video.base.GSYVideoPlayer; -import com.yundian.celebrity.R; -import com.yundian.celebrity.widget.customVideoPlayer.CustomUIVideo; -import com.yundian.celebrity.widget.customVideoPlayer.OnTransitionListener; + +import java.io.File; + +import static com.cloudTop.starshare.ui.main.fragment.VideoAskFragment.FANS_ASK_BUNDLE; /** * 单独的视频播放页面 * Created by shuyu on 2016/11/11. */ -public class PlayActivity extends Activity { +public class PlayActivity extends BasePlayActivity { public final static String IMG_TRANSITION = "IMG_TRANSITION"; public final static String TRANSITION = "TRANSITION"; @@ -35,6 +45,8 @@ public class PlayActivity extends Activity { private Transition transition; private String playUrl; + private FansAskBean fansAskBean; + private int videoType; @Override protected void onCreate(Bundle savedInstanceState) { @@ -42,17 +54,28 @@ protected void onCreate(Bundle savedInstanceState) { getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + super.onCreate(savedInstanceState); setContentView(R.layout.activity_play_video); - + Bundle bundle = getIntent().getBundleExtra(FANS_ASK_BUNDLE); + if (bundle != null) { + fansAskBean = (FansAskBean) bundle.getParcelable(CustomAudioFragment.FANS_ASK_BEAN); + } // ButterKnife.bind(this); videoPlayer = (CustomUIVideo)findViewById(R.id.video_player); + + videoPlayer.setOnCallBack(new CustomUIVideo.CallBack() { @Override public void onClickBack() { finish(); } + + @Override + public void onCompletion() { +// finish(); + } }); // ImageView question = (ImageView)videoPlayer.findViewById(R.id.iv_question); // final LinearLayout rl_container = (LinearLayout)videoPlayer.findViewById(R.id.layout_bottom); @@ -60,6 +83,35 @@ public void onClickBack() { isTransition = getIntent().getBooleanExtra(TRANSITION, false); playUrl = getIntent().getStringExtra("playUrl"); + String localFrame = getIntent().getStringExtra("frameUrl"); + videoType = getIntent().getIntExtra(VideoAskFragment.VIDEO_TYPE, -1); +// playUrl = getIntent().getStringExtra("playUrl"); + + if(fansAskBean!=null){ + videoPlayer.setQuestionContent(fansAskBean); + + //增加封面 + ImageView imageView = new ImageView(this); + imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); + + if(videoType==VideoAskFragment.ANSWER_TYPE){ + ImageLoaderUtils.displayUrl(this,imageView, AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnailS()); + LogUtils.logd("FrameUrl:"+AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnailS()); + }else if(videoType==VideoAskFragment.ASK_TYPE){ + ImageLoaderUtils.displayUrl(this,imageView,AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnail()); + LogUtils.logd("FrameUrl:"+AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnail()); + }else if (videoType==VideoAskFragment.SELF_WATCH_TYPE){ + File frameFile = new File(localFrame); + + ImageLoaderUtils.display(this,imageView,frameFile); + } + else{ + ImageLoaderUtils.displayUrl(this,imageView,AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnail()); + LogUtils.logd("FrameUrl:"+AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getThumbnail()); + } +// imageView.setImageResource(R.mipmap.ic_launcher); + videoPlayer.setThumbImageView(imageView); + } init(); } @@ -67,11 +119,7 @@ private void init() { videoPlayer.setUp(playUrl, true, ""); - //增加封面 - ImageView imageView = new ImageView(this); - imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); - imageView.setImageResource(R.mipmap.ic_launcher); - videoPlayer.setThumbImageView(imageView); + //增加title // videoPlayer.getTitleTextView().setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/PublishStateActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/PublishStateActivity.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/PublishStateActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/PublishStateActivity.java index 30f36dc..6aa7174 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/PublishStateActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/PublishStateActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.app.Activity; import android.content.Intent; @@ -17,22 +17,22 @@ import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UpCompletionHandler; import com.qiniu.android.storage.UploadManager; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.bean.UptokenBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.view.ValidationWatcher; -import com.yundian.celebrity.utils.DisplayUtil; -import com.yundian.celebrity.utils.FormatUtil; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.bean.UptokenBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.view.ValidationWatcher; +import com.cloudTop.starshare.utils.DisplayUtil; +import com.cloudTop.starshare.utils.FormatUtil; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; import org.json.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity.java index f7247ce..1335dbd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity.java @@ -1,4 +1,4 @@ -//package com.yundian.celebrity.ui.main.activity; +//package com.cloudTop.starshare.ui.main.activity; // //import android.Manifest; //import android.content.DialogInterface; @@ -22,21 +22,21 @@ //import com.qiniu.android.storage.Configuration; //import com.qiniu.android.storage.UpCompletionHandler; //import com.qiniu.android.storage.UploadManager; -//import com.yundian.celebrity.R; -//import com.yundian.celebrity.app.AppConfig; -//import com.yundian.celebrity.base.BaseActivity; -//import com.yundian.celebrity.bean.EventBusMessage; -//import com.yundian.celebrity.bean.RequestResultBean; -//import com.yundian.celebrity.bean.UptokenBean; -//import com.yundian.celebrity.listener.OnAPIListener; -//import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -//import com.yundian.celebrity.utils.FormatUtil; -//import com.yundian.celebrity.utils.LogUtils; -//import com.yundian.celebrity.utils.SharePrefUtil; -//import com.yundian.celebrity.utils.ToastUtils; -//import com.yundian.celebrity.widget.NormalTitleBar; -//import com.yundian.celebrity.widget.photobutton.CaptureButton; -//import com.yundian.celebrity.widget.photobutton.lisenter.CaptureLisenter; +//import com.cloudTop.starshare.R; +//import com.cloudTop.starshare.app.AppConfig; +//import com.cloudTop.starshare.base.BaseActivity; +//import com.cloudTop.starshare.bean.EventBusMessage; +//import com.cloudTop.starshare.bean.RequestResultBean; +//import com.cloudTop.starshare.bean.UptokenBean; +//import com.cloudTop.starshare.listener.OnAPIListener; +//import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +//import com.cloudTop.starshare.utils.FormatUtil; +//import com.cloudTop.starshare.utils.LogUtils; +//import com.cloudTop.starshare.utils.SharePrefUtil; +//import com.cloudTop.starshare.utils.ToastUtils; +//import com.cloudTop.starshare.widget.NormalTitleBar; +//import com.cloudTop.starshare.widget.photobutton.CaptureButton; +//import com.cloudTop.starshare.widget.photobutton.lisenter.CaptureLisenter; // //import org.greenrobot.eventbus.EventBus; //import org.json.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity1.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity1.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity1.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity1.java index cb58576..0dec014 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordAudioActivity1.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordAudioActivity1.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.Manifest; import android.content.Context; @@ -27,6 +27,27 @@ import android.widget.TextView; import android.widget.Toast; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.bean.UptokenBean; +import com.cloudTop.starshare.event.AudioMessageEvent; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.fragment.CustomAudioFragment; +import com.cloudTop.starshare.utils.FormatUtil; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.TimeUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.AudioRecordButton; +import com.cloudTop.starshare.widget.EasySwitchButton; +import com.cloudTop.starshare.widget.NormalTitleBar; +import com.cloudTop.starshare.widget.audioplayer.MyAudioPlayer; +import com.cloudTop.starshare.widget.audiorecorder.AndroidAACProcessor; +import com.cloudTop.starshare.widget.photobutton.lisenter.CaptureLisenter; import com.liulishuo.engzo.lingorecorder.LingoRecorder; import com.liulishuo.engzo.lingorecorder.processor.WavProcessor; import com.qiniu.android.common.Zone; @@ -34,27 +55,6 @@ import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UpCompletionHandler; import com.qiniu.android.storage.UploadManager; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.bean.UptokenBean; -import com.yundian.celebrity.event.AudioMessageEvent; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.fragment.CustomAudioFragment; -import com.yundian.celebrity.utils.FormatUtil; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.TimeUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.AudioRecordButton; -import com.yundian.celebrity.widget.EasySwitchButton; -import com.yundian.celebrity.widget.NormalTitleBar; -import com.yundian.celebrity.widget.audioplayer.MyAudioPlayer; -import com.yundian.celebrity.widget.audiorecorder.AndroidAACProcessor; -import com.yundian.celebrity.widget.photobutton.lisenter.CaptureLisenter; import org.greenrobot.eventbus.EventBus; import org.json.JSONObject; @@ -64,6 +64,7 @@ import java.io.FileNotFoundException; import butterknife.Bind; +import tv.danmaku.ijk.media.player.IMediaPlayer; /** @@ -135,6 +136,7 @@ public class RecordAudioActivity1 extends BaseActivity implements View.OnClickLi private AudioManager audioManager; private boolean isOpened=true; private int position; + private int duration; @Override public int getLayoutId() { @@ -164,12 +166,17 @@ public void initView() { if(fansAskBean.getC_type()==0){ tvCustomTime.setText("15s定制"); + duration=15; }else if(fansAskBean.getC_type()==1){ tvCustomTime.setText("30s定制"); + duration=30; }else if(fansAskBean.getC_type()==2){ tvCustomTime.setText("45s定制"); - }else if(fansAskBean.getC_type()==3){ + duration=45; + } + else if(fansAskBean.getC_type()==3){ tvCustomTime.setText("60s定制"); + duration=60; } String askTime = TimeUtil.formatData(TimeUtil.dateFormatYMD, fansAskBean.getAsk_t()); @@ -184,6 +191,7 @@ public void initView() { lingoRecorder = new LingoRecorder(); myAudioPlayer = new MyAudioPlayer(); + myAudioPlayer.setOnCompleteListener(mCompletionListener); filePath = SAVE_PATH + SAVE_NAME_WAV; aacFilePath = SAVE_PATH + SAVE_NAME_AAC; @@ -205,13 +213,13 @@ public void initView() { layout_height = button_size + (button_size / 5) * 2 + 100; button_size = (int) (layout_width / 4.5f); - capture_button = new AudioRecordButton(this, button_size); + capture_button = new AudioRecordButton(this, button_size,R.drawable.audio); FrameLayout.LayoutParams btn_capture_param = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT); // btn_capture_param.addRule(CENTER_IN_PARENT, TRUE); btn_capture_param.gravity = Gravity.BOTTOM; // btn_capture_param.setMargins(0, 152, 0, 0); capture_button.setLayoutParams(btn_capture_param); - capture_button.setDuration(10 * 1000); + capture_button.setDuration(duration * 1000); FrameLayout container = (FrameLayout) findViewById(R.id.picture_button); container.addView(capture_button); @@ -320,7 +328,11 @@ public void stopRecordWithSave(long time) { // getLongTime(filePath); - audioSecond.setText(time/1000 + "s"); + long duration = time / 1000; + if(duration==0){ + duration=1; + } + audioSecond.setText(duration + "s"); // } // }).start(); @@ -401,7 +413,7 @@ public void stopRecordUnSave(boolean isTimeShort) { if (isTimeShort) { Toast.makeText(RecordAudioActivity1.this, "时间太短,已删", Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(RecordAudioActivity1.this, "文件已删除", Toast.LENGTH_SHORT).show(); +// Toast.makeText(RecordAudioActivity1.this, "文件已删除", Toast.LENGTH_SHORT).show(); } } @@ -473,7 +485,7 @@ public void startRecord() { private void startAnim(boolean isStart) { audioLayout.setVisibility(View.VISIBLE); - info.setText("上滑取消"); + info.setText("手指上滑取消录制"); // recordBtn.setBackgroundDrawable(getResources().getDrawable(R.drawable.mic_pressed_bg)); micIcon.setBackgroundDrawable(null); micIcon.setBackgroundDrawable(getResources().getDrawable(R.drawable.audio_tip)); @@ -491,7 +503,7 @@ private void stopAnim() { } private void moveAnim() { - info.setText("松手取消"); + info.setText("松开手指取消录制"); micIcon.setBackgroundDrawable(null); micIcon.setBackgroundDrawable(getResources().getDrawable(R.drawable.cancel_audio)); } @@ -634,12 +646,19 @@ public void onSuccess(RequestResultBean requestResultBean) { }); } + IMediaPlayer.OnCompletionListener mCompletionListener = new IMediaPlayer.OnCompletionListener() { + @Override + public void onCompletion(IMediaPlayer iMediaPlayer) { + myAudioPlayer.stop(); + } + }; @Override public void onClick(View view) { switch (view.getId()) { case R.id.rl_audio_review: - if (filePath != null && !TextUtils.isEmpty(filePath)) { + if (!TextUtils.isEmpty(filePath)) { + boolean isMediaPlayerStop = myAudioPlayer.isMediaPlayerStop(); boolean isPrepared = !myAudioPlayer.isMediaPlayerPrepared(); if (myAudioPlayer != null && isMediaPlayerStop) { @@ -669,4 +688,22 @@ public void onChecked(View v, boolean isOpened) { ToastUtils.showShort("不公开"); } } + + @Override + protected void onDestroy() { + super.onDestroy(); + if (myAudioPlayer != null){ + myAudioPlayer.releaseMedia(); + myAudioPlayer=null; + } + } + +// @Override +// protected void onStop() { +// super.onStop(); +// if (myAudioPlayer != null){ +// myAudioPlayer.releaseMedia(); +// myAudioPlayer=null; +// } +// } } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordVideoActivity1.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordVideoActivity1.java similarity index 78% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordVideoActivity1.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordVideoActivity1.java index 1b06be0..6791a92 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/RecordVideoActivity1.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/RecordVideoActivity1.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.content.Intent; import android.os.Bundle; +import android.text.TextUtils; import android.view.View; -import android.widget.Button; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; @@ -11,23 +11,23 @@ import com.qiniu.android.common.Zone; import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UploadManager; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.event.VideoMessageEvent; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.fragment.CustomAudioFragment; -import com.yundian.celebrity.ui.main.fragment.VideoAskFragment; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.TimeUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.EasySwitchButton; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.event.VideoMessageEvent; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.fragment.CustomAudioFragment; +import com.cloudTop.starshare.ui.main.fragment.VideoAskFragment; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.TimeUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.EasySwitchButton; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; @@ -35,6 +35,10 @@ import butterknife.Bind; +import static com.cloudTop.starshare.ui.main.fragment.VideoAskFragment.FANS_ASK_BEAN; +import static com.cloudTop.starshare.ui.main.fragment.VideoAskFragment.FANS_ASK_BUNDLE; +import static com.cloudTop.starshare.ui.main.fragment.VideoAskFragment.SELF_WATCH_TYPE; + /** * 定制视频 @@ -46,11 +50,14 @@ public class RecordVideoActivity1 extends BaseActivity { @Bind(R.id.nt_title) NormalTitleBar ntTitle; @Bind(R.id.btn_video_record) - Button videoRecord; + ImageView videoRecord; @Bind(R.id.rl_frame) RelativeLayout rl_frame; + @Bind(R.id.rl_video_watch) + RelativeLayout rl_video_watch; + @Bind(R.id.esb_button) EasySwitchButton esbButton; @@ -110,14 +117,18 @@ public void initPresenter() { @Override public void initView() { - Bundle bundle = getIntent().getBundleExtra(VideoAskFragment.FANS_ASK_BUNDLE); + Bundle bundle = getIntent().getBundleExtra(FANS_ASK_BUNDLE); position = getIntent().getIntExtra(VideoAskFragment.POSITION,-1); duration = getIntent().getIntExtra(VideoAskFragment.DURATION,-1); if (bundle != null) { fansAskBean = (FansAskBean) bundle.getParcelable(CustomAudioFragment.FANS_ASK_BEAN); tvName.setText(fansAskBean.getNickName()); - video_url = AppConfig.QI_NIU_PIC_ADRESS+fansAskBean.getVideo_url(); + video_url = fansAskBean.getVideo_url(); + + if(TextUtils.isEmpty(video_url)){ + tvAskVideo.setVisibility(View.INVISIBLE); + } if (fansAskBean.getC_type() == 0) { tvCustomTime.setText("15s定制"); @@ -125,7 +136,8 @@ public void initView() { tvCustomTime.setText("30s定制"); } else if (fansAskBean.getC_type() == 2) { tvCustomTime.setText("45s定制"); - } else if (fansAskBean.getC_type() == 3) { + } + else if (fansAskBean.getC_type() == 3) { tvCustomTime.setText("60s定制"); } @@ -191,14 +203,34 @@ private void setZone() { // uploadManager = new UploadManager(); } - // TODO: 2017/8/29 + private void initListener() { + rl_video_watch.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Intent intent = new Intent(RecordVideoActivity1.this,PlayActivity.class); + intent.putExtra("playUrl",videoPath); + intent.putExtra("frameUrl",framePath); + intent.putExtra(VideoAskFragment.VIDEO_TYPE,SELF_WATCH_TYPE); + Bundle bundle = new Bundle(); + bundle.putParcelable(FANS_ASK_BEAN,fansAskBean); + intent.putExtra(FANS_ASK_BUNDLE,bundle); + + startActivity(intent); + } + }); + videoRecord.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { Intent intent = new Intent(RecordVideoActivity1.this,VideoRecordActivity.class); intent.putExtra(VideoAskFragment.DURATION,duration); + + Bundle bundle = new Bundle(); + bundle.putParcelable(FANS_ASK_BEAN,fansAskBean); + intent.putExtra(FANS_ASK_BUNDLE,bundle); + intent.putExtra(VideoAskFragment.DURATION,duration); startActivityForResult(intent, 170); } @@ -219,10 +251,14 @@ public void onClick(View view) { tvAskVideo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - if(video_url!=null){ + if(!TextUtils.isEmpty(video_url)){ Intent intent = new Intent(RecordVideoActivity1.this,PlayActivity.class); - intent.putExtra("playUrl",video_url); + intent.putExtra("playUrl",AppConfig.QI_NIU_PIC_ADRESS+video_url); + Bundle bundle = new Bundle(); + bundle.putParcelable(FANS_ASK_BEAN,fansAskBean); + intent.putExtra(FANS_ASK_BUNDLE,bundle); + startActivity(intent); }else{ ToastUtils.showShort("视频为空"); @@ -265,7 +301,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent) videoPath = intent.getStringExtra(VideoRecordActivity.VIDEOPATH); videoName = intent.getStringExtra(VideoRecordActivity.VIDEONAME); frameName = intent.getStringExtra(VideoRecordActivity.FRAMENAME); - + LogUtils.logd("接收到返回的内容:本地缩略图:"+framePath+"本地视频:"+videoPath+"线上缩略图:"+frameName+"线上视频:"+videoName); File frameFile = new File(framePath); ImageLoaderUtils.display(this, img_video, frameFile); hasRecorded=true; @@ -338,6 +374,7 @@ private String getExtName(String s, char split) { private void doSendContent() { String starCode = SharePrefUtil.getInstance().getStarcode(); + LogUtils.logd("上传视频到服务器,视频:"+videoName+"缩略图:"+frameName); // TODO: 2017/8/29 NetworkAPIFactoryImpl.getDealAPI().publishVideoAnswer(fansAskBean.getId(),isOpened?1:0, videoName,frameName, new OnAPIListener() { @Override @@ -345,7 +382,6 @@ public void onError(Throwable ex) { LogUtils.loge("发布失败"); ToastUtils.showShort("发布失败"); stopProgressDialog(); - } @Override @@ -362,7 +398,7 @@ public void onSuccess(RequestResultBean requestResultBean) { if(requestResultBean.getResult()==0){ ToastUtils.showShort("发布成功"); - EventBus.getDefault().post(new VideoMessageEvent(position,videoName)); + EventBus.getDefault().post(new VideoMessageEvent(position,videoName,frameName)); finish(); } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetPayPwdActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetPayPwdActivity.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetPayPwdActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetPayPwdActivity.java index 0ea3320..4b6e4d4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetPayPwdActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetPayPwdActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.os.Bundle; @@ -11,26 +11,26 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.RegisterReturnBeen; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.helper.CheckInfoHelper; -import com.yundian.celebrity.helper.CheckViewHelper; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; -import com.yundian.celebrity.utils.CountUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.CheckException; -import com.yundian.celebrity.widget.NormalTitleBar; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.RegisterReturnBeen; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.helper.CheckInfoHelper; +import com.cloudTop.starshare.helper.CheckViewHelper; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.utils.CountUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.CheckException; +import com.cloudTop.starshare.widget.NormalTitleBar; +import com.cloudTop.starshare.widget.WPEditText; import butterknife.Bind; import butterknife.OnClick; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetUserPwdActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetUserPwdActivity.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetUserPwdActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetUserPwdActivity.java index 72203eb..96b3455 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/ResetUserPwdActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/ResetUserPwdActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.text.InputType; import android.text.TextUtils; @@ -8,23 +8,23 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.RegisterReturnBeen; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.helper.CheckInfoHelper; -import com.yundian.celebrity.helper.CheckViewHelper; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIException; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; -import com.yundian.celebrity.utils.CountUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.CheckException; -import com.yundian.celebrity.widget.NormalTitleBar; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.RegisterReturnBeen; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.helper.CheckInfoHelper; +import com.cloudTop.starshare.helper.CheckViewHelper; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIException; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.utils.CountUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.CheckException; +import com.cloudTop.starshare.widget.NormalTitleBar; +import com.cloudTop.starshare.widget.WPEditText; import butterknife.Bind; import butterknife.OnClick; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/SettingDealPwdActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/SettingDealPwdActivity.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/SettingDealPwdActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/SettingDealPwdActivity.java index c96bee0..cfd1cc4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/SettingDealPwdActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/SettingDealPwdActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.animation.ObjectAnimator; import android.view.KeyEvent; @@ -7,17 +7,17 @@ import android.widget.LinearLayout; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.view.PayPwdEditText; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.view.PayPwdEditText; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.Bind; import butterknife.OnClick; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/SplashActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/SplashActivity.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/SplashActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/SplashActivity.java index d880027..7e54b07 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/SplashActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/SplashActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.app.Activity; import android.content.Intent; @@ -9,21 +9,22 @@ import android.text.TextUtils; import android.view.MotionEvent; +import com.cloudTop.starshare.utils.SharePrefUtil; import com.testin.agent.Bugout; import com.testin.agent.BugoutConfig; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.bean.MyAddressBean; -import com.yundian.celebrity.bean.QiNiuAdressBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.GetIPAddressUtils; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.bean.MyAddressBean; +import com.cloudTop.starshare.bean.QiNiuAdressBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.GetIPAddressUtils; +import com.cloudTop.starshare.utils.LogUtils; import java.lang.ref.WeakReference; -import static com.yundian.celebrity.app.AppConfig.QI_NIU_PIC_ADRESS; +import static com.cloudTop.starshare.app.AppConfig.QI_NIU_PIC_ADRESS; /** * Created by Administrator on 2017/5/5. @@ -92,13 +93,19 @@ public void initView() { @Override public void run() { final MyAddressBean ipAddress = GetIPAddressUtils.getIpAddress(); - if (ipAddress!=null&&ipAddress.getData()==null){ + if (ipAddress==null||ipAddress.getData()==null){ return; } AppConfig.AREA_ID = Long.valueOf(ipAddress.getData().getArea_id()); AppConfig.AREA = ipAddress.getData().getArea(); AppConfig.ISP_ID = Long.valueOf(ipAddress.getData().getIsp_id()); AppConfig.ISP = ipAddress.getData().getIsp(); + + String city = ipAddress.getData().getCity(); + String region = ipAddress.getData().getRegion(); + SharePrefUtil.getInstance().setLoginRegion(region); + SharePrefUtil.getInstance().setLoginCity(city); + NetworkAPIFactoryImpl.getUserAPI().getQiNiuPicDress(new OnAPIListener() { @Override public void onError(Throwable ex) { diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/TimeAddressActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/TimeAddressActivity.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/TimeAddressActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/TimeAddressActivity.java index e8dbce4..47f1619 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/TimeAddressActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/TimeAddressActivity.java @@ -1,30 +1,27 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; -import android.os.Bundle; import android.support.annotation.NonNull; import android.text.TextUtils; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.bean.SubmitAddressTimeInfo; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.DisplayUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.TimeUtil; -import com.yundian.celebrity.utils.ToastUtils; -import com.yundian.celebrity.utils.timeselectutils.AddressPickTask; -import com.yundian.celebrity.utils.timeselectutils.City; -import com.yundian.celebrity.utils.timeselectutils.County; -import com.yundian.celebrity.utils.timeselectutils.DatePicker; -import com.yundian.celebrity.utils.timeselectutils.Province; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.SubmitAddressTimeInfo; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.DisplayUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.TimeUtil; +import com.cloudTop.starshare.utils.ToastUtils; +import com.cloudTop.starshare.utils.timeselectutils.AddressPickTask; +import com.cloudTop.starshare.utils.timeselectutils.City; +import com.cloudTop.starshare.utils.timeselectutils.County; +import com.cloudTop.starshare.utils.timeselectutils.DatePicker; +import com.cloudTop.starshare.utils.timeselectutils.Province; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; @@ -32,16 +29,12 @@ import java.util.Date; import butterknife.Bind; -import butterknife.ButterKnife; import butterknife.OnClick; -import static android.R.attr.startYear; import static android.media.CamcorderProfile.get; -import static com.yundian.celebrity.R.id.feedbackContent; -import static com.yundian.celebrity.R.id.tv_end_time; -import static com.yundian.celebrity.R.id.tv_start_time; -import static com.yundian.celebrity.utils.TimeUtil.dateFormatYMD; -import static com.yundian.celebrity.utils.TimeUtil.getStringByFormat; +import static com.cloudTop.starshare.R.id.tv_end_time; +import static com.cloudTop.starshare.R.id.tv_start_time; +import static com.cloudTop.starshare.utils.TimeUtil.getStringByFormat; /** * 时间地址管理 diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/UserAssetsManageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/UserAssetsManageActivity.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/UserAssetsManageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/UserAssetsManageActivity.java index b3d17dd..7c69808 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/UserAssetsManageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/UserAssetsManageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; import android.app.Dialog; import android.content.Context; @@ -14,15 +14,15 @@ import android.widget.PopupWindow; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseActivity; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.BankCardBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseActivity; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.BankCardBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.Bind; import butterknife.OnClick; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/activity/VideoRecordActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/VideoRecordActivity.java similarity index 82% rename from app/src/main/java/com/yundian/celebrity/ui/main/activity/VideoRecordActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/activity/VideoRecordActivity.java index 9f9ee9d..d93682d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/activity/VideoRecordActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/activity/VideoRecordActivity.java @@ -1,6 +1,5 @@ -package com.yundian.celebrity.ui.main.activity; +package com.cloudTop.starshare.ui.main.activity; -import android.app.Activity; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; @@ -9,6 +8,7 @@ import android.media.MediaPlayer; import android.net.Uri; import android.opengl.GLSurfaceView; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -24,9 +24,32 @@ import android.view.Window; import android.view.WindowManager; import android.widget.FrameLayout; +import android.widget.ImageView; import android.widget.ProgressBar; +import android.widget.RelativeLayout; +import android.widget.TextView; import android.widget.Toast; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BasePlayActivity; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.bean.UptokenBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.fragment.CustomAudioFragment; +import com.cloudTop.starshare.ui.main.fragment.VideoAskFragment; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.widget.photobutton.CaptureLayout; +import com.cloudTop.starshare.widget.photobutton.lisenter.CaptureLisenter; +import com.cloudTop.starshare.widget.photobutton.lisenter.TypeLisenter; +import com.cloudTop.starshare.widget.videorecorder.Config; +import com.cloudTop.starshare.widget.videorecorder.CustomProgressDialog; +import com.cloudTop.starshare.widget.videorecorder.FocusIndicator; +import com.cloudTop.starshare.widget.videorecorder.RecordSettings; +import com.cloudTop.starshare.widget.videorecorder.ToastUtils; +import com.cloudTop.starshare.widget.videorecorder.render.GLRenderer; import com.qiniu.android.common.Zone; import com.qiniu.android.http.ResponseInfo; import com.qiniu.android.storage.Configuration; @@ -49,22 +72,6 @@ import com.qiniu.pili.droid.shortvideo.PLVideoEncodeSetting; import com.qiniu.pili.droid.shortvideo.PLVideoFrame; import com.qiniu.pili.droid.shortvideo.PLVideoSaveListener; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.bean.UptokenBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.fragment.VideoAskFragment; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.widget.photobutton.CaptureLayout; -import com.yundian.celebrity.widget.photobutton.lisenter.CaptureLisenter; -import com.yundian.celebrity.widget.photobutton.lisenter.TypeLisenter; -import com.yundian.celebrity.widget.videorecorder.Config; -import com.yundian.celebrity.widget.videorecorder.CustomProgressDialog; -import com.yundian.celebrity.widget.videorecorder.FocusIndicator; -import com.yundian.celebrity.widget.videorecorder.RecordSettings; -import com.yundian.celebrity.widget.videorecorder.ToastUtils; -import com.yundian.celebrity.widget.videorecorder.render.GLRenderer; import org.json.JSONObject; @@ -73,13 +80,14 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.ref.WeakReference; import java.util.Random; import static android.view.View.GONE; -import static android.view.View.VISIBLE; +import static com.cloudTop.starshare.ui.main.fragment.VideoAskFragment.FANS_ASK_BUNDLE; -public class VideoRecordActivity extends Activity implements PLRecordStateListener, PLVideoSaveListener, PLFocusListener, PLUploadProgressListener, PLUploadResultListener { +public class VideoRecordActivity extends BasePlayActivity implements PLRecordStateListener, PLVideoSaveListener, PLFocusListener, PLUploadProgressListener, PLUploadResultListener { private static final String PREVIEW = "preview"; private static final String PLAYBACK = "play_back"; protected static final String FRAMEPATH = "framePath"; @@ -90,14 +98,14 @@ public class VideoRecordActivity extends Activity implements PLRecordStateListen /** * NOTICE: KIWI needs extra cost */ - private static final boolean USE_KIWI = true; + private static final boolean USE_KIWI = false; private PLShortVideoRecorder mShortVideoRecorder; // private CustomProgressDialog mProcessingDialog; private View mSwitchCameraBtn; - private View mSwitchFlashBtn; +// private View mSwitchFlashBtn; private FocusIndicator mFocusIndicator; // private SeekBar mAdjustBrightnessSeekBar; @@ -145,24 +153,57 @@ public class VideoRecordActivity extends Activity implements PLRecordStateListen private String bitmapPath; private String imageName; private String uptoken; + private ImageView ivHead; + private RelativeLayout rlAskContent; + private TextView tvName; + private TextView tvQuestionContent; + private FansAskBean fansAskBean; + private ImageView ivQuestion; + private MyHandler mHandler ; + private int successCount; + private String fileName; @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); + final Window window = getWindow(); + + window.getDecorView().setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() { + @Override + public void onSystemUiVisibilityChange(int visibility) { + setHideVirtualKey(window); + } + }); + + super.onCreate(savedInstanceState); + Bundle bundle = getIntent().getBundleExtra(FANS_ASK_BUNDLE); + if (bundle != null) { + fansAskBean = (FansAskBean) bundle.getParcelable(CustomAudioFragment.FANS_ASK_BEAN); + } LayoutInflater inflater = getLayoutInflater(); //调用Activity的getLayoutInflater) rootView = (ViewGroup) inflater.inflate(R.layout.activity_record, null); setContentView(rootView); getToken(); + + mHandler = new MyHandler(this); //预览区 container = (FrameLayout) findViewById(R.id.glsurface_container); progressBar = (ProgressBar) findViewById(R.id.progressbar); + ivQuestion = (ImageView) findViewById(R.id.iv_question); + rlAskContent = (RelativeLayout) findViewById(R.id.rl_ask_content); + ivHead = (ImageView) findViewById(R.id.iv_head); + tvName = (TextView) findViewById(R.id.tv_name); + tvQuestionContent = (TextView) findViewById(R.id.tv_question_content); + ImageLoaderUtils.displayUrl(this,ivHead,fansAskBean.getHeadUrl()); + tvName.setText(fansAskBean.getNickName()); + tvQuestionContent.setText(fansAskBean.getUask()); mCaptureLayout = (CaptureLayout) findViewById(R.id.layout_capture); @@ -173,6 +214,7 @@ protected void onCreate(Bundle savedInstanceState) { mCaptureLayout.setEnabled(false); + mCaptureLayout.setCaptureLisenter(new CaptureLisenter() { @Override public void takePictures() { @@ -320,8 +362,19 @@ public void confirm() { } }); + ivQuestion.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + if(rlAskContent.getVisibility()==View.VISIBLE){ + rlAskContent.setVisibility(View.GONE); + }else{ + rlAskContent.setVisibility(View.VISIBLE); + } + } + }); + mSwitchCameraBtn = findViewById(R.id.switch_camera); - mSwitchFlashBtn = findViewById(R.id.switch_flash); +// mSwitchFlashBtn = findViewById(R.id.switch_flash); mFocusIndicator = (FocusIndicator) findViewById(R.id.focus_indicator); // mAdjustBrightnessSeekBar = (SeekBar) findViewById(R.id.adjust_brightness); @@ -354,7 +407,7 @@ public void confirm() { mCameraSetting.setCameraId(facingId); //把camera拍到的内容显示在preview上的一些设置 mCameraSetting.setCameraPreviewSizeRatio(getPreviewSizeRatio(0)); - mCameraSetting.setCameraPreviewSizeLevel(getPreviewSizeLevel(7)); + mCameraSetting.setCameraPreviewSizeLevel(getPreviewSizeLevel(6)); //麦克风的设置 PLMicrophoneSetting microphoneSetting = new PLMicrophoneSetting(); @@ -362,14 +415,14 @@ public void confirm() { //video编码的设置 PLVideoEncodeSetting videoEncodeSetting = new PLVideoEncodeSetting(this); videoEncodeSetting.setEncodingSizeLevel(getEncodingSizeLevel(17)); - videoEncodeSetting.setEncodingBitrate(getEncodingBitrateLevel(7)); + videoEncodeSetting.setEncodingBitrate(getEncodingBitrateLevel(6)); //音频的设置 PLAudioEncodeSetting audioEncodeSetting = new PLAudioEncodeSetting(); //record录像的设置 PLRecordSetting recordSetting = new PLRecordSetting(); - recordSetting.setMaxRecordDuration(RecordSettings.DEFAULT_MAX_RECORD_DURATION); + recordSetting.setMaxRecordDuration(duration*1000); recordSetting.setVideoCacheDir(Config.VIDEO_STORAGE_DIR); String fileName = createFileName() + "record.mp4"; @@ -388,9 +441,10 @@ public void confirm() { // //全部设置给recorder mShortVideoRecorder.prepare(preview, mCameraSetting, microphoneSetting, videoEncodeSetting, audioEncodeSetting, USE_KIWI ? null : faceBeautySetting, recordSetting); - + mShortVideoRecorder.setFlashEnabled(false); // if (USE_KIWI) { +// //不用美颜库暂时注释掉 // StickerConfigMgr.setSelectedStickerConfig(null); // // mKiwiTrackWrapper = new KiwiTrackWrapper(this, mCameraSetting.getCameraId()); @@ -455,8 +509,8 @@ public boolean onTouch(View view, MotionEvent motionEvent) { // TODO: 2017/8/25 - PLUploadSetting uploadSetting = new PLUploadSetting(); -// .setChunkSize(chunkSize) //分片上传时，每片的大小，默认256K + PLUploadSetting uploadSetting = new PLUploadSetting() + .setChunkSize(2*256*1024) ; //分片上传时，每片的大小，默认256K // .setPutThreshhold(putthreshhold) // 启用分片上传阀值，默认512K // .setConnectTimeout(connectTimeout) // 链接超时，默认10秒 // .setResponseTimeout(responseTimeout) // 服务器响应超时，默认60秒 @@ -601,7 +655,7 @@ protected void onPause() { // if (mediaPlayer != null) { // mediaPlayer.stop(); -// mediaPlayer.release(); +// mediaPlayer.resetWithError(); // mediaPlayer = null; // } } @@ -610,7 +664,7 @@ public void getToken() { NetworkAPIFactoryImpl.getUserAPI().getQiNiuToken(new OnAPIListener() { @Override public void onError(Throwable ex) { - + com.cloudTop.starshare.utils.ToastUtils.showShort("获取token失败"); } @Override @@ -653,9 +707,9 @@ public void onReady() { runOnUiThread(new Runnable() { @Override public void run() { - mSwitchFlashBtn.setVisibility(mShortVideoRecorder.isFlashSupport() ? VISIBLE : GONE); +// mSwitchFlashBtn.setVisibility(mShortVideoRecorder.isFlashSupport() ? VISIBLE : GONE); mFlashEnabled = false; - mSwitchFlashBtn.setActivated(mFlashEnabled); +// mSwitchFlashBtn.setActivated(mFlashEnabled); mCaptureLayout.setEnabled(true); // progressButton.setEnabled(true); @@ -760,23 +814,23 @@ public void run() { } - private Handler handleProgress = new Handler() { - public void handleMessage(Message msg) { - switch (msg.what) { - case 0://更新进度条 - - if (mediaPlayer != null) { - int position = mediaPlayer.getCurrentPosition(); - if (position >= 0) { - progressBar.setProgress(position); -// String cur = UIUtils.getShowTime(position); -// currTimeText.setText(cur); - } - break; - } - } - } - }; +// private Handler handleProgress = new Handler() { +// public void handleMessage(Message msg) { +// switch (msg.what) { +// case 0://更新进度条 +// +// if (mediaPlayer != null) { +// int position = mediaPlayer.getCurrentPosition(); +// if (position >= 0) { +// progressBar.setProgress(position); +//// String cur = UIUtils.getShowTime(position); +//// currTimeText.setText(cur); +// } +// break; +// } +// } +// } +// }; //取消 @Override @@ -826,7 +880,7 @@ public void run() { @Override public void updateProgress() { if (glRenderer.getMediaPlayer() != null) { - handleProgress.sendEmptyMessage(0); + mHandler.sendEmptyMessage(0); } } @@ -924,6 +978,9 @@ public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) { // mIsEditVideo = false; Toast.makeText(VideoRecordActivity.this, "不上传", Toast.LENGTH_SHORT).show(); + + + // mShortVideoRecorder.concatSections(VideoRecordActivity.this); } }); @@ -949,7 +1006,7 @@ private void upLoadVideo() { // }); if (!mIsUpload) { - if (uptoken != null && !TextUtils.isEmpty(uptoken)) { + if (!TextUtils.isEmpty(uptoken)) { Toast.makeText(VideoRecordActivity.this, "开始上传", Toast.LENGTH_SHORT).show(); mVideoUploadManager.startUpload(filePath, uptoken); mIsUpload = true; @@ -959,7 +1016,50 @@ private void upLoadVideo() { } } + private class MyHandler extends Handler{ + private final WeakReference mActivity; + private MyHandler(VideoRecordActivity videoRecordActivity) { + mActivity = new WeakReference<>(videoRecordActivity); + } + + @Override + public void handleMessage(Message msg) { + VideoRecordActivity activity = mActivity.get(); + if(activity!=null){ + switch (msg.what){ + case 0://更新进度条 + + if (mediaPlayer != null) { + int position = mediaPlayer.getCurrentPosition(); + if (position >= 0) { + progressBar.setProgress(position); +// String cur = UIUtils.getShowTime(position); +// currTimeText.setText(cur); + } + break; + } + + case 1 : + if (successCount==2){ + mProcessingDialog.dismiss(); + mIsUpload = false; + + Intent intent = new Intent(); + intent.putExtra(FRAMEPATH, bitmapPath); + intent.putExtra(FRAMENAME, imageName); + intent.putExtra(VIDEOPATH, filePath); + intent.putExtra(VIDEONAME, fileName); + LogUtils.logd("接收到返回的内容:本地缩略图:" + bitmapPath + "本地视频:" + filePath + "线上缩略图:" + imageName + "线上视频:" + fileName); + activity.setResult(RESULT_OK, intent); + activity.finish(); + successCount=0; + } + break; + } + } + } + } private void upLoadCover() { if (uploadManager == null) { Configuration config = new Configuration.Builder() @@ -972,7 +1072,7 @@ private void upLoadCover() { bitmapPath = getBitmap(fileName); if (uptoken == null && TextUtils.isEmpty(uptoken)) { - com.yundian.celebrity.utils.ToastUtils.showShort("七牛token为空"); + com.cloudTop.starshare.utils.ToastUtils.showShort("七牛token为空"); return; } @@ -989,11 +1089,13 @@ public void complete(String key, ResponseInfo info, JSONObject response) { // String imageUrl = Constant.QI_NIU_BASE_URL + key; imageName = key; LogUtils.loge("获取的图片地址:" + imageName); + successCount++; + mHandler.sendEmptyMessage(1); // doSendContent(imageUrl); } else { Log.i("qiniu", "Upload Fail"); - com.yundian.celebrity.utils.ToastUtils.showShort("缩略图上传失败" + info.error); + com.cloudTop.starshare.utils.ToastUtils.showShort("缩略图上传失败" + info.error); //如果失败，这里可以把info信息上报自己的服务器，便于后面分析上传错误原因 } Log.i("qiniu", key + ",\r\n " + info + ",\r\n " + response); @@ -1022,7 +1124,7 @@ private String getBitmap(String fileName) { @Override public void run() { - com.yundian.celebrity.utils.ToastUtils.showShort("截帧已保存到路径：" + AppConfig.TRIM_STORAGE_DIR); + com.cloudTop.starshare.utils.ToastUtils.showShort("截帧已保存到路径：" + AppConfig.TRIM_STORAGE_DIR); } }); bitmap.recycle(); @@ -1088,18 +1190,22 @@ public void onUploadProgress(String fileName, double percent) { @Override public void onUploadVideoSuccess(String fileName) { // ToastUtils.s(VideoRecordActivity.this, "上传成功"); - ToastUtils.l(this, "文件上传成功，" + fileName + "已复制到粘贴板"); - mProcessingDialog.dismiss(); - mIsUpload = false; +// ToastUtils.l(this, "文件上传成功，" + fileName + "已复制到粘贴板"); + this.fileName=fileName; + successCount++; + mHandler.sendEmptyMessage(1); - Intent intent = new Intent(); - intent.putExtra(FRAMEPATH, bitmapPath); - intent.putExtra(FRAMENAME, imageName); - intent.putExtra(VIDEOPATH, filePath); - intent.putExtra(VIDEONAME, fileName); - - setResult(RESULT_OK, intent); - finish(); +// mProcessingDialog.dismiss(); +// mIsUpload = false; +// +// Intent intent = new Intent(); +// intent.putExtra(FRAMEPATH, bitmapPath); +// intent.putExtra(FRAMENAME, imageName); +// intent.putExtra(VIDEOPATH, filePath); +// intent.putExtra(VIDEONAME, fileName); +// LogUtils.logd("接收到返回的内容:本地缩略图:"+bitmapPath+"本地视频:"+filePath+"线上缩略图:"+imageName+"线上视频:"+fileName); +// setResult(RESULT_OK, intent); +// finish(); } @Override @@ -1108,4 +1214,23 @@ public void onUploadVideoFailed(int i, String s) { mProcessingDialog.dismiss(); mIsUpload = false; } + + public void setHideVirtualKey(Window window){ + //保持布局状态 + int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE| + //布局位于状态栏下方 + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION| + //全屏 + View.SYSTEM_UI_FLAG_FULLSCREEN| + //隐藏导航栏 + View.SYSTEM_UI_FLAG_HIDE_NAVIGATION| + View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; + if (Build.VERSION.SDK_INT>=19){ + uiOptions |= 0x00001000; + }else{ + uiOptions |= View.SYSTEM_UI_FLAG_LOW_PROFILE; + } + window.getDecorView().setSystemUiVisibility(uiOptions); + } + } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/AddMeetTypeAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/AddMeetTypeAdapter.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/AddMeetTypeAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/AddMeetTypeAdapter.java index 481d8b5..73f54ce 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/AddMeetTypeAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/AddMeetTypeAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; @@ -8,10 +8,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; import java.util.List; @@ -75,7 +75,7 @@ protected void convert(BaseViewHolder helper, OrderListReturnBean item) { LogUtils.loge("----------选中状态:" + item.isCheck()); checkBox.setChecked(item.isCheck()); ImageView icon = helper.getView(R.id.iv_meet_type); - ImageLoaderUtils.display(mContext, icon, item.getShowpic_url()); + ImageLoaderUtils.displayUrl(mContext, icon, item.getShowpic_url()); helper.setText(R.id.tv_meet_des, item.getName()). setText(R.id.tv_spend_time, String.format(mContext.getResources().getString(R.string.spend_times), item.getPrice() + "")) diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CashHistoryAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CashHistoryAdapter.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/CashHistoryAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CashHistoryAdapter.java index bfc8bfa..a2af5e1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CashHistoryAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CashHistoryAdapter.java @@ -1,13 +1,13 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.WithDrawCashHistoryBean; -import com.yundian.celebrity.utils.FormatUtil; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.WithDrawCashHistoryBean; +import com.cloudTop.starshare.utils.FormatUtil; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CircleFriendAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CircleFriendAdapter.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/CircleFriendAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CircleFriendAdapter.java index 684ff50..fca17df 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CircleFriendAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CircleFriendAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; @@ -10,23 +10,23 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.CommentConfig; -import com.yundian.celebrity.bean.ActionItem; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.ui.main.presenter.CirclePresenter; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.TimeUtil; -import com.yundian.celebrity.widget.CommentListView; -import com.yundian.celebrity.widget.PraiseListView; -import com.yundian.celebrity.widget.SnsPopupWindow; -import com.yundian.celebrity.widget.emoji.MoonUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.CommentConfig; +import com.cloudTop.starshare.bean.ActionItem; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.ui.main.presenter.CirclePresenter; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.TimeUtil; +import com.cloudTop.starshare.widget.CommentListView; +import com.cloudTop.starshare.widget.PraiseListView; +import com.cloudTop.starshare.widget.SnsPopupWindow; +import com.cloudTop.starshare.widget.emoji.MoonUtils; import java.util.List; -import static com.yundian.celebrity.R.id.commentList; +import static com.cloudTop.starshare.R.id.commentList; //package com.yundian.celebrity.ui.main.adapter; @@ -130,6 +130,7 @@ public void onItemClick(int commentPosition) { config.circlePosition = holder.getLayoutPosition(); config.commentPosition = commentPosition; config.Circle_id = circleItem.getCircle_id(); + config.user_name = circleItem.getComment_list().get(commentPosition).getUser_name(); config.commentType = CommentConfig.Type.REPLY; config.symbol_name = circleItem.getSymbol_name(); config.symbol_code = circleItem.getSymbol(); diff --git a/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CustomAudioAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CustomAudioAdapter.java new file mode 100644 index 0000000..3a7f5ac --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/CustomAudioAdapter.java @@ -0,0 +1,141 @@ +package com.cloudTop.starshare.ui.main.adapter; + +import android.graphics.drawable.AnimationDrawable; +import android.support.annotation.LayoutRes; +import android.support.annotation.Nullable; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; + +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.TimeUtil; + +import java.util.List; + +/** + * Created by sll on 2017/5/25. + */ + +public class CustomAudioAdapter extends BaseQuickAdapter { + OnAdapterCallBack onAdapterCallBack; + AnimationDrawable voiceBackground; + + public interface OnAdapterCallBack { + void onGoRecord(FansAskBean item, int positon); + + void onListenAnswer(FansAskBean item, int positon, ImageViewDelegate imageViewDelegate); + } + + + ImageViewDelegate imageViewDelegate; + + public interface ImageViewDelegate { + void onPlayAnimation(); + void onStopAnimation(); + void onCompletionAnimation(); + } + + + public CustomAudioAdapter(@LayoutRes int layoutResId, @Nullable List data, OnAdapterCallBack OnAdapterCallBack) { + super(layoutResId, data); + this.onAdapterCallBack = OnAdapterCallBack; +// this.mContext = context; + } + + @Override + protected void convert(final BaseViewHolder helper, final FansAskBean item) { + + final int layoutPosition = helper.getLayoutPosition(); + helper.setText(R.id.tv_ask_question, item.getUask()); + TextView tvHeardNum = helper.getView(R.id.tv_heard_num); + String heardNum = mContext.getResources().getString(R.string.heard_num, item.getS_total()); + + tvHeardNum.setText(heardNum); + helper.setText(R.id.tv_name, item.getNickName()); + + String askTime = TimeUtil.formatData(TimeUtil.dateFormatYMD, item.getAsk_t()); + helper.setText(R.id.tv_time, askTime); + + if (item.getC_type() == 0) { + helper.setText(R.id.tv_custom_time, "15s定制"); + } else if (item.getC_type() == 1) { + helper.setText(R.id.tv_custom_time, "30s定制"); + } else if (item.getC_type() == 2) { + helper.setText(R.id.tv_custom_time, "45s定制"); + } else if (item.getC_type() == 3) { + helper.setText(R.id.tv_custom_time, "60s定制"); + } +// +// +// +// + LinearLayout ll_go_record = helper.getView(R.id.ll_go_record); + LinearLayout ll_listen = helper.getView(R.id.ll_listen); + final ImageView ivPlay = (ImageView) ll_listen.findViewById(R.id.iv_play_record); + ll_go_record.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onAdapterCallBack.onGoRecord(item, layoutPosition); + } + }); + ll_listen.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + onAdapterCallBack.onListenAnswer(item, layoutPosition, new ImageViewDelegate() { + @Override + public void onPlayAnimation() { +// ImageView ivPlay = (ImageView)view.findViewById(R.id.iv_play_record); +// CustomAudioFragment.this.currentPlayIvPlay=ivPlay; + if(voiceBackground!=null){ + voiceBackground.stop(); + ivPlay.setBackground(mContext.getResources().getDrawable(R.drawable.voice_icon)); + } + + ivPlay.setBackground(mContext.getResources().getDrawable(R.drawable.animation_voice_paly)); + voiceBackground = (AnimationDrawable) ivPlay.getBackground(); + voiceBackground.start(); + } + + @Override + public void onStopAnimation() { + if(voiceBackground!=null){ + voiceBackground.stop(); + ivPlay.setBackground(mContext.getResources().getDrawable(R.drawable.voice_icon)); + } + } + + @Override + public void onCompletionAnimation() { + if (ivPlay != null) { + ivPlay.setBackground(mContext.getResources().getDrawable(R.drawable.voice_icon)); + } + } + }); + + } + }); + + ImageView headView = helper.getView(R.id.iv_head); + + if (item.getAnswer_t() == 0) { + ll_go_record.setVisibility(View.VISIBLE); + ll_listen.setVisibility(View.GONE); + } else { + ll_go_record.setVisibility(View.GONE); + ll_listen.setVisibility(View.VISIBLE); + + } + + + ImageLoaderUtils.displaySmallPhotoRound(mContext, headView, item.getHeadUrl()); +// helper.setText(R.id.tv_star_name, item.getNickname()); +// helper.setText(R.id.tv_talk_msg_count, item.get); + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/FansTalkAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/FansTalkAdapter.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/FansTalkAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/FansTalkAdapter.java index 2e3ccdd..ecda8c5 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/FansTalkAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/FansTalkAdapter.java @@ -1,16 +1,15 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; -import android.view.View; import android.widget.ImageView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.HaveStarUsersBean; -import com.yundian.celebrity.utils.ImageLoaderUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.HaveStarUsersBean; +import com.cloudTop.starshare.utils.ImageLoaderUtils; import java.util.List; @@ -50,7 +49,7 @@ protected void convert(BaseViewHolder helper, HaveStarUsersBean item) { ImageView headView = helper.getView(R.id.iv_star_head); - ImageLoaderUtils.display(mContext, headView, item.getHead_url()); + ImageLoaderUtils.displayUrl(mContext, headView, item.getHead_url()); helper.setText(R.id.tv_star_name, item.getNickname()); // helper.setText(R.id.tv_talk_msg_count, item.get); } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/InComeInfoAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/InComeInfoAdapter.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/InComeInfoAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/InComeInfoAdapter.java index 5721725..6ac1b58 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/InComeInfoAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/InComeInfoAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; @@ -6,8 +6,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.IncomeReturnBean; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.IncomeReturnBean; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/KeyBoardAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/KeyBoardAdapter.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/KeyBoardAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/KeyBoardAdapter.java index 16097e8..fd2695a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/KeyBoardAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/KeyBoardAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.content.Context; import android.graphics.Color; @@ -8,7 +8,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.ArrayList; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetTypeAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetTypeAdapter.java similarity index 78% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetTypeAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetTypeAdapter.java index 01ee1ce..adf6d76 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetTypeAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetTypeAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; @@ -6,13 +6,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.chad.library.adapter.base.loadmore.LoadMoreView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.utils.ImageLoaderUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.utils.ImageLoaderUtils; - -import java.util.ArrayList; import java.util.List; /** @@ -34,7 +31,7 @@ protected void convert(final BaseViewHolder holder, final OrderListReturnBean it holder.setText(R.id.tv_content, item.getName()) .setText(R.id.tv_price,item.getPrice() + "秒"); ImageView imageView = holder.getView(R.id.imagview); - ImageLoaderUtils.display(mContext, imageView, item.getShowpic_url()); + ImageLoaderUtils.displayUrl(mContext, imageView, item.getShowpic_url()); } // public void setNewData(@Nullable List data) { diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetingFansOrderAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetingFansOrderAdapter.java similarity index 82% rename from app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetingFansOrderAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetingFansOrderAdapter.java index 3c5bbc5..d1ae84f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/MeetingFansOrderAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/adapter/MeetingFansOrderAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.adapter; +package com.cloudTop.starshare.ui.main.adapter; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; @@ -7,10 +7,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.MeetOrderListBean; -import com.yundian.celebrity.utils.BuyHandleStatuUtils; -import com.yundian.celebrity.utils.ImageLoaderUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.MeetOrderListBean; +import com.cloudTop.starshare.utils.BuyHandleStatuUtils; +import com.cloudTop.starshare.utils.ImageLoaderUtils; import java.util.List; @@ -26,7 +26,7 @@ public MeetingFansOrderAdapter(@LayoutRes int layoutResId, @Nullable List data = inComeInfoAdapter.getData(); + data.clear(); inComeInfoAdapter.notifyDataSetChanged(); chartFragment.loadChartData(null); }else{ diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetManageFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetManageFragment.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetManageFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetManageFragment.java index c5c9789..9fe0929 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetManageFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetManageFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.fragment; +package com.cloudTop.starshare.ui.main.fragment; import android.os.Bundle; @@ -6,12 +6,11 @@ import android.support.v4.app.FragmentTransaction; import android.view.View; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseFragment; -import com.yundian.celebrity.ui.main.activity.PublishStateActivity; -import com.yundian.celebrity.ui.main.activity.TimeAddressActivity; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseFragment; +import com.cloudTop.starshare.ui.main.activity.TimeAddressActivity; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.widget.NormalTitleBar; import butterknife.OnClick; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansOrderFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansOrderFragment.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansOrderFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansOrderFragment.java index fa48098..63d5e06 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansOrderFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansOrderFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.fragment; +package com.cloudTop.starshare.ui.main.fragment; import android.content.Intent; import android.graphics.Color; @@ -10,17 +10,17 @@ import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.base.BaseFragment; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.MeetOrderListBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.activity.MeetingFansDetailActivity; -import com.yundian.celebrity.ui.main.adapter.MeetingFansOrderAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.base.BaseFragment; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.MeetOrderListBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.activity.MeetingFansDetailActivity; +import com.cloudTop.starshare.ui.main.adapter.MeetingFansOrderAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansTypeFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansTypeFragment.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansTypeFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansTypeFragment.java index 446a02e..d568740 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/MeetingFansTypeFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/MeetingFansTypeFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.fragment; +package com.cloudTop.starshare.ui.main.fragment; import android.graphics.Color; import android.support.v4.widget.SwipeRefreshLayout; @@ -7,17 +7,17 @@ import android.view.View; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.BaseFragment; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.OrderListReturnBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.activity.AddMeetTypeActivity; -import com.yundian.celebrity.ui.main.adapter.MeetTypeAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.widget.NormalTitleBar; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.BaseFragment; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.bean.OrderListReturnBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.activity.AddMeetTypeActivity; +import com.cloudTop.starshare.ui.main.adapter.MeetTypeAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.widget.NormalTitleBar; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/VideoAskFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/VideoAskFragment.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/main/fragment/VideoAskFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/fragment/VideoAskFragment.java index cf5cfb5..fe24d24 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/fragment/VideoAskFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/fragment/VideoAskFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.main.fragment; +package com.cloudTop.starshare.ui.main.fragment; import android.content.Intent; import android.graphics.Color; @@ -11,19 +11,19 @@ import android.view.ViewGroup; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; -import com.yundian.celebrity.base.BaseFragment; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.event.VideoMessageEvent; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.activity.PlayActivity; -import com.yundian.celebrity.ui.main.activity.RecordVideoActivity1; -import com.yundian.celebrity.ui.main.adapter.VideoAskAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; +import com.cloudTop.starshare.base.BaseFragment; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.event.VideoMessageEvent; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.activity.PlayActivity; +import com.cloudTop.starshare.ui.main.activity.RecordVideoActivity1; +import com.cloudTop.starshare.ui.main.adapter.VideoAskAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -45,6 +45,10 @@ public class VideoAskFragment extends BaseFragment implements SwipeRefreshLayout public static final String POSITION="position"; public static final String DURATION="duration"; public static final String FANS_ASK_BEAN="FansAskBean"; + public static final String VIDEO_TYPE="FansAsk"; + public static final int ANSWER_TYPE=1; + public static final int SELF_WATCH_TYPE=2; + public static final int ASK_TYPE=0; private VideoAskAdapter videoAskAdapter; private List dataList = new ArrayList<>(); @@ -102,7 +106,7 @@ public void onGoRecordVideo(FansAskBean item,int position) { intent.putExtra(DURATION,60); } - ToastUtils.showShort("dianjirecord"); +// ToastUtils.showShort("dianjirecord"); startActivity(intent); } @@ -112,6 +116,12 @@ public void onLookAnswerVideo(FansAskBean item) { //用户提问视频 if(item.getSanswer()!=null&& !TextUtils.isEmpty(item.getSanswer())){ Intent intent = new Intent(getActivity(),PlayActivity.class); + intent.putExtra(VIDEO_TYPE,ANSWER_TYPE); + Bundle bundle = new Bundle(); + bundle.putParcelable(FANS_ASK_BEAN,item); + + intent.putExtra(FANS_ASK_BUNDLE,bundle); + intent.putExtra("playUrl", AppConfig.QI_NIU_PIC_ADRESS+item.getSanswer()); startActivity(intent); }else{ @@ -123,6 +133,12 @@ public void onLookAnswerVideo(FansAskBean item) { public void onLookAskVideo(FansAskBean item) { if(item.getVideo_url()!=null&& !TextUtils.isEmpty(item.getVideo_url())){ Intent intent = new Intent(getActivity(),PlayActivity.class); + intent.putExtra(VIDEO_TYPE,ASK_TYPE); + + Bundle bundle = new Bundle(); + bundle.putParcelable(FANS_ASK_BEAN,item); + intent.putExtra(FANS_ASK_BUNDLE,bundle); + intent.putExtra("playUrl",AppConfig.QI_NIU_PIC_ADRESS+item.getVideo_url()); startActivity(intent); }else{ @@ -275,6 +291,8 @@ public void ReciveMessageEventBus(final VideoMessageEvent eventBusMessage) { if(listBeans!=null){ listBeans.get(eventBusMessage.getPosition()).setAnswer_t(-1); listBeans.get(eventBusMessage.getPosition()).setSanswer(eventBusMessage.getUrl()); + listBeans.get(eventBusMessage.getPosition()).setThumbnailS(eventBusMessage.getFrameUrl()); + LogUtils.logd("FrameUrl:"+eventBusMessage.getFrameUrl()); videoAskAdapter.notifyDataSetChanged(); } diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/model/CircleModel.java b/app/src/main/java/com/cloudTop/starshare/ui/main/model/CircleModel.java similarity index 85% rename from app/src/main/java/com/yundian/celebrity/ui/main/model/CircleModel.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/model/CircleModel.java index 611744b..d1f96c9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/model/CircleModel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/model/CircleModel.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.main.model; +package com.cloudTop.starshare.ui.main.model; -import com.yundian.celebrity.app.CommentConfig; -import com.yundian.celebrity.bean.ResultBeen; -import com.yundian.celebrity.listener.IDataRequestListener; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.app.CommentConfig; +import com.cloudTop.starshare.bean.ResultBeen; +import com.cloudTop.starshare.listener.IDataRequestListener; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; public class CircleModel { diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/model/LoginModel.java b/app/src/main/java/com/cloudTop/starshare/ui/main/model/LoginModel.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/ui/main/model/LoginModel.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/model/LoginModel.java index 993be99..7a7b9cb 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/model/LoginModel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/model/LoginModel.java @@ -1,38 +1,24 @@ -package com.yundian.celebrity.ui.main.model; +package com.cloudTop.starshare.ui.main.model; -import android.os.Looper; - import com.netease.nim.uikit.NimUIKit; import com.netease.nim.uikit.cache.DataCacheManager; -import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.AbortableFuture; import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.auth.LoginInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.CommentConfig; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.bean.LoginReturnInfo; -import com.yundian.celebrity.bean.RegisterReturnWangYiBeen; -import com.yundian.celebrity.bean.ResultBeen; -import com.yundian.celebrity.listener.IDataRequestListener; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.networkapi.UserAPI; -import com.yundian.celebrity.networkapi.socketapi.SocketUserAPI; -import com.yundian.celebrity.ui.main.activity.LoginActivity; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; - -import org.greenrobot.eventbus.EventBus; - -import static com.yundian.celebrity.R.id.passwordEditText; -import static com.yundian.celebrity.R.id.userNameEditText; -import static com.yundian.celebrity.app.SocketAPIConstant.OperateCode.saveDevice; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.LoginReturnInfo; +import com.cloudTop.starshare.bean.RegisterReturnWangYiBeen; +import com.cloudTop.starshare.listener.IDataRequestListener; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.UserAPI; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; public class LoginModel { diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/model/TestModel.java b/app/src/main/java/com/cloudTop/starshare/ui/main/model/TestModel.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/main/model/TestModel.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/model/TestModel.java index 4d60fac..189b43b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/model/TestModel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/model/TestModel.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.main.model; +package com.cloudTop.starshare.ui.main.model; import android.os.Parcel; import android.os.Parcelable; -import com.yundian.celebrity.ui.main.contract.TestContract; +import com.cloudTop.starshare.ui.main.contract.TestContract; /** * Created by Null on 2017/5/6. diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/CirclePresenter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/CirclePresenter.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/main/presenter/CirclePresenter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/presenter/CirclePresenter.java index 24e5746..fa25f89 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/CirclePresenter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/CirclePresenter.java @@ -1,14 +1,14 @@ -package com.yundian.celebrity.ui.main.presenter; +package com.cloudTop.starshare.ui.main.presenter; import android.view.View; -import com.yundian.celebrity.app.CommentConfig; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.listener.IDataRequestListener; -import com.yundian.celebrity.ui.main.contract.CircleContract; -import com.yundian.celebrity.ui.main.model.CircleModel; -import com.yundian.celebrity.utils.DatasUtil; +import com.cloudTop.starshare.app.CommentConfig; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.listener.IDataRequestListener; +import com.cloudTop.starshare.ui.main.contract.CircleContract; +import com.cloudTop.starshare.ui.main.model.CircleModel; +import com.cloudTop.starshare.utils.DatasUtil; import java.util.List; @@ -120,9 +120,9 @@ public void addComment(final String content, final CommentConfig config) { public void loadSuccess(Object object) { CircleFriendBean.CircleListBean.CommentListBean newItem = null; if (config.commentType == CommentConfig.Type.PUBLIC) { - newItem = DatasUtil.createPublicComment(content,config.symbol_name); + newItem = DatasUtil.createPublicComment(content,config.symbol_name,config.user_name,config.uid); } else if (config.commentType == CommentConfig.Type.REPLY) { - newItem = DatasUtil.createReplyComment(content,config.symbol_name); + newItem = DatasUtil.createReplyComment(content,config.symbol_name,config.user_name,config.uid); } if(view!=null){ view.update2AddComment(config.circlePosition, newItem); diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/LoginPresenter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/LoginPresenter.java similarity index 72% rename from app/src/main/java/com/yundian/celebrity/ui/main/presenter/LoginPresenter.java rename to app/src/main/java/com/cloudTop/starshare/ui/main/presenter/LoginPresenter.java index f06a9db..71c80b6 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/LoginPresenter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/LoginPresenter.java @@ -1,19 +1,12 @@ -package com.yundian.celebrity.ui.main.presenter; +package com.cloudTop.starshare.ui.main.presenter; -import com.netease.nimlib.sdk.NIMClient; -import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.helper.CheckInfoHelper; -import com.yundian.celebrity.listener.IDataRequestListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.networkapi.UserAPI; -import com.yundian.celebrity.ui.main.contract.LoginContract; -import com.yundian.celebrity.ui.main.model.LoginModel; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.widget.CheckException; - -import org.greenrobot.eventbus.EventBus; +import com.cloudTop.starshare.helper.CheckInfoHelper; +import com.cloudTop.starshare.listener.IDataRequestListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.networkapi.UserAPI; +import com.cloudTop.starshare.ui.main.contract.LoginContract; +import com.cloudTop.starshare.ui.main.model.LoginModel; +import com.cloudTop.starshare.widget.CheckException; public class LoginPresenter implements LoginContract.Presenter { diff --git a/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/TestPresenter.java b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/TestPresenter.java new file mode 100644 index 0000000..beb6ea7 --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/ui/main/presenter/TestPresenter.java @@ -0,0 +1,10 @@ +package com.cloudTop.starshare.ui.main.presenter; + +import com.cloudTop.starshare.ui.main.contract.TestContract; + +/** + * Created by Null on 2017/5/6. + */ + +public class TestPresenter extends TestContract.Presenter { +} diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/BaseDialog.java b/app/src/main/java/com/cloudTop/starshare/ui/view/BaseDialog.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/view/BaseDialog.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/BaseDialog.java index 0ae8b82..21253a1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/BaseDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/BaseDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.app.Dialog; import android.content.Context; @@ -8,7 +8,7 @@ import android.view.Window; import android.view.WindowManager; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public class BaseDialog extends Dialog { diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/CustomerRadioGroup.java b/app/src/main/java/com/cloudTop/starshare/ui/view/CustomerRadioGroup.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/view/CustomerRadioGroup.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/CustomerRadioGroup.java index e0ab946..6118c6b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/CustomerRadioGroup.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/CustomerRadioGroup.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/ForceUpdateDialog.java b/app/src/main/java/com/cloudTop/starshare/ui/view/ForceUpdateDialog.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/view/ForceUpdateDialog.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/ForceUpdateDialog.java index ff01aa5..cdb0b23 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/ForceUpdateDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/ForceUpdateDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.Manifest; diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/MyPopupMenu.java b/app/src/main/java/com/cloudTop/starshare/ui/view/MyPopupMenu.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/view/MyPopupMenu.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/MyPopupMenu.java index 669dd2a..080b0cd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/MyPopupMenu.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/MyPopupMenu.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.graphics.drawable.ColorDrawable; @@ -11,11 +11,11 @@ import android.widget.ScrollView; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.MyPopupMenuEntity; -import com.yundian.celebrity.listener.OnChildViewClickListener; -import com.yundian.celebrity.utils.DisplayUtil; -import com.yundian.celebrity.utils.Utils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.MyPopupMenuEntity; +import com.cloudTop.starshare.listener.OnChildViewClickListener; +import com.cloudTop.starshare.utils.DisplayUtil; +import com.cloudTop.starshare.utils.Utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/MyProgressView.java b/app/src/main/java/com/cloudTop/starshare/ui/view/MyProgressView.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/view/MyProgressView.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/MyProgressView.java index 87d1554..f3f25c4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/MyProgressView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/MyProgressView.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.graphics.Canvas; import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public class MyProgressView extends AppCompatImageView { diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/MySeekBar.java b/app/src/main/java/com/cloudTop/starshare/ui/view/MySeekBar.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/view/MySeekBar.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/MySeekBar.java index f311106..f2ee708 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/MySeekBar.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/MySeekBar.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/PayDialog.java b/app/src/main/java/com/cloudTop/starshare/ui/view/PayDialog.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/view/PayDialog.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/PayDialog.java index 0a535a4..dba22cd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/PayDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/PayDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.os.Bundle; @@ -10,9 +10,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.OrderReturnBeen; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.OrderReturnBeen; +import com.cloudTop.starshare.utils.LogUtils; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/PayPwdEditText.java b/app/src/main/java/com/cloudTop/starshare/ui/view/PayPwdEditText.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/view/PayPwdEditText.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/PayPwdEditText.java index bd4d500..81d6104 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/PayPwdEditText.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/PayPwdEditText.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.text.Editable; diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/RoundImageView.java b/app/src/main/java/com/cloudTop/starshare/ui/view/RoundImageView.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/view/RoundImageView.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/RoundImageView.java index eb05806..57d17e5 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/RoundImageView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/RoundImageView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.content.Context; import android.content.res.TypedArray; @@ -14,8 +14,8 @@ import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; -import com.yundian.celebrity.R; -import com.yundian.celebrity.listener.OnImageViewTouchListener; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.listener.OnImageViewTouchListener; public class RoundImageView extends AppCompatImageView { diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/ShareControler.java b/app/src/main/java/com/cloudTop/starshare/ui/view/ShareControler.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/view/ShareControler.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/ShareControler.java index 55cb37c..9b72834 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/ShareControler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/ShareControler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.app.Activity; import android.graphics.Bitmap; @@ -18,9 +18,9 @@ import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.media.UMImage; import com.umeng.socialize.media.UMWeb; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ThirdPartLoginControler; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ThirdPartLoginControler; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/ShareControlerView.java b/app/src/main/java/com/cloudTop/starshare/ui/view/ShareControlerView.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/view/ShareControlerView.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/ShareControlerView.java index 29295f0..5585c39 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/ShareControlerView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/ShareControlerView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.app.Activity; import android.content.Context; @@ -15,9 +15,9 @@ import com.umeng.socialize.bean.SHARE_MEDIA; import com.umeng.socialize.media.UMImage; import com.umeng.socialize.media.UMWeb; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ThirdPartLoginControler; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ThirdPartLoginControler; /** * Created by sll on 2017/6/13. diff --git a/app/src/main/java/com/yundian/celebrity/ui/view/ValidationWatcher.java b/app/src/main/java/com/cloudTop/starshare/ui/view/ValidationWatcher.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/ui/view/ValidationWatcher.java rename to app/src/main/java/com/cloudTop/starshare/ui/view/ValidationWatcher.java index 59a5f42..7b242a6 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/view/ValidationWatcher.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/view/ValidationWatcher.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.view; +package com.cloudTop.starshare.ui.view; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/DemoCache.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/DemoCache.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/DemoCache.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/DemoCache.java index fe2a6a6..2cb47bd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/DemoCache.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/DemoCache.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi; +package com.cloudTop.starshare.ui.wangyi; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/PrivatizationConfig.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/PrivatizationConfig.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/PrivatizationConfig.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/PrivatizationConfig.java index bb9411a..c177957 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/PrivatizationConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/PrivatizationConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi; +package com.cloudTop.starshare.ui.wangyi; import com.netease.nimlib.sdk.ServerAddresses; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/about/CustomActions.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/about/CustomActions.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/about/CustomActions.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/about/CustomActions.java index 6e1b4ec..5feebb7 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/about/CustomActions.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/about/CustomActions.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.about; +package com.cloudTop.starshare.ui.wangyi.about; import android.widget.Button; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatAudio.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatAudio.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatAudio.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatAudio.java index e91b5cc..b5c1294 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatAudio.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatAudio.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.content.Context; import android.graphics.drawable.Drawable; @@ -11,12 +11,12 @@ import com.netease.nim.uikit.cache.NimUserInfoCache; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.avchat.constant.CallStateEnum; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleListener; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleState; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.avchat.constant.CallStateEnum; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleListener; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleState; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleView; /** * 音频管理器， 音频界面初始化和管理 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatFileVideoRender.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatFileVideoRender.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatFileVideoRender.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatFileVideoRender.java index bda291c..6f48b65 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatFileVideoRender.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatFileVideoRender.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.os.Environment; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatNotification.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatNotification.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatNotification.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatNotification.java index 8744616..bb4c4ac 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatNotification.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatNotification.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.app.Notification; import android.app.NotificationManager; @@ -8,11 +8,11 @@ import android.support.v4.app.NotificationCompat; import com.netease.nim.uikit.cache.NimUserInfoCache; -import com.yundian.celebrity.ui.main.activity.MainActivity; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.avchat.activity.AVChatActivity; -import com.yundian.celebrity.ui.wangyi.main.model.Extras; -import com.yundian.celebrity.ui.wangyi.session.activity.P2PMessageActivity; +import com.cloudTop.starshare.ui.main.activity.MainActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.avchat.activity.AVChatActivity; +import com.cloudTop.starshare.ui.wangyi.main.model.Extras; +import com.cloudTop.starshare.ui.wangyi.session.activity.P2PMessageActivity; /** * 音视频聊天通知栏 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatProfile.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatProfile.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatProfile.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatProfile.java index 6354024..b2e09d3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatProfile.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatProfile.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; /** * Created by huangjun on 2015/5/12. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSoundPlayer.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSoundPlayer.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSoundPlayer.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSoundPlayer.java index 395fe4f..4652eea 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSoundPlayer.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSoundPlayer.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.content.BroadcastReceiver; import android.content.Context; @@ -8,8 +8,8 @@ import android.media.SoundPool; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSurface.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSurface.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSurface.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSurface.java index f954d61..aa83187 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatSurface.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatSurface.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.content.Context; import android.graphics.Rect; @@ -14,8 +14,8 @@ import android.widget.TextView; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.avchat.constant.CallStateEnum; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.avchat.constant.CallStateEnum; /** * 视频绘制管理 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUI.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUI.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUI.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUI.java index b1cfe52..464d4ca 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUI.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUI.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.Manifest; import android.content.Context; @@ -10,11 +10,11 @@ import android.view.View; import android.widget.Toast; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.avchat.activity.AVChatExitCode; -import com.yundian.celebrity.ui.wangyi.avchat.constant.CallStateEnum; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.MultiSelectDialog; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.avchat.activity.AVChatExitCode; +import com.cloudTop.starshare.ui.wangyi.avchat.constant.CallStateEnum; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.MultiSelectDialog; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUIListener.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUIListener.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUIListener.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUIListener.java index da776f6..8cfb00f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatUIListener.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatUIListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; /** * 音视频界面操作 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatVideo.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatVideo.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatVideo.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatVideo.java index b669b27..49d26a3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/AVChatVideo.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/AVChatVideo.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat; +package com.cloudTop.starshare.ui.wangyi.avchat; import android.content.Context; import android.graphics.Rect; @@ -10,11 +10,11 @@ import com.netease.nim.uikit.cache.NimUserInfoCache; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.avchat.constant.CallStateEnum; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleListener; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleState; -import com.yundian.celebrity.ui.wangyi.avchat.widgets.ToggleView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.avchat.constant.CallStateEnum; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleListener; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleState; +import com.cloudTop.starshare.ui.wangyi.avchat.widgets.ToggleView; /** * 视频管理器， 视频界面初始化和相关管理 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatActivity.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatActivity.java index 12e7fcb..1c007de 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.activity; +package com.cloudTop.starshare.ui.wangyi.avchat.activity; import android.content.Context; import android.content.Intent; @@ -15,13 +15,13 @@ import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.StatusCode; import com.netease.nimlib.sdk.auth.AuthServiceObserver; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.avchat.AVChatNotification; -import com.yundian.celebrity.ui.wangyi.avchat.AVChatProfile; -import com.yundian.celebrity.ui.wangyi.avchat.AVChatSoundPlayer; -import com.yundian.celebrity.ui.wangyi.avchat.AVChatUI; -import com.yundian.celebrity.ui.wangyi.avchat.constant.CallStateEnum; -import com.yundian.celebrity.ui.wangyi.avchat.receiver.PhoneCallStateObserver; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.avchat.AVChatNotification; +import com.cloudTop.starshare.ui.wangyi.avchat.AVChatProfile; +import com.cloudTop.starshare.ui.wangyi.avchat.AVChatSoundPlayer; +import com.cloudTop.starshare.ui.wangyi.avchat.AVChatUI; +import com.cloudTop.starshare.ui.wangyi.avchat.constant.CallStateEnum; +import com.cloudTop.starshare.ui.wangyi.avchat.receiver.PhoneCallStateObserver; /** * 音视频界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatExitCode.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatExitCode.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatExitCode.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatExitCode.java index 666ecf8..e3abcdf 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatExitCode.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatExitCode.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.activity; +package com.cloudTop.starshare.ui.wangyi.avchat.activity; /** * Created by hzxuwen on 2015/4/24. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsActivity.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsActivity.java index 3422f34..eaafeab 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsActivity.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.avchat.activity; +package com.cloudTop.starshare.ui.wangyi.avchat.activity; import android.os.Bundle; import com.netease.nim.uikit.common.activity.UI; import com.netease.nim.uikit.model.ToolBarOptions; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Created by liuqijun on 7/19/16. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsFragment.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsFragment.java index a759373..5af6583 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/activity/AVChatSettingsFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/activity/AVChatSettingsFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.activity; +package com.cloudTop.starshare.ui.wangyi.avchat.activity; import android.annotation.TargetApi; import android.os.Build; @@ -8,7 +8,7 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceManager; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/constant/CallStateEnum.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/constant/CallStateEnum.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/constant/CallStateEnum.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/constant/CallStateEnum.java index 6ac15c5..54c238a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/constant/CallStateEnum.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/constant/CallStateEnum.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.constant; +package com.cloudTop.starshare.ui.wangyi.avchat.constant; /** * 呼叫状态,用来控制刷新界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/IncomingCallReceiver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/IncomingCallReceiver.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/IncomingCallReceiver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/IncomingCallReceiver.java index 0a3fa86..cf503f7 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/IncomingCallReceiver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/IncomingCallReceiver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.receiver; +package com.cloudTop.starshare.ui.wangyi.avchat.receiver; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java index a2f7965..de8f6f2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/receiver/PhoneCallStateObserver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.receiver; +package com.cloudTop.starshare.ui.wangyi.avchat.receiver; import android.telephony.TelephonyManager; import android.util.Log; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialog.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialog.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialog.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialog.java index ad4de4c..f23e437 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.widgets; +package com.cloudTop.starshare.ui.wangyi.avchat.widgets; import android.app.Dialog; import android.content.Context; @@ -19,7 +19,7 @@ import com.netease.nim.uikit.common.adapter.TAdapterDelegate; import com.netease.nim.uikit.common.adapter.TViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.HashMap; import java.util.Iterator; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java index 96a661f..ee8ae63 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/MultiSelectDialogViewHolder.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.wangyi.avchat.widgets; +package com.cloudTop.starshare.ui.wangyi.avchat.widgets; import android.util.Pair; import android.widget.ImageView; import android.widget.TextView; import com.netease.nim.uikit.common.adapter.TViewHolder; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public class MultiSelectDialogViewHolder extends TViewHolder { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleListener.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleListener.java similarity index 77% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleListener.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleListener.java index 66f2290..ed78103 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleListener.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.widgets; +package com.cloudTop.starshare.ui.wangyi.avchat.widgets; import android.view.View; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleState.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleState.java similarity index 70% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleState.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleState.java index 2ef2655..b42aad0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleState.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleState.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.widgets; +package com.cloudTop.starshare.ui.wangyi.avchat.widgets; /** * Created by hzlichengda on 14-3-31. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleView.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleView.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleView.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleView.java index 34a5ac8..e3d8d3f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/avchat/widgets/ToggleView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/avchat/widgets/ToggleView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.avchat.widgets; +package com.cloudTop.starshare.ui.wangyi.avchat.widgets; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/activity/ChatRoomActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/activity/ChatRoomActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/activity/ChatRoomActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/activity/ChatRoomActivity.java index 3b19bbf..b94241c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/activity/ChatRoomActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/activity/ChatRoomActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.activity; +package com.cloudTop.starshare.ui.wangyi.chatroom.activity; import android.content.Context; import android.content.DialogInterface; @@ -23,10 +23,10 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomStatusChangeData; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomData; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.ChatRoomFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.ChatRoomMessageFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomMemberCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.ChatRoomFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.ChatRoomMessageFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomMemberCache; /** * 聊天室 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java index 36deaef..1b20e83 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomMsgAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.adapter; +package com.cloudTop.starshare.ui.wangyi.chatroom.adapter; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -8,8 +8,8 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.ui.wangyi.chatroom.viewholder.ChatRoomMsgViewHolderBase; -import com.yundian.celebrity.ui.wangyi.chatroom.viewholder.ChatRoomMsgViewHolderFactory; +import com.cloudTop.starshare.ui.wangyi.chatroom.viewholder.ChatRoomMsgViewHolderBase; +import com.cloudTop.starshare.ui.wangyi.chatroom.viewholder.ChatRoomMsgViewHolderFactory; import java.util.HashMap; import java.util.HashSet; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java index 59d9b50..93edc76 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomOnlinePeopleAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.adapter; +package com.cloudTop.starshare.ui.wangyi.chatroom.adapter; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; @@ -9,8 +9,8 @@ import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.widget.ChatRoomImageView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.widget.ChatRoomImageView; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java index fa34fb3..a23246d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomTabPagerAdapter.java @@ -1,13 +1,13 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.adapter; +package com.cloudTop.starshare.ui.wangyi.chatroom.adapter; import android.content.Context; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.view.ViewPager; -import com.yundian.celebrity.ui.wangyi.chatroom.constant.ChatRoomTab; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.SlidingTabPagerAdapter; +import com.cloudTop.starshare.ui.wangyi.chatroom.constant.ChatRoomTab; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.SlidingTabPagerAdapter; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java index 1cca1bd..48eddb6 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/adapter/ChatRoomsAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.adapter; +package com.cloudTop.starshare.ui.wangyi.chatroom.adapter; import android.support.v7.widget.RecyclerView; import android.widget.TextView; @@ -7,8 +7,8 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter; import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomHelper; /** * Created by huangjun on 2016/12/9. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/constant/ChatRoomTab.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/constant/ChatRoomTab.java similarity index 72% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/constant/ChatRoomTab.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/constant/ChatRoomTab.java index 14b104e..17167dd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/constant/ChatRoomTab.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/constant/ChatRoomTab.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.constant; +package com.cloudTop.starshare.ui.wangyi.chatroom.constant; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.MasterTabFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.MessageTabFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.OnlinePeopleTabFragment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.MasterTabFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.MessageTabFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.OnlinePeopleTabFragment; /** * Created by hzxuwen on 2015/12/14. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomFragment.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomFragment.java index 612c198..9d1edbf 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.os.Bundle; import android.support.v4.view.ViewPager; @@ -14,14 +14,14 @@ import com.netease.nim.uikit.common.ui.imageview.ImageViewEx; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.chatroom.ChatRoomService; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.activity.ChatRoomActivity; -import com.yundian.celebrity.ui.wangyi.chatroom.adapter.ChatRoomTabPagerAdapter; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomHelper; -import com.yundian.celebrity.ui.wangyi.common.infra.Handlers; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.FadeInOutPageTransformer; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.PagerSlidingTabStrip; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.activity.ChatRoomActivity; +import com.cloudTop.starshare.ui.wangyi.chatroom.adapter.ChatRoomTabPagerAdapter; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab.ChatRoomTabFragment; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomHelper; +import com.cloudTop.starshare.ui.wangyi.common.infra.Handlers; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.FadeInOutPageTransformer; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.PagerSlidingTabStrip; /** * 聊天室顶层fragment diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java index 382a919..db3e730 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomInputPanel.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.view.View; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java index af6560a..6dfee3a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomMessageFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -20,11 +20,11 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomMemberCache; -import com.yundian.celebrity.ui.wangyi.chatroom.module.ChatRoomMsgListPanel; -import com.yundian.celebrity.ui.wangyi.session.action.GuessAction; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomMemberCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.module.ChatRoomMsgListPanel; +import com.cloudTop.starshare.ui.wangyi.session.action.GuessAction; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java index eec1ff2..b0deb9d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/ChatRoomsFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.app.Activity; import android.os.Bundle; @@ -16,10 +16,10 @@ import com.netease.nim.uikit.common.ui.recyclerview.listener.OnItemClickListener; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.activity.ChatRoomActivity; -import com.yundian.celebrity.ui.wangyi.chatroom.adapter.ChatRoomsAdapter; -import com.yundian.celebrity.ui.wangyi.chatroom.thridparty.ChatRoomHttpClient; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.activity.ChatRoomActivity; +import com.cloudTop.starshare.ui.wangyi.chatroom.adapter.ChatRoomsAdapter; +import com.cloudTop.starshare.ui.wangyi.chatroom.thridparty.ChatRoomHttpClient; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/MasterFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/MasterFragment.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/MasterFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/MasterFragment.java index 2530054..4f813ed 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/MasterFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/MasterFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.os.Bundle; import android.text.TextUtils; @@ -16,10 +16,10 @@ import com.netease.nimlib.sdk.chatroom.ChatRoomService; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.activity.ChatRoomActivity; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomMemberCache; -import com.yundian.celebrity.ui.wangyi.chatroom.widget.ChatRoomImageView; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.activity.ChatRoomActivity; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomMemberCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.widget.ChatRoomImageView; /** * 聊天室主播fragment diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java index 843a182..ef364ee 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/OnlinePeopleFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment; import android.app.Activity; import android.content.DialogInterface; @@ -28,11 +28,11 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.MemberOption; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.chatroom.activity.ChatRoomActivity; -import com.yundian.celebrity.ui.wangyi.chatroom.adapter.ChatRoomOnlinePeopleAdapter; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomMemberCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.activity.ChatRoomActivity; +import com.cloudTop.starshare.ui.wangyi.chatroom.adapter.ChatRoomOnlinePeopleAdapter; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomMemberCache; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java index 64ba0e3..8d23375 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/ChatRoomTabFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab; import android.os.Bundle; import android.view.LayoutInflater; @@ -6,8 +6,8 @@ import android.view.ViewGroup; import com.netease.nim.uikit.common.fragment.TabFragment; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.constant.ChatRoomTab; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.constant.ChatRoomTab; /** * Created by hzxuwen on 2015/12/14. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java similarity index 74% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java index d53c6e0..117c76d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MasterTabFragment.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.MasterFragment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.MasterFragment; /** * 主播基类fragment diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java index 7238c92..1298f67 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/MessageTabFragment.java @@ -1,13 +1,13 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.constant.ChatRoomTab; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.ChatRoomMessageFragment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.constant.ChatRoomTab; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.ChatRoomMessageFragment; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java similarity index 76% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java index 41b69bd..9d4df91 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/fragment/tab/OnlinePeopleTabFragment.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.fragment.tab; +package com.cloudTop.starshare.ui.wangyi.chatroom.fragment.tab; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.OnlinePeopleFragment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.OnlinePeopleFragment; /** * 在线成员基类fragment diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomHelper.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomHelper.java index c69e20e..bb448be 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomHelper.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.helper; +package com.cloudTop.starshare.ui.wangyi.chatroom.helper; import com.netease.nim.uikit.common.ui.imageview.ImageViewEx; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java index 5bb7a27..7aa9f22 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomMemberCache.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.helper; +package com.cloudTop.starshare.ui.wangyi.chatroom.helper; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java index 7142fee..e9d9432 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ChatRoomNotificationHelper.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.helper; +package com.cloudTop.starshare.ui.wangyi.chatroom.helper; import android.text.TextUtils; import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ExtensionHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ExtensionHelper.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ExtensionHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ExtensionHelper.java index 862bed9..73ae72d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/helper/ExtensionHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/helper/ExtensionHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.helper; +package com.cloudTop.starshare.ui.wangyi.chatroom.helper; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java index 85f8a42..cd6287b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/module/ChatRoomMsgListPanel.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.module; +package com.cloudTop.starshare.ui.wangyi.chatroom.module; import android.os.Build; import android.os.Handler; @@ -28,8 +28,8 @@ import com.netease.nimlib.sdk.msg.model.AttachmentProgress; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.chatroom.adapter.ChatRoomMsgAdapter; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.adapter.ChatRoomMsgAdapter; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java index ba215e0..438b83f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/thridparty/ChatRoomHttpClient.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.thridparty; +package com.cloudTop.starshare.ui.wangyi.chatroom.thridparty; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -9,9 +9,9 @@ import com.netease.nim.uikit.common.http.NimHttpClient; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ExtensionHelper; -import com.yundian.celebrity.ui.wangyi.config.DemoServers; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ExtensionHelper; +import com.cloudTop.starshare.ui.wangyi.config.DemoServers; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java index c97d313..19d665a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBase.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import android.content.Context; import android.text.TextUtils; @@ -25,7 +25,7 @@ import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.yundian.celebrity.ui.wangyi.chatroom.adapter.ChatRoomMsgAdapter; +import com.cloudTop.starshare.ui.wangyi.chatroom.adapter.ChatRoomMsgAdapter; /** * 会话窗口消息列表项的ViewHolder基类，负责每个消息项的外层框架，包括头像，昵称，发送/接收进度条，重发按钮等。
diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java index 61601cf..5d50c7b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderBaseText.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import android.graphics.Color; import android.text.method.LinkMovementMethod; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java index 25b1bd0..dd12bdf 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderFactory.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java index 69da10e..ae995ce 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderGuess.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; /** * Created by hzxuwen on 2016/1/20. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java index e125395..d99a8be 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderNotification.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import android.widget.TextView; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.chatroom.model.ChatRoomNotificationAttachment; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomNotificationHelper; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomNotificationHelper; public class ChatRoomMsgViewHolderNotification extends ChatRoomMsgViewHolderBase { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java index 1c6e0e7..ed30d85 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderText.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import android.graphics.Color; import android.text.method.LinkMovementMethod; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java index 2ef51da..19d6d09 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomMsgViewHolderUnknown.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java index be1acf1..3a1210c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/viewholder/ChatRoomViewHolderHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.viewholder; +package com.cloudTop.starshare.ui.wangyi.chatroom.viewholder; import android.content.Context; import android.view.View; @@ -9,7 +9,7 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/widget/ChatRoomImageView.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/widget/ChatRoomImageView.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/widget/ChatRoomImageView.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/widget/ChatRoomImageView.java index 3653ce0..21a9f17 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/chatroom/widget/ChatRoomImageView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/chatroom/widget/ChatRoomImageView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.chatroom.widget; +package com.cloudTop.starshare.ui.wangyi.chatroom.widget; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/imageView/GroupHeadImageView.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/imageView/GroupHeadImageView.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/imageView/GroupHeadImageView.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/imageView/GroupHeadImageView.java index 477e6b7..26624c2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/imageView/GroupHeadImageView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/imageView/GroupHeadImageView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.imageView; +package com.cloudTop.starshare.ui.wangyi.common.imageView; import android.content.Context; import android.graphics.Bitmap; @@ -13,7 +13,7 @@ import android.widget.ImageView; import com.netease.nim.uikit.common.util.media.BitmapDecoder; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/AbstractTaskWorker.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/AbstractTaskWorker.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/AbstractTaskWorker.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/AbstractTaskWorker.java index 5fb729e..bca5adf 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/AbstractTaskWorker.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/AbstractTaskWorker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.concurrent.Executor; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CallbackWrapper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CallbackWrapper.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CallbackWrapper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CallbackWrapper.java index 06faf8f..0332a41 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CallbackWrapper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CallbackWrapper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class CallbackWrapper implements TaskObserver { protected T callback; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CompoundTaskWorker.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CompoundTaskWorker.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CompoundTaskWorker.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CompoundTaskWorker.java index 338392f..46d2752 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/CompoundTaskWorker.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/CompoundTaskWorker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.concurrent.Executor; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTask.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTask.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTask.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTask.java index 17db79d..b357546 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTask.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTask.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public abstract class DefaultTask extends ManagedTask { private DefaultTaskCallback callback; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskCallback.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskCallback.java similarity index 66% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskCallback.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskCallback.java index 1769732..9c1abb9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskCallback.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskCallback.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public interface DefaultTaskCallback { public void onFinish(String key, int result, Object attachment); diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskManager.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskManager.java index 51242fa..e646000 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class DefaultTaskManager extends TaskManager { public DefaultTaskManager() { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskRegistry.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskRegistry.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskRegistry.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskRegistry.java index 95919c3..f7123ba 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskRegistry.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskRegistry.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskScheduler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskScheduler.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskScheduler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskScheduler.java index c0cdbbb..575e7a4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskScheduler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskScheduler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.os.Handler; import android.os.Looper; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskWorker.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskWorker.java similarity index 85% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskWorker.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskWorker.java index 50939b4..5495d9a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/DefaultTaskWorker.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/DefaultTaskWorker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class DefaultTaskWorker extends TaskWorker { public DefaultTaskWorker() { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Handlers.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Handlers.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Handlers.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Handlers.java index f3f8eeb..91b8398 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Handlers.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Handlers.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ManagedTask.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ManagedTask.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ManagedTask.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ManagedTask.java index 18219a3..5536cd2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ManagedTask.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ManagedTask.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Observable.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Observable.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Observable.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Observable.java index 20d2774..d34c045 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Observable.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Observable.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ObservableTask.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ObservableTask.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ObservableTask.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ObservableTask.java index 7b993cd..5784f9a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/ObservableTask.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/ObservableTask.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public abstract class ObservableTask extends Task { private TaskObservable observable = new TaskObservable(); diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Params.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Params.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Params.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Params.java index 93f2e06..b124363 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Params.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Params.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public final class Params { public static final int[] getDimension(Object[] params, int index, int[] def) { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Task.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Task.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Task.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Task.java index cdbfd6c..2cc617a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/Task.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/Task.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.os.Handler; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskExecutor.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskExecutor.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskExecutor.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskExecutor.java index 638f05d..02abac9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskExecutor.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskExecutor.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.annotation.TargetApi; import android.os.Build; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskFrequencyController.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskFrequencyController.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskFrequencyController.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskFrequencyController.java index d30414c..e722248 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskFrequencyController.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskFrequencyController.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.Date; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManager.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManager.java index cb6b9b1..d00801a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class TaskManager { /** task scheduler */ diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManagerRegistry.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManagerRegistry.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManagerRegistry.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManagerRegistry.java index e09c186..5e23aa4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskManagerRegistry.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskManagerRegistry.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObservable.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObservable.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObservable.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObservable.java index b97a25d..ba5496d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObservable.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObservable.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class TaskObservable extends Observable implements TaskObserver { @Override diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObserver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObserver.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObserver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObserver.java index 73e5f41..a1965e2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskObserver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskObserver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public interface TaskObserver { /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskRegistry.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskRegistry.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskRegistry.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskRegistry.java index 3f5be1a..efa500f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskRegistry.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskRegistry.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.Collection; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskScheduler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskScheduler.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskScheduler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskScheduler.java index f01c0c1..58c8190 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskScheduler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskScheduler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public interface TaskScheduler { /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskWorker.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskWorker.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskWorker.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskWorker.java index 382d188..920ba46 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TaskWorker.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TaskWorker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.concurrent.Executor; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskRegistry.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskRegistry.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskRegistry.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskRegistry.java index a50ecb1..de07838 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskRegistry.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskRegistry.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class TraceTaskRegistry extends WrapTaskRegistry { public TraceTaskRegistry(TaskRegistry wrap) { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskScheduler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskScheduler.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskScheduler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskScheduler.java index 62d0295..fdc08de 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/TraceTaskScheduler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/TraceTaskScheduler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class TraceTaskScheduler extends WrapTaskScheduler { public TraceTaskScheduler(TaskScheduler wrap) { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskRegistry.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskRegistry.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskRegistry.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskRegistry.java index c994f6a..34a20eb 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskRegistry.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskRegistry.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; import java.util.Collection; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskScheduler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskScheduler.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskScheduler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskScheduler.java index 3eb76bc..8828275 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/infra/WrapTaskScheduler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/infra/WrapTaskScheduler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.infra; +package com.cloudTop.starshare.ui.wangyi.common.infra; public class WrapTaskScheduler implements TaskScheduler { private TaskScheduler wrap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java index 3992bd2..0944981 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/FadeInOutPageTransformer.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.ui.viewpager; +package com.cloudTop.starshare.ui.wangyi.common.ui.viewpager; import android.annotation.SuppressLint; import android.support.v4.view.ViewPager; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java index a7ee1d5..08ab3dc 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/PagerSlidingTabStrip.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yundian.celebrity.ui.wangyi.common.ui.viewpager; +package com.cloudTop.starshare.ui.wangyi.common.ui.viewpager; import android.annotation.SuppressLint; import android.content.Context; @@ -44,9 +44,9 @@ import com.netease.nim.uikit.common.ui.drop.DropFake; import com.netease.nim.uikit.common.ui.drop.DropManager; import com.netease.nim.uikit.common.util.sys.ScreenUtil; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderItem; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderSettings; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderItem; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderSettings; import java.util.Locale; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java index 44d1d6c..7848f27 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/ui/viewpager/SlidingTabPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.ui.viewpager; +package com.cloudTop.starshare.ui.wangyi.common.ui.viewpager; import android.content.Context; import android.support.v4.app.FragmentManager; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/AppCrashHandler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/AppCrashHandler.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/AppCrashHandler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/AppCrashHandler.java index 365e6b5..9ca0bc0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/AppCrashHandler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/AppCrashHandler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.crash; +package com.cloudTop.starshare.ui.wangyi.common.util.crash; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSaver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSaver.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSaver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSaver.java index 18375a8..4e42ce3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSaver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSaver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.crash; +package com.cloudTop.starshare.ui.wangyi.common.util.crash; import android.content.Context; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSnapshot.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSnapshot.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSnapshot.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSnapshot.java index 411c0ef..7af98a2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/crash/CrashSnapshot.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/crash/CrashSnapshot.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.crash; +package com.cloudTop.starshare.ui.wangyi.common.util.crash; import android.annotation.SuppressLint; import android.app.ActivityManager; @@ -13,8 +13,8 @@ import com.netease.nim.uikit.NimUIKit; import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.yundian.celebrity.ui.wangyi.common.util.sys.InstallUtil; -import com.yundian.celebrity.ui.wangyi.common.util.sys.SysInfoUtil; +import com.cloudTop.starshare.ui.wangyi.common.util.sys.InstallUtil; +import com.cloudTop.starshare.ui.wangyi.common.util.sys.SysInfoUtil; import java.io.BufferedReader; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/InstallUtil.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/InstallUtil.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/InstallUtil.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/InstallUtil.java index 13d929d..b2c9a30 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/InstallUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/InstallUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.sys; +package com.cloudTop.starshare.ui.wangyi.common.util.sys; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SysInfoUtil.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SysInfoUtil.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SysInfoUtil.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SysInfoUtil.java index b07c65b..0fa0bdd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SysInfoUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SysInfoUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.sys; +package com.cloudTop.starshare.ui.wangyi.common.util.sys; import android.app.ActivityManager; import android.app.ActivityManager.RunningTaskInfo; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SystemUtil.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SystemUtil.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SystemUtil.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SystemUtil.java index 35883dd..4bf9ccc 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/common/util/sys/SystemUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/common/util/sys/SystemUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.common.util.sys; +package com.cloudTop.starshare.ui.wangyi.common.util.sys; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/DemoServers.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/DemoServers.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/DemoServers.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/DemoServers.java index a6397bd..3bbb467 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/DemoServers.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/DemoServers.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.config; +package com.cloudTop.starshare.ui.wangyi.config; public class DemoServers { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ExtraOptions.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ExtraOptions.java similarity index 73% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ExtraOptions.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ExtraOptions.java index 6e19f4c..35fdd71 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ExtraOptions.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ExtraOptions.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.config; +package com.cloudTop.starshare.ui.wangyi.config; /** * Created by jezhee on 4/19/15. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerConfig.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerConfig.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerConfig.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerConfig.java index c515569..bc5ba5d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.config; +package com.cloudTop.starshare.ui.wangyi.config; public final class ServerConfig { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerEnvs.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerEnvs.java similarity index 76% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerEnvs.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerEnvs.java index ce9d470..24f1088 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/ServerEnvs.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/ServerEnvs.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.config; +package com.cloudTop.starshare.ui.wangyi.config; final class ServerEnvs { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/Preferences.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/Preferences.java similarity index 82% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/Preferences.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/Preferences.java index cbf630c..d270ae4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/Preferences.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/Preferences.java @@ -1,9 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.config.preference; +package com.cloudTop.starshare.ui.wangyi.config.preference; import android.content.Context; import android.content.SharedPreferences; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** @@ -44,7 +45,7 @@ static SharedPreferences getSharedPreferences() { return DemoCache.getContext().getSharedPreferences("Demo", Context.MODE_PRIVATE); }else{ - return null; + return AppApplication.getAppContext().getSharedPreferences("Demo", Context.MODE_PRIVATE); } } } diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/UserPreferences.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/UserPreferences.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/UserPreferences.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/UserPreferences.java index cbbe7a8..b8b406b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/config/preference/UserPreferences.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/config/preference/UserPreferences.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.config.preference; +package com.cloudTop.starshare.ui.wangyi.config.preference; import android.app.Activity; import android.content.Context; @@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** * Created by hzxuwen on 2015/4/13. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHelper.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHelper.java index e762e75..7701d00 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHelper.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.contact; +package com.cloudTop.starshare.ui.wangyi.contact; import android.content.Context; import com.netease.nim.uikit.NimUIKit; import com.netease.nim.uikit.contact.ContactEventListener; -import com.yundian.celebrity.ui.wangyi.contact.activity.UserProfileActivity; +import com.cloudTop.starshare.ui.wangyi.contact.activity.UserProfileActivity; /** * UIKit联系人列表定制展示类 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHttpClient.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHttpClient.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHttpClient.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHttpClient.java index 1fa92e1..d3cb601 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/ContactHttpClient.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/ContactHttpClient.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact; +package com.cloudTop.starshare.ui.wangyi.contact; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; @@ -8,8 +8,8 @@ import com.netease.nim.uikit.common.http.NimHttpClient; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nim.uikit.common.util.string.MD5; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.config.DemoServers; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.config.DemoServers; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/AddFriendActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/AddFriendActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/AddFriendActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/AddFriendActivity.java index 4665730..27e3817 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/AddFriendActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/AddFriendActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.content.Context; import android.content.Intent; @@ -16,8 +16,8 @@ import com.netease.nim.uikit.model.ToolBarOptions; import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** * 添加好友页面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListActivity.java index ba99fb5..9f65f3a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.content.Context; import android.content.Intent; @@ -24,8 +24,8 @@ import com.netease.nimlib.sdk.friend.FriendService; import com.netease.nimlib.sdk.uinfo.UserInfoProvider; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.contact.viewholder.BlackListViewHolder; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.contact.viewholder.BlackListViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListAdapter.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListAdapter.java index 2b0248a..f4cc3ed 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/BlackListAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/BlackListAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileActivity.java index dccff75..0aa26c6 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.content.Context; import android.content.DialogInterface; @@ -38,11 +38,11 @@ import com.netease.nimlib.sdk.friend.model.MuteListChangedNotify; import com.netease.nimlib.sdk.uinfo.constant.GenderEnum; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.contact.constant.UserConstant; -import com.yundian.celebrity.ui.wangyi.main.model.Extras; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.contact.constant.UserConstant; +import com.cloudTop.starshare.ui.wangyi.main.model.Extras; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileEditItemActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileEditItemActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileEditItemActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileEditItemActivity.java index c8ab9ee..b2ff8ce 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileEditItemActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileEditItemActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.app.Activity; import android.app.DatePickerDialog; @@ -30,9 +30,9 @@ import com.netease.nimlib.sdk.friend.model.Friend; import com.netease.nimlib.sdk.uinfo.constant.GenderEnum; import com.netease.nimlib.sdk.uinfo.constant.UserInfoFieldEnum; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.contact.constant.UserConstant; -import com.yundian.celebrity.ui.wangyi.contact.helper.UserUpdateHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.contact.constant.UserConstant; +import com.cloudTop.starshare.ui.wangyi.contact.helper.UserUpdateHelper; import java.io.Serializable; import java.util.Calendar; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileSettingActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileSettingActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileSettingActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileSettingActivity.java index 2bc71b4..63562a3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/activity/UserProfileSettingActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/activity/UserProfileSettingActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.activity; +package com.cloudTop.starshare.ui.wangyi.contact.activity; import android.app.Activity; import android.content.Context; @@ -29,10 +29,10 @@ import com.netease.nimlib.sdk.uinfo.constant.GenderEnum; import com.netease.nimlib.sdk.uinfo.constant.UserInfoFieldEnum; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.contact.constant.UserConstant; -import com.yundian.celebrity.ui.wangyi.contact.helper.UserUpdateHelper; -import com.yundian.celebrity.ui.wangyi.main.model.Extras; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.contact.constant.UserConstant; +import com.cloudTop.starshare.ui.wangyi.contact.helper.UserUpdateHelper; +import com.cloudTop.starshare.ui.wangyi.main.model.Extras; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/constant/UserConstant.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/constant/UserConstant.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/constant/UserConstant.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/constant/UserConstant.java index 841aeb3..6753859 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/constant/UserConstant.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/constant/UserConstant.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.constant; +package com.cloudTop.starshare.ui.wangyi.contact.constant; /** * Created by hzxuwen on 2015/9/17. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/helper/UserUpdateHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/helper/UserUpdateHelper.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/helper/UserUpdateHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/helper/UserUpdateHelper.java index 4333c89..9c664d7 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/helper/UserUpdateHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/helper/UserUpdateHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.helper; +package com.cloudTop.starshare.ui.wangyi.contact.helper; import android.widget.Toast; @@ -8,8 +8,8 @@ import com.netease.nimlib.sdk.ResponseCode; import com.netease.nimlib.sdk.uinfo.UserService; import com.netease.nimlib.sdk.uinfo.constant.UserInfoFieldEnum; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/viewholder/BlackListViewHolder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/viewholder/BlackListViewHolder.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/viewholder/BlackListViewHolder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/viewholder/BlackListViewHolder.java index 17c2e54..bd7c8c9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/contact/viewholder/BlackListViewHolder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/contact/viewholder/BlackListViewHolder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.contact.viewholder; +package com.cloudTop.starshare.ui.wangyi.contact.viewholder; import android.view.View; import android.widget.Button; @@ -9,8 +9,8 @@ import com.netease.nim.uikit.common.ui.imageview.HeadImageView; import com.netease.nimlib.sdk.uinfo.UserInfoProvider; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.contact.activity.BlackListAdapter; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.contact.activity.BlackListAdapter; /** * Created by huangjun on 2015/9/22. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/DemoOnlineStateContentProvider.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/DemoOnlineStateContentProvider.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/DemoOnlineStateContentProvider.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/DemoOnlineStateContentProvider.java index 5c4ddcb..36e2328 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/DemoOnlineStateContentProvider.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/DemoOnlineStateContentProvider.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import android.text.TextUtils; import com.netease.nim.uikit.OnlineStateContentProvider; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** * Created by hzchenkang on 2017/3/31. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/EventFilter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/EventFilter.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/EventFilter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/EventFilter.java index 9c37e09..c7b8aa9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/EventFilter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/EventFilter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import com.netease.nimlib.sdk.event.model.Event; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/NetStateCode.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/NetStateCode.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/NetStateCode.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/NetStateCode.java index 307b4cc..e8b3b4c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/NetStateCode.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/NetStateCode.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; public enum NetStateCode { /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineState.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineState.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineState.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineState.java index d77455f..502e9ba 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineState.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineState.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; /** * 在线状态 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateCode.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateCode.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateCode.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateCode.java index d503d0b..7e6ce9e 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateCode.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateCode.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; public enum OnlineStateCode { /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventCache.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventCache.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventCache.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventCache.java index ee1a85e..251dafd 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventCache.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventCache.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventConfig.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventConfig.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventConfig.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventConfig.java index ae31491..c32fee5 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventConfig.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventConfig.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventManager.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventManager.java index bd55e75..a799a77 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import android.content.BroadcastReceiver; import android.content.Context; @@ -25,8 +25,8 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventSubscribe.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventSubscribe.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventSubscribe.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventSubscribe.java index a8aad4e..393d955 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/event/OnlineStateEventSubscribe.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/event/OnlineStateEventSubscribe.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.event; +package com.cloudTop.starshare.ui.wangyi.event; import android.os.Handler; @@ -13,9 +13,9 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.common.infra.Handlers; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.common.infra.Handlers; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/FileIcons.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/FileIcons.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/file/FileIcons.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/FileIcons.java index 8bb6361..86f6820 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/FileIcons.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/FileIcons.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.ui.wangyi.file; +package com.cloudTop.starshare.ui.wangyi.file; import com.netease.nim.uikit.common.util.file.FileUtil; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserActivity.java index 9147de0..c8ffc2c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.file.browser; +package com.cloudTop.starshare.ui.wangyi.file.browser; import android.app.Activity; import android.content.Intent; @@ -14,7 +14,7 @@ import com.netease.nim.uikit.common.adapter.TAdapterDelegate; import com.netease.nim.uikit.common.adapter.TViewHolder; import com.netease.nim.uikit.model.ToolBarOptions; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserAdapter.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserAdapter.java index 3ad9e2f..63fbcfe 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.file.browser; +package com.cloudTop.starshare.ui.wangyi.file.browser; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserViewHolder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserViewHolder.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserViewHolder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserViewHolder.java index c297740..312b782 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/file/browser/FileBrowserViewHolder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/file/browser/FileBrowserViewHolder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.file.browser; +package com.cloudTop.starshare.ui.wangyi.file.browser; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -6,8 +6,8 @@ import android.widget.TextView; import com.netease.nim.uikit.common.adapter.TViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JavaInterfaces.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JavaInterfaces.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JavaInterfaces.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JavaInterfaces.java index d1136a2..13eb2da 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JavaInterfaces.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JavaInterfaces.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.jsbridge; +package com.cloudTop.starshare.ui.wangyi.jsbridge; import android.widget.Toast; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JsBridgeActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JsBridgeActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JsBridgeActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JsBridgeActivity.java index 28fb3f8..5496625 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/JsBridgeActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/JsBridgeActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.jsbridge; +package com.cloudTop.starshare.ui.wangyi.jsbridge; import android.app.Activity; import android.content.Context; @@ -19,7 +19,7 @@ import com.netease.nimlib.jsbridge.util.Base64; import com.netease.nimlib.jsbridge.util.WebViewConfig; import com.netease.nimlib.sdk.ResponseCode; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/NotificationHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/NotificationHelper.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/NotificationHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/NotificationHelper.java index 29d3889..ef9b871 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/jsbridge/NotificationHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/jsbridge/NotificationHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.jsbridge; +package com.cloudTop.starshare.ui.wangyi.jsbridge; import android.app.Notification; import android.app.NotificationManager; @@ -7,8 +7,8 @@ import android.content.Intent; import android.support.v4.app.NotificationCompat; -import com.yundian.celebrity.ui.main.activity.MainActivity; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.ui.main.activity.MainActivity; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationAmapActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationAmapActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationAmapActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationAmapActivity.java index b414b40..b12ef57 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationAmapActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationAmapActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.activity; +package com.cloudTop.starshare.ui.wangyi.location.activity; import android.content.Context; import android.content.Intent; @@ -23,10 +23,10 @@ import com.netease.nim.uikit.LocationProvider; import com.netease.nim.uikit.common.activity.UI; import com.netease.nim.uikit.model.ToolBarOptions; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.location.helper.NimGeocoder; -import com.yundian.celebrity.ui.wangyi.location.helper.NimLocationManager; -import com.yundian.celebrity.ui.wangyi.location.model.NimLocation; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.location.helper.NimGeocoder; +import com.cloudTop.starshare.ui.wangyi.location.helper.NimLocationManager; +import com.cloudTop.starshare.ui.wangyi.location.model.NimLocation; public class LocationAmapActivity extends UI implements AMap.OnCameraChangeListener, OnClickListener , NimLocationManager.NimLocationListener { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationExtras.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationExtras.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationExtras.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationExtras.java index 4e0ad09..c88edc1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/LocationExtras.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/LocationExtras.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.activity; +package com.cloudTop.starshare.ui.wangyi.location.activity; public interface LocationExtras { int DEFAULT_ZOOM_LEVEL = 15; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/NavigationAmapActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/NavigationAmapActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/NavigationAmapActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/NavigationAmapActivity.java index 5861d6d..3603663 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/activity/NavigationAmapActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/activity/NavigationAmapActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.activity; +package com.cloudTop.starshare.ui.wangyi.location.activity; import android.content.DialogInterface; import android.content.Intent; @@ -31,11 +31,11 @@ import com.netease.nim.uikit.common.ui.dialog.CustomAlertDialog; import com.netease.nim.uikit.common.util.string.StringUtil; import com.netease.nim.uikit.model.ToolBarOptions; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.location.adapter.IconListAdapter; -import com.yundian.celebrity.ui.wangyi.location.helper.MapHelper; -import com.yundian.celebrity.ui.wangyi.location.helper.NimLocationManager; -import com.yundian.celebrity.ui.wangyi.location.model.NimLocation; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.location.adapter.IconListAdapter; +import com.cloudTop.starshare.ui.wangyi.location.helper.MapHelper; +import com.cloudTop.starshare.ui.wangyi.location.helper.NimLocationManager; +import com.cloudTop.starshare.ui.wangyi.location.model.NimLocation; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/adapter/IconListAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/adapter/IconListAdapter.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/adapter/IconListAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/adapter/IconListAdapter.java index d8b1054..17a2b33 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/adapter/IconListAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/adapter/IconListAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.yundian.celebrity.ui.wangyi.location.adapter; +package com.cloudTop.starshare.ui.wangyi.location.adapter; import android.content.Context; import android.graphics.drawable.Drawable; @@ -26,7 +26,7 @@ import android.widget.ImageView; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/MapHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/MapHelper.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/MapHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/MapHelper.java index cf11c21..3dae5cb 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/MapHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/MapHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.helper; +package com.cloudTop.starshare.ui.wangyi.location.helper; import android.content.Context; import android.content.Intent; @@ -8,8 +8,8 @@ import android.widget.Toast; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.location.model.NimLocation; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.location.model.NimLocation; import java.net.URISyntaxException; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimGeocoder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimGeocoder.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimGeocoder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimGeocoder.java index 483d78a..bb9c0e0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimGeocoder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimGeocoder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.helper; +package com.cloudTop.starshare.ui.wangyi.location.helper; import android.content.Context; import android.location.Address; @@ -12,12 +12,12 @@ import com.amap.api.services.geocoder.RegeocodeAddress; import com.amap.api.services.geocoder.RegeocodeQuery; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yundian.celebrity.ui.wangyi.common.infra.DefaultTaskManager; -import com.yundian.celebrity.ui.wangyi.common.infra.DefaultTaskWorker; -import com.yundian.celebrity.ui.wangyi.common.infra.ManagedTask; -import com.yundian.celebrity.ui.wangyi.common.infra.TaskExecutor; -import com.yundian.celebrity.ui.wangyi.common.infra.TaskManager; -import com.yundian.celebrity.ui.wangyi.location.model.NimLocation; +import com.cloudTop.starshare.ui.wangyi.common.infra.DefaultTaskManager; +import com.cloudTop.starshare.ui.wangyi.common.infra.DefaultTaskWorker; +import com.cloudTop.starshare.ui.wangyi.common.infra.ManagedTask; +import com.cloudTop.starshare.ui.wangyi.common.infra.TaskExecutor; +import com.cloudTop.starshare.ui.wangyi.common.infra.TaskManager; +import com.cloudTop.starshare.ui.wangyi.location.model.NimLocation; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimLocationManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimLocationManager.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimLocationManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimLocationManager.java index c1b2f32..894b19a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/helper/NimLocationManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/helper/NimLocationManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.helper; +package com.cloudTop.starshare.ui.wangyi.location.helper; import android.content.Context; @@ -17,8 +17,8 @@ import com.amap.api.location.LocationManagerProxy; import com.amap.api.location.LocationProviderProxy; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yundian.celebrity.ui.wangyi.common.infra.TaskExecutor; -import com.yundian.celebrity.ui.wangyi.location.model.NimLocation; +import com.cloudTop.starshare.ui.wangyi.common.infra.TaskExecutor; +import com.cloudTop.starshare.ui.wangyi.location.model.NimLocation; import java.io.IOException; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/model/NimLocation.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/model/NimLocation.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/location/model/NimLocation.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/model/NimLocation.java index 71e49a0..394dbb2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/location/model/NimLocation.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/location/model/NimLocation.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.location.model; +package com.cloudTop.starshare.ui.wangyi.location.model; import android.location.Location; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/login/LogoutHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/login/LogoutHelper.java similarity index 75% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/login/LogoutHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/login/LogoutHelper.java index 9588fba..c65f6b3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/login/LogoutHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/login/LogoutHelper.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.login; +package com.cloudTop.starshare.ui.wangyi.login; import com.netease.nim.uikit.LoginSyncDataStatusObserver; import com.netease.nim.uikit.NimUIKit; import com.netease.nim.uikit.common.ui.drop.DropManager; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.chatroom.helper.ChatRoomHelper; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.chatroom.helper.ChatRoomHelper; /** * 注销帮助类 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/AboutActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/AboutActivity.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/AboutActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/AboutActivity.java index 4862095..8c612b4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/AboutActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/AboutActivity.java @@ -1,12 +1,12 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.os.Bundle; import android.widget.TextView; import com.netease.nim.uikit.common.activity.UI; import com.netease.nim.uikit.model.ToolBarOptions; -import com.yundian.celebrity.BuildConfig; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.BuildConfig; +import com.cloudTop.starshare.R; public class AboutActivity extends UI { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/CustomNotificationActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/CustomNotificationActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/CustomNotificationActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/CustomNotificationActivity.java index 2c19572..90277da 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/CustomNotificationActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/CustomNotificationActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.app.Activity; import android.content.Context; @@ -31,10 +31,10 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.main.helper.CustomNotificationCache; -import com.yundian.celebrity.ui.wangyi.main.viewholder.CustomNotificationViewHolder; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.main.helper.CustomNotificationCache; +import com.cloudTop.starshare.ui.wangyi.main.viewholder.CustomNotificationViewHolder; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchActivity.java index 35c75bf..2df160d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -31,9 +31,9 @@ import com.netease.nim.uikit.contact.core.viewholder.MsgHolder; import com.netease.nim.uikit.model.ToolBarOptions; import com.netease.nimlib.sdk.search.model.MsgIndexRecord; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; -import com.yundian.celebrity.ui.wangyi.session.search.DisplayMessageActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.ui.wangyi.session.search.DisplayMessageActivity; /** * 全局搜索页面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity.java index 0ddb386..f0e0cad 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -24,8 +24,8 @@ import com.netease.nim.uikit.model.ToolBarOptions; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.search.model.MsgIndexRecord; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; /** * 消息全文检索详细页面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java index 28756f8..be1536d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/GlobalSearchDetailActivity2.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -25,8 +25,8 @@ import com.netease.nim.uikit.model.ToolBarOptions; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.search.model.MsgIndexRecord; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.search.DisplayMessageActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.search.DisplayMessageActivity; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/MultiportActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/MultiportActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/MultiportActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/MultiportActivity.java index d7eb84b..0e0bb91 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/MultiportActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/MultiportActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -14,7 +14,7 @@ import com.netease.nimlib.sdk.auth.AuthService; import com.netease.nimlib.sdk.auth.ClientType; import com.netease.nimlib.sdk.auth.OnlineClient; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/NoDisturbActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/NoDisturbActivity.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/NoDisturbActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/NoDisturbActivity.java index 3c87b4c..329bdfb 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/NoDisturbActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/NoDisturbActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.app.Activity; import android.app.TimePickerDialog; @@ -18,11 +18,11 @@ import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.mixpush.MixPushService; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.ui.wangyi.main.adapter.SettingsAdapter; -import com.yundian.celebrity.ui.wangyi.main.model.SettingTemplate; -import com.yundian.celebrity.ui.wangyi.main.model.SettingType; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.ui.wangyi.main.adapter.SettingsAdapter; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingTemplate; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingType; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SettingsActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SettingsActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SettingsActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SettingsActivity.java index f7b65ec..3e6109d 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SettingsActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SettingsActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.app.Activity; import android.content.Intent; @@ -24,16 +24,16 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.settings.SettingsService; import com.netease.nimlib.sdk.settings.SettingsServiceObserver; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.avchat.activity.AVChatSettingsActivity; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.ui.wangyi.contact.activity.UserProfileSettingActivity; -import com.yundian.celebrity.ui.wangyi.jsbridge.JsBridgeActivity; -import com.yundian.celebrity.ui.wangyi.main.adapter.SettingsAdapter; -import com.yundian.celebrity.ui.wangyi.main.model.SettingTemplate; -import com.yundian.celebrity.ui.wangyi.main.model.SettingType; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.avchat.activity.AVChatSettingsActivity; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.ui.wangyi.contact.activity.UserProfileSettingActivity; +import com.cloudTop.starshare.ui.wangyi.jsbridge.JsBridgeActivity; +import com.cloudTop.starshare.ui.wangyi.main.adapter.SettingsAdapter; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingTemplate; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingType; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SystemMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SystemMessageActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SystemMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SystemMessageActivity.java index 9fb5cda..950ae74 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/SystemMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/SystemMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -33,9 +33,9 @@ import com.netease.nimlib.sdk.msg.model.SystemMessage; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.adapter.SystemMessageAdapter; -import com.yundian.celebrity.ui.wangyi.main.viewholder.SystemMessageViewHolder; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.adapter.SystemMessageAdapter; +import com.cloudTop.starshare.ui.wangyi.main.viewholder.SystemMessageViewHolder; import java.util.ArrayList; import java.util.HashSet; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/TeamListActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/TeamListActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/TeamListActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/TeamListActivity.java index 2cf96a5..549ce3c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/activity/TeamListActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/activity/TeamListActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.activity; +package com.cloudTop.starshare.ui.wangyi.main.activity; import android.content.Context; import android.content.Intent; @@ -25,8 +25,8 @@ import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/MainTabPagerAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/MainTabPagerAdapter.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/MainTabPagerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/MainTabPagerAdapter.java index aa62f20..b9176cb 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/MainTabPagerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/MainTabPagerAdapter.java @@ -1,13 +1,13 @@ -package com.yundian.celebrity.ui.wangyi.main.adapter; +package com.cloudTop.starshare.ui.wangyi.main.adapter; import android.content.Context; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.view.ViewPager; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.SlidingTabPagerAdapter; -import com.yundian.celebrity.ui.wangyi.main.fragment.MainTabFragment; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.SlidingTabPagerAdapter; +import com.cloudTop.starshare.ui.wangyi.main.fragment.MainTabFragment; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SettingsAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SettingsAdapter.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SettingsAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SettingsAdapter.java index 7983778..fe81d7b 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SettingsAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SettingsAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.adapter; +package com.cloudTop.starshare.ui.wangyi.main.adapter; import android.content.Context; import android.graphics.Color; @@ -13,10 +13,10 @@ import com.netease.nim.uikit.cache.NimUserInfoCache; import com.netease.nim.uikit.common.ui.imageview.HeadImageView; import com.netease.nim.uikit.common.ui.widget.SwitchButton; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.main.model.SettingTemplate; -import com.yundian.celebrity.ui.wangyi.main.model.SettingType; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingTemplate; +import com.cloudTop.starshare.ui.wangyi.main.model.SettingType; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SystemMessageAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SystemMessageAdapter.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SystemMessageAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SystemMessageAdapter.java index efd01b9..7dc1096 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/adapter/SystemMessageAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/adapter/SystemMessageAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.adapter; +package com.cloudTop.starshare.ui.wangyi.main.adapter; import android.content.Context; import android.view.View; @@ -6,7 +6,7 @@ import com.netease.nim.uikit.common.adapter.TAdapter; import com.netease.nim.uikit.common.adapter.TAdapterDelegate; -import com.yundian.celebrity.ui.wangyi.main.viewholder.SystemMessageViewHolder; +import com.cloudTop.starshare.ui.wangyi.main.viewholder.SystemMessageViewHolder; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ChatRoomListFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ChatRoomListFragment.java similarity index 74% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ChatRoomListFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ChatRoomListFragment.java index 817623a..ce24112 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ChatRoomListFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ChatRoomListFragment.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.wangyi.main.fragment; +package com.cloudTop.starshare.ui.wangyi.main.fragment; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.chatroom.fragment.ChatRoomsFragment; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.chatroom.fragment.ChatRoomsFragment; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; /** * 聊天室主TAB页 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ContactListFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ContactListFragment.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ContactListFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ContactListFragment.java index 3873f7b..1ee8937 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/ContactListFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/ContactListFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.fragment; +package com.cloudTop.starshare.ui.wangyi.main.fragment; import android.content.Context; import android.os.Bundle; @@ -15,17 +15,17 @@ import com.netease.nim.uikit.contact.core.item.ItemTypes; import com.netease.nim.uikit.contact.core.model.ContactDataAdapter; import com.netease.nim.uikit.contact.core.viewholder.AbsContactViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.contact.activity.BlackListActivity; -import com.yundian.celebrity.ui.wangyi.main.activity.SystemMessageActivity; -import com.yundian.celebrity.ui.wangyi.main.activity.TeamListActivity; -import com.yundian.celebrity.ui.wangyi.main.helper.SystemMessageUnreadManager; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderId; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderItem; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderManager; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.contact.activity.BlackListActivity; +import com.cloudTop.starshare.ui.wangyi.main.activity.SystemMessageActivity; +import com.cloudTop.starshare.ui.wangyi.main.activity.TeamListActivity; +import com.cloudTop.starshare.ui.wangyi.main.helper.SystemMessageUnreadManager; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderId; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderItem; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderManager; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/HomeFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/HomeFragment.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/HomeFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/HomeFragment.java index c0f0434..de5d1a9 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/HomeFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/HomeFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.fragment; +package com.cloudTop.starshare.ui.wangyi.main.fragment; import android.os.Bundle; import android.support.v4.view.ViewPager; @@ -18,14 +18,14 @@ import com.netease.nimlib.sdk.msg.SystemMessageService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.FadeInOutPageTransformer; -import com.yundian.celebrity.ui.wangyi.common.ui.viewpager.PagerSlidingTabStrip; -import com.yundian.celebrity.ui.wangyi.main.adapter.MainTabPagerAdapter; -import com.yundian.celebrity.ui.wangyi.main.helper.SystemMessageUnreadManager; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderItem; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderManager; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.FadeInOutPageTransformer; +import com.cloudTop.starshare.ui.wangyi.common.ui.viewpager.PagerSlidingTabStrip; +import com.cloudTop.starshare.ui.wangyi.main.adapter.MainTabPagerAdapter; +import com.cloudTop.starshare.ui.wangyi.main.helper.SystemMessageUnreadManager; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderItem; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderManager; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/MainTabFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/MainTabFragment.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/MainTabFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/MainTabFragment.java index c69f71b..89eef1a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/MainTabFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/MainTabFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.fragment; +package com.cloudTop.starshare.ui.wangyi.main.fragment; import android.os.Bundle; import android.view.LayoutInflater; @@ -6,8 +6,8 @@ import android.view.ViewGroup; import com.netease.nim.uikit.common.fragment.TabFragment; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; public abstract class MainTabFragment extends TabFragment { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/SessionListFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/SessionListFragment.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/SessionListFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/SessionListFragment.java index 3ce6c89..24af24c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/fragment/SessionListFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/fragment/SessionListFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.fragment; +package com.cloudTop.starshare.ui.wangyi.main.fragment; import android.os.Bundle; import android.view.View; @@ -19,17 +19,17 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.login.LogoutHelper; -import com.yundian.celebrity.ui.wangyi.main.activity.MultiportActivity; -import com.yundian.celebrity.ui.wangyi.main.model.MainTab; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderManager; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.RTSAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.SnapChatAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.StickerAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.login.LogoutHelper; +import com.cloudTop.starshare.ui.wangyi.main.activity.MultiportActivity; +import com.cloudTop.starshare.ui.wangyi.main.model.MainTab; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderManager; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.RTSAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.SnapChatAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.StickerAttachment; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/CustomNotificationCache.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/CustomNotificationCache.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/CustomNotificationCache.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/CustomNotificationCache.java index 1344a56..fbe36c3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/CustomNotificationCache.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/CustomNotificationCache.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.helper; +package com.cloudTop.starshare.ui.wangyi.main.helper; import com.netease.nimlib.sdk.msg.model.CustomNotification; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/MessageHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/MessageHelper.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/MessageHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/MessageHelper.java index df450ae..dffeede 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/MessageHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/MessageHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.helper; +package com.cloudTop.starshare.ui.wangyi.main.helper; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/SystemMessageUnreadManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/SystemMessageUnreadManager.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/SystemMessageUnreadManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/SystemMessageUnreadManager.java index 64e08e3..c45d892 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/helper/SystemMessageUnreadManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/helper/SystemMessageUnreadManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.helper; +package com.cloudTop.starshare.ui.wangyi.main.helper; /** * Created by huangjun on 2015/8/20. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/Extras.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/Extras.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/Extras.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/Extras.java index 4bdf876..2ac6e78 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/Extras.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/Extras.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.model; +package com.cloudTop.starshare.ui.wangyi.main.model; public interface Extras { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/MainTab.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/MainTab.java similarity index 76% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/MainTab.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/MainTab.java index c184bdb..b939177 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/MainTab.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/MainTab.java @@ -1,12 +1,12 @@ -package com.yundian.celebrity.ui.wangyi.main.model; +package com.cloudTop.starshare.ui.wangyi.main.model; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.fragment.ChatRoomListFragment; -import com.yundian.celebrity.ui.wangyi.main.fragment.ContactListFragment; -import com.yundian.celebrity.ui.wangyi.main.fragment.MainTabFragment; -import com.yundian.celebrity.ui.wangyi.main.fragment.SessionListFragment; -import com.yundian.celebrity.ui.wangyi.main.reminder.ReminderId; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.fragment.ChatRoomListFragment; +import com.cloudTop.starshare.ui.wangyi.main.fragment.ContactListFragment; +import com.cloudTop.starshare.ui.wangyi.main.fragment.MainTabFragment; +import com.cloudTop.starshare.ui.wangyi.main.fragment.SessionListFragment; +import com.cloudTop.starshare.ui.wangyi.main.reminder.ReminderId; public enum MainTab { RECENT_CONTACTS(0, ReminderId.SESSION, SessionListFragment.class, R.string.main_tab_session, R.layout.session_list), diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingTemplate.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingTemplate.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingTemplate.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingTemplate.java index bc5f322..679e8be 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingTemplate.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingTemplate.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.model; +package com.cloudTop.starshare.ui.wangyi.main.model; /** * Created by hzxuwen on 2015/6/29. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingType.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingType.java similarity index 79% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingType.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingType.java index 09f889c..dc1cffc 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/model/SettingType.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/model/SettingType.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.model; +package com.cloudTop.starshare.ui.wangyi.main.model; /** * Created by hzxuwen on 2015/6/30. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderId.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderId.java similarity index 72% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderId.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderId.java index ee11828..0134693 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderId.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderId.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.reminder; +package com.cloudTop.starshare.ui.wangyi.main.reminder; public class ReminderId { final static public int INVALID = -1; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderItem.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderItem.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderItem.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderItem.java index e800c08..a4b8f18 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderItem.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderItem.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.reminder; +package com.cloudTop.starshare.ui.wangyi.main.reminder; import java.io.Serializable; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderManager.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderManager.java index e9c6bd1..c194ee4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.reminder; +package com.cloudTop.starshare.ui.wangyi.main.reminder; import android.util.SparseArray; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderSettings.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderSettings.java similarity index 80% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderSettings.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderSettings.java index d3f3654..8d42829 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/reminder/ReminderSettings.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/reminder/ReminderSettings.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.reminder; +package com.cloudTop.starshare.ui.wangyi.main.reminder; public class ReminderSettings { /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java index 47db33f..ff09c0a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/CustomNotificationViewHolder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.viewholder; +package com.cloudTop.starshare.ui.wangyi.main.viewholder; import android.view.View; import android.widget.TextView; @@ -10,8 +10,8 @@ import com.netease.nim.uikit.common.util.sys.TimeUtil; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.helper.MessageHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.helper.MessageHelper; public class CustomNotificationViewHolder extends TViewHolder { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/SystemMessageViewHolder.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/SystemMessageViewHolder.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/SystemMessageViewHolder.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/SystemMessageViewHolder.java index 0f70da2..7ccf239 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/main/viewholder/SystemMessageViewHolder.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/main/viewholder/SystemMessageViewHolder.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.main.viewholder; +package com.cloudTop.starshare.ui.wangyi.main.viewholder; import android.view.View; import android.widget.Button; @@ -10,8 +10,8 @@ import com.netease.nim.uikit.common.util.sys.TimeUtil; import com.netease.nimlib.sdk.msg.constant.SystemMessageStatus; import com.netease.nimlib.sdk.msg.model.SystemMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.main.helper.MessageHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.main.helper.MessageHelper; /** * Created by huangjun on 2015/3/18. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoMixPushMessageHandler.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoMixPushMessageHandler.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoMixPushMessageHandler.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoMixPushMessageHandler.java index 64e098e..194d4ec 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoMixPushMessageHandler.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoMixPushMessageHandler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.mixpush; +package com.cloudTop.starshare.ui.wangyi.mixpush; import android.app.Activity; import android.content.ComponentName; @@ -12,7 +12,7 @@ import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.util.ArrayList; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoPushContentProvider.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoPushContentProvider.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoPushContentProvider.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoPushContentProvider.java index 524ead7..31c94e0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/mixpush/DemoPushContentProvider.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/mixpush/DemoPushContentProvider.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.mixpush; +package com.cloudTop.starshare.ui.wangyi.mixpush; import android.text.TextUtils; @@ -12,7 +12,7 @@ import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/receiver/CustomNotificationReceiver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/receiver/CustomNotificationReceiver.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/receiver/CustomNotificationReceiver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/receiver/CustomNotificationReceiver.java index aedd01c..239246e 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/receiver/CustomNotificationReceiver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/receiver/CustomNotificationReceiver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.receiver; +package com.cloudTop.starshare.ui.wangyi.receiver; import android.content.BroadcastReceiver; import android.content.Context; @@ -10,7 +10,7 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.NimIntent; import com.netease.nimlib.sdk.msg.model.CustomNotification; -import com.yundian.celebrity.ui.wangyi.main.helper.CustomNotificationCache; +import com.cloudTop.starshare.ui.wangyi.main.helper.CustomNotificationCache; /** * 自定义通知消息广播接收器 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/ActionTypeEnum.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/ActionTypeEnum.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/ActionTypeEnum.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/ActionTypeEnum.java index 5e3a612..ee29f8c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/ActionTypeEnum.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/ActionTypeEnum.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts; +package com.cloudTop.starshare.ui.wangyi.rts; /** * 形状枚举 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/activity/RTSActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/activity/RTSActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/activity/RTSActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/activity/RTSActivity.java index a953d4f..6c77f98 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/activity/RTSActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/activity/RTSActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.activity; +package com.cloudTop.starshare.ui.wangyi.rts.activity; import android.content.Context; import android.content.Intent; @@ -30,12 +30,12 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.rts.ActionTypeEnum; -import com.yundian.celebrity.ui.wangyi.rts.doodle.DoodleView; -import com.yundian.celebrity.ui.wangyi.rts.doodle.SupportActionType; -import com.yundian.celebrity.ui.wangyi.rts.doodle.action.MyPath; -import com.yundian.celebrity.ui.wangyi.session.extension.RTSAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.rts.ActionTypeEnum; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.DoodleView; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.SupportActionType; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.action.MyPath; +import com.cloudTop.starshare.ui.wangyi.session.extension.RTSAttachment; /** * 发起/接受会话界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleChannel.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleChannel.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleChannel.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleChannel.java index cbe137b..226c9d0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleChannel.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleChannel.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.graphics.Color; -import com.yundian.celebrity.ui.wangyi.rts.doodle.action.Action; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.action.Action; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleView.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleView.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleView.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleView.java index 00e9faf..6d3eb17 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/DoodleView.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/DoodleView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.content.Context; import android.graphics.Canvas; @@ -10,8 +10,8 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; -import com.yundian.celebrity.ui.wangyi.rts.doodle.action.Action; -import com.yundian.celebrity.ui.wangyi.rts.doodle.action.MyPath; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.action.Action; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.action.MyPath; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/SupportActionType.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/SupportActionType.java similarity index 87% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/SupportActionType.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/SupportActionType.java index 06a3e27..e90d764 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/SupportActionType.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/SupportActionType.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.util.SparseArray; -import com.yundian.celebrity.ui.wangyi.rts.doodle.action.MyEraser; +import com.cloudTop.starshare.ui.wangyi.rts.doodle.action.MyEraser; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/Transaction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/Transaction.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/Transaction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/Transaction.java index 28c79df..940ac34 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/Transaction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/Transaction.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.util.Log; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionCenter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionCenter.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionCenter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionCenter.java index f1cde5a..e4a807a 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionCenter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionCenter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionManager.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionManager.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionManager.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionManager.java index 7d05e0b..cff56a5 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionManager.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import android.content.Context; import android.os.Handler; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionObserver.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionObserver.java similarity index 75% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionObserver.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionObserver.java index fd62990..8426ba7 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/TransactionObserver.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/TransactionObserver.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle; +package com.cloudTop.starshare.ui.wangyi.rts.doodle; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/Action.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/Action.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/Action.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/Action.java index 6fe05d9..55550df 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/Action.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/Action.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Color; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyCircle.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyCircle.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyCircle.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyCircle.java index ff316e0..6e473f6 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyCircle.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyCircle.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyEraser.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyEraser.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyEraser.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyEraser.java index 5cb68f0..c849b9f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyEraser.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyEraser.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillCircle.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillCircle.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillCircle.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillCircle.java index 5e83c64..ae84477 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillCircle.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillCircle.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillRect.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillRect.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillRect.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillRect.java index 954d159..18d18f3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyFillRect.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyFillRect.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyLine.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyLine.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyLine.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyLine.java index 9e6c791..e3aa95c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyLine.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyLine.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPath.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPath.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPath.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPath.java index e9a46d0..e190246 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPath.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPath.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPoint.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPoint.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPoint.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPoint.java index 241c714..b6f4350 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyPoint.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyPoint.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyRect.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyRect.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyRect.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyRect.java index 35cecdf..7e6c7c1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/rts/doodle/action/MyRect.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/rts/doodle/action/MyRect.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.rts.doodle.action; +package com.cloudTop.starshare.ui.wangyi.rts.doodle.action; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/NimDemoLocationProvider.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/NimDemoLocationProvider.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/NimDemoLocationProvider.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/NimDemoLocationProvider.java index 9963914..797be61 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/NimDemoLocationProvider.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/NimDemoLocationProvider.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session; +package com.cloudTop.starshare.ui.wangyi.session; import android.content.Context; import android.content.Intent; @@ -7,10 +7,10 @@ import com.netease.nim.uikit.LocationProvider; import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yundian.celebrity.ui.wangyi.location.activity.LocationAmapActivity; -import com.yundian.celebrity.ui.wangyi.location.activity.LocationExtras; -import com.yundian.celebrity.ui.wangyi.location.activity.NavigationAmapActivity; -import com.yundian.celebrity.ui.wangyi.location.helper.NimLocationManager; +import com.cloudTop.starshare.ui.wangyi.location.activity.LocationAmapActivity; +import com.cloudTop.starshare.ui.wangyi.location.activity.LocationExtras; +import com.cloudTop.starshare.ui.wangyi.location.activity.NavigationAmapActivity; +import com.cloudTop.starshare.ui.wangyi.location.helper.NimLocationManager; /** * Created by zhoujianghua on 2015/8/11. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/SessionHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/SessionHelper.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/SessionHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/SessionHelper.java index e9c4261..e1a2318 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/SessionHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/SessionHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session; +package com.cloudTop.starshare.ui.wangyi.session; import android.app.Activity; import android.content.Context; @@ -33,29 +33,29 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.model.Team; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.contact.activity.UserProfileActivity; -import com.yundian.celebrity.ui.wangyi.session.action.FileAction; -import com.yundian.celebrity.ui.wangyi.session.action.GuessAction; -import com.yundian.celebrity.ui.wangyi.session.action.RTSAction; -import com.yundian.celebrity.ui.wangyi.session.action.SnapChatAction; -import com.yundian.celebrity.ui.wangyi.session.action.TipAction; -import com.yundian.celebrity.ui.wangyi.session.activity.MessageHistoryActivity; -import com.yundian.celebrity.ui.wangyi.session.extension.CustomAttachParser; -import com.yundian.celebrity.ui.wangyi.session.extension.CustomAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.RTSAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.SnapChatAttachment; -import com.yundian.celebrity.ui.wangyi.session.extension.StickerAttachment; -import com.yundian.celebrity.ui.wangyi.session.search.SearchMessageActivity; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderDefCustom; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderFile; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderGuess; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderRTS; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderSnapChat; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderSticker; -import com.yundian.celebrity.ui.wangyi.session.viewholder.MsgViewHolderTip; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.contact.activity.UserProfileActivity; +import com.cloudTop.starshare.ui.wangyi.session.action.FileAction; +import com.cloudTop.starshare.ui.wangyi.session.action.GuessAction; +import com.cloudTop.starshare.ui.wangyi.session.action.RTSAction; +import com.cloudTop.starshare.ui.wangyi.session.action.SnapChatAction; +import com.cloudTop.starshare.ui.wangyi.session.action.TipAction; +import com.cloudTop.starshare.ui.wangyi.session.activity.MessageHistoryActivity; +import com.cloudTop.starshare.ui.wangyi.session.extension.CustomAttachParser; +import com.cloudTop.starshare.ui.wangyi.session.extension.CustomAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.RTSAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.SnapChatAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.StickerAttachment; +import com.cloudTop.starshare.ui.wangyi.session.search.SearchMessageActivity; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderDefCustom; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderFile; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderGuess; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderRTS; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderSnapChat; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderSticker; +import com.cloudTop.starshare.ui.wangyi.session.viewholder.MsgViewHolderTip; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/AVChatAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/AVChatAction.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/AVChatAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/AVChatAction.java index 4e85ee6..129f1ea 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/AVChatAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/AVChatAction.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import android.widget.Toast; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.netease.nim.uikit.session.actions.BaseAction; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Created by hzxuwen on 2015/6/12. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/FileAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/FileAction.java similarity index 88% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/FileAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/FileAction.java index 6476406..11320c3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/FileAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/FileAction.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import android.content.Intent; @@ -6,8 +6,8 @@ import com.netease.nim.uikit.session.constant.RequestCode; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.file.browser.FileBrowserActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.file.browser.FileBrowserActivity; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/GuessAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/GuessAction.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/GuessAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/GuessAction.java index f858a0d..8cd3308 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/GuessAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/GuessAction.java @@ -1,12 +1,12 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import com.netease.nim.uikit.session.actions.BaseAction; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; /** * Created by hzxuwen on 2015/6/11. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/RTSAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/RTSAction.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/RTSAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/RTSAction.java index 0432f11..cf28d7c 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/RTSAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/RTSAction.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import android.widget.Toast; import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.netease.nim.uikit.session.actions.BaseAction; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.rts.activity.RTSActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.rts.activity.RTSActivity; /** * Created by huangjun on 2015/7/7. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/SnapChatAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/SnapChatAction.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/SnapChatAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/SnapChatAction.java index 351f0de..d243806 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/SnapChatAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/SnapChatAction.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import com.netease.nim.uikit.session.actions.PickImageAction; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.extension.SnapChatAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.extension.SnapChatAttachment; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/TipAction.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/TipAction.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/TipAction.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/TipAction.java index 37d990f..b0fb700 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/action/TipAction.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/action/TipAction.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.ui.wangyi.session.action; +package com.cloudTop.starshare.ui.wangyi.session.action; import com.netease.nim.uikit.session.actions.BaseAction; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Tip类型消息测试 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/BaseMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/BaseMessageActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/BaseMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/BaseMessageActivity.java index bd3dc01..6a37ce2 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/BaseMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/BaseMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.content.Intent; import android.os.Bundle; @@ -14,7 +14,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.netease.nim.uikit.session.SessionCustomization; import com.netease.nim.uikit.session.constant.Extras; -import com.yundian.celebrity.ui.wangyi.session.fragment.MessageFragment; +import com.cloudTop.starshare.ui.wangyi.session.fragment.MessageFragment; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/FileDownloadActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/FileDownloadActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/FileDownloadActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/FileDownloadActivity.java index e5fdf41..c1592af 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/FileDownloadActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/FileDownloadActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.content.Context; import android.content.Intent; @@ -18,7 +18,7 @@ import com.netease.nimlib.sdk.msg.attachment.FileAttachment; import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Created by hzxuwen on 2016/12/14. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageHistoryActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageHistoryActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageHistoryActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageHistoryActivity.java index 915a071..89dfd63 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageHistoryActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageHistoryActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.content.Context; import android.content.Intent; @@ -13,7 +13,7 @@ import com.netease.nim.uikit.session.module.list.MessageListPanelEx; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * 消息历史查询界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageInfoActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageInfoActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageInfoActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageInfoActivity.java index 1eeae8c..58b5c58 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/MessageInfoActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/MessageInfoActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.app.Activity; import android.content.Context; @@ -20,10 +20,10 @@ import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.friend.FriendService; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.contact.activity.UserProfileActivity; -import com.yundian.celebrity.ui.wangyi.team.TeamCreateHelper; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.contact.activity.UserProfileActivity; +import com.cloudTop.starshare.ui.wangyi.team.TeamCreateHelper; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/P2PMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/P2PMessageActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/P2PMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/P2PMessageActivity.java index 4d87502..6d3065e 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/P2PMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/P2PMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.content.Context; import android.content.Intent; @@ -22,8 +22,8 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.fragment.MessageFragment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.fragment.MessageFragment; import java.util.List; import java.util.Set; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/TeamMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/TeamMessageActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/TeamMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/TeamMessageActivity.java index 6a06375..637f983 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/TeamMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/TeamMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.app.Activity; import android.content.Context; @@ -21,8 +21,8 @@ import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yundian.celebrity.ui.wangyi.session.fragment.MessageFragment; -import com.yundian.celebrity.ui.wangyi.session.fragment.TeamMessageFragment; +import com.cloudTop.starshare.ui.wangyi.session.fragment.MessageFragment; +import com.cloudTop.starshare.ui.wangyi.session.fragment.TeamMessageFragment; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java index c8eb683..47129fc 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/activity/WatchSnapChatPictureActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.activity; +package com.cloudTop.starshare.ui.wangyi.session.activity; import android.content.Context; import android.content.Intent; @@ -21,8 +21,8 @@ import com.netease.nimlib.sdk.msg.MsgServiceObserve; import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.extension.SnapChatAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.extension.SnapChatAttachment; /** diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachParser.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachParser.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachParser.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachParser.java index e3796c8..21d7436 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachParser.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachParser.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachment.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachment.java index ad6875f..f5389a3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachmentType.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachmentType.java similarity index 76% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachmentType.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachmentType.java index ecbeedf..4b56f57 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/CustomAttachmentType.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/CustomAttachmentType.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; /** * Created by zhoujianghua on 2015/4/9. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/DefaultCustomAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/DefaultCustomAttachment.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/DefaultCustomAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/DefaultCustomAttachment.java index e8a38df..b690c92 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/DefaultCustomAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/DefaultCustomAttachment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/GuessAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/GuessAttachment.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/GuessAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/GuessAttachment.java index a68134a..af84ed4 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/GuessAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/GuessAttachment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSONObject; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/RTSAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/RTSAttachment.java similarity index 85% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/RTSAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/RTSAttachment.java index ef6df69..5d4f537 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/RTSAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/RTSAttachment.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSONObject; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.DemoCache; /** * Created by huangjun on 2015/7/28. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/SnapChatAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/SnapChatAttachment.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/SnapChatAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/SnapChatAttachment.java index 10301e5..ac42a2f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/SnapChatAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/SnapChatAttachment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/StickerAttachment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/StickerAttachment.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/StickerAttachment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/StickerAttachment.java index 9826f63..8ddbbfc 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/extension/StickerAttachment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/extension/StickerAttachment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.extension; +package com.cloudTop.starshare.ui.wangyi.session.extension; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.file.FileUtil; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/MessageFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/MessageFragment.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/MessageFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/MessageFragment.java index 17d342f..af7fc6f 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/MessageFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/MessageFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.fragment; +package com.cloudTop.starshare.ui.wangyi.session.fragment; import android.content.Intent; import android.media.AudioManager; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/TeamMessageFragment.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/TeamMessageFragment.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/TeamMessageFragment.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/TeamMessageFragment.java index 8a09506..a90d394 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/fragment/TeamMessageFragment.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/fragment/TeamMessageFragment.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.fragment; +package com.cloudTop.starshare.ui.wangyi.session.fragment; import android.app.Activity; import android.content.Intent; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/DisplayMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/DisplayMessageActivity.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/DisplayMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/DisplayMessageActivity.java index b81cda8..ebf432e 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/DisplayMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/DisplayMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.search; +package com.cloudTop.starshare.ui.wangyi.session.search; import android.content.Context; import android.content.Intent; @@ -14,7 +14,7 @@ import com.netease.nim.uikit.uinfo.UserInfoHelper; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * 搜索结果消息列表界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageActivity.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageActivity.java index bc6dfa9..c57b381 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.search; +package com.cloudTop.starshare.ui.wangyi.session.search; import android.content.Context; import android.content.Intent; @@ -25,7 +25,7 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.model.TeamMember; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageAdapter.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageAdapter.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageAdapter.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageAdapter.java index 89c0775..e9a90e1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/search/SearchMessageAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/search/SearchMessageAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.search; +package com.cloudTop.starshare.ui.wangyi.session.search; import android.content.Context; import android.text.style.ImageSpan; @@ -17,7 +17,7 @@ import com.netease.nim.uikit.session.emoji.MoonUtil; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java index c2429ad..b562370 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderAVChat.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.graphics.Color; import android.widget.ImageView; @@ -6,7 +6,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nim.uikit.session.viewholder.MsgViewHolderBase; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Created by zhoujianghua on 2015/8/6. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java index 1caf224..5ed54d1 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderDefCustom.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nim.uikit.session.viewholder.MsgViewHolderText; -import com.yundian.celebrity.ui.wangyi.session.extension.DefaultCustomAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.DefaultCustomAttachment; /** * Created by zhoujianghua on 2015/8/4. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderFile.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderFile.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderFile.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderFile.java index 3191ce3..0f9d76e 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderFile.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderFile.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.text.TextUtils; import android.view.View; @@ -12,9 +12,9 @@ import com.netease.nim.uikit.session.viewholder.MsgViewHolderBase; import com.netease.nimlib.sdk.msg.attachment.FileAttachment; import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.file.FileIcons; -import com.yundian.celebrity.ui.wangyi.session.activity.FileDownloadActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.file.FileIcons; +import com.cloudTop.starshare.ui.wangyi.session.activity.FileDownloadActivity; /** * Created by zhoujianghua on 2015/8/6. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderGuess.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderGuess.java similarity index 80% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderGuess.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderGuess.java index 2b4bb94..98ecad3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderGuess.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderGuess.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nim.uikit.session.viewholder.MsgViewHolderText; -import com.yundian.celebrity.ui.wangyi.session.extension.GuessAttachment; +import com.cloudTop.starshare.ui.wangyi.session.extension.GuessAttachment; /** * Created by zhoujianghua on 2015/8/4. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderRTS.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderRTS.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderRTS.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderRTS.java index 8f5c481..981eae3 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderRTS.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderRTS.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.widget.TextView; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nim.uikit.session.viewholder.MsgViewHolderBase; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.extension.RTSAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.extension.RTSAttachment; public class MsgViewHolderRTS extends MsgViewHolderBase { diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java index 3660a1b..b7ae448 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSnapChat.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.text.TextUtils; import android.view.MotionEvent; @@ -15,9 +15,9 @@ import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.activity.WatchSnapChatPictureActivity; -import com.yundian.celebrity.ui.wangyi.session.extension.SnapChatAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.activity.WatchSnapChatPictureActivity; +import com.cloudTop.starshare.ui.wangyi.session.extension.SnapChatAttachment; /** * Created by zhoujianghua on 2015/8/7. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSticker.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSticker.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSticker.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSticker.java index 8b5adea..e755bc0 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderSticker.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderSticker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.widget.ImageView; @@ -8,8 +8,8 @@ import com.netease.nim.uikit.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.session.viewholder.MsgViewHolderThumbBase; import com.nostra13.universalimageloader.core.ImageLoader; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.wangyi.session.extension.StickerAttachment; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.wangyi.session.extension.StickerAttachment; /** * Created by zhoujianghua on 2015/8/7. diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderTip.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderTip.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderTip.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderTip.java index 2aa5848..5a9f918 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/session/viewholder/MsgViewHolderTip.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/session/viewholder/MsgViewHolderTip.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.session.viewholder; +package com.cloudTop.starshare.ui.wangyi.session.viewholder; import android.text.TextUtils; import android.text.method.LinkMovementMethod; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/TeamCreateHelper.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/TeamCreateHelper.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/team/TeamCreateHelper.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/TeamCreateHelper.java index 4047755..3b13359 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/TeamCreateHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/TeamCreateHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.team; +package com.cloudTop.starshare.ui.wangyi.team; import android.content.Context; import android.os.Handler; @@ -18,9 +18,9 @@ import com.netease.nimlib.sdk.team.constant.TeamFieldEnum; import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.yundian.celebrity.ui.main.activity.MainActivity; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.session.SessionHelper; +import com.cloudTop.starshare.ui.main.activity.MainActivity; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.session.SessionHelper; import java.io.Serializable; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java index 6f70d96..848bd77 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamJoinActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.team.activity; +package com.cloudTop.starshare.ui.wangyi.team.activity; import android.content.Context; import android.content.Intent; @@ -17,7 +17,7 @@ import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.constant.TeamTypeEnum; import com.netease.nimlib.sdk.team.model.Team; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * 申请加入群组界面 diff --git a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java rename to app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java index 77666f5..e23c807 100644 --- a/app/src/main/java/com/yundian/celebrity/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/ui/wangyi/team/activity/AdvancedTeamSearchActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.ui.wangyi.team.activity; +package com.cloudTop.starshare.ui.wangyi.team.activity; import android.content.Context; import android.content.Intent; @@ -15,7 +15,7 @@ import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.team.TeamService; import com.netease.nimlib.sdk.team.model.Team; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * 搜索加入群组界面 diff --git a/app/src/main/java/com/yundian/celebrity/utils/AdViewpagerUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/AdViewpagerUtil.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/AdViewpagerUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/AdViewpagerUtil.java index 4f53c15..09743b9 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/AdViewpagerUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/AdViewpagerUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.os.Handler; @@ -10,7 +10,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /* * diff --git a/app/src/main/java/com/yundian/celebrity/utils/BuyHandleStatuUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/BuyHandleStatuUtils.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/utils/BuyHandleStatuUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/BuyHandleStatuUtils.java index 8da8455..6bc46de 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/BuyHandleStatuUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/BuyHandleStatuUtils.java @@ -1,6 +1,6 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * Created by sll on 2017/6/16. diff --git a/app/src/main/java/com/yundian/celebrity/utils/ChannelUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/ChannelUtil.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/ChannelUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/ChannelUtil.java index 9531335..df2f89c 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ChannelUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ChannelUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/yundian/celebrity/utils/CheckLoginUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/CheckLoginUtil.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/utils/CheckLoginUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/CheckLoginUtil.java index 05a69d0..9b715eb 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/CheckLoginUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/CheckLoginUtil.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Activity; import android.content.Intent; import android.text.TextUtils; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.main.activity.LoginActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.main.activity.LoginActivity; /** * Created by Administrator on 2017/6/6. diff --git a/app/src/main/java/com/yundian/celebrity/utils/CollectionUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/CollectionUtils.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/utils/CollectionUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/CollectionUtils.java index 4c27b24..ac9c140 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/CollectionUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/CollectionUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import java.util.Collection; diff --git a/app/src/main/java/com/yundian/celebrity/utils/CountUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/CountUtil.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/utils/CountUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/CountUtil.java index 52b9d69..b6257dd 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/CountUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/CountUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.graphics.Color; import android.os.CountDownTimer; diff --git a/app/src/main/java/com/yundian/celebrity/utils/DataCleanManagerTtil.java b/app/src/main/java/com/cloudTop/starshare/utils/DataCleanManagerTtil.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/DataCleanManagerTtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/DataCleanManagerTtil.java index 5cb7c28..78112a2 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/DataCleanManagerTtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/DataCleanManagerTtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.os.Environment; diff --git a/app/src/main/java/com/yundian/celebrity/utils/DatasUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/DatasUtil.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/utils/DatasUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/DatasUtil.java index c2dd085..9f3293f 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/DatasUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/DatasUtil.java @@ -1,9 +1,9 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import com.netease.nim.uikit.common.media.picker.model.PhotoInfo; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.bean.User; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.bean.User; import java.util.ArrayList; import java.util.List; @@ -277,11 +277,12 @@ public static CircleFriendBean.CircleListBean.ApproveListBean createFavortItem(i // * 创建发布评论 // * @return // - public static CircleFriendBean.CircleListBean.CommentListBean createPublicComment(String content,String Symbol_name){ + public static CircleFriendBean.CircleListBean.CommentListBean createPublicComment(String content,String Symbol_name,String User_name,long uid){ CircleFriendBean.CircleListBean.CommentListBean item = new CircleFriendBean.CircleListBean.CommentListBean(); item.setDirection(0); - item.setUser_name(SharePrefUtil.getInstance().getUserNickName()); - item.setUid(SharePrefUtil.getInstance().getUserId()); + item.setUser_name(User_name); + // TODO: 2017/9/8 + item.setUid(uid); item.setSymbol_name(Symbol_name); item.setContent(content); return item; @@ -291,11 +292,11 @@ public static CircleFriendBean.CircleListBean.CommentListBean createPublicCommen // * 创建回复评论 // * @return // - public static CircleFriendBean.CircleListBean.CommentListBean createReplyComment(String content,String Symbol_name){ + public static CircleFriendBean.CircleListBean.CommentListBean createReplyComment(String content,String Symbol_name,String username,long uid){ CircleFriendBean.CircleListBean.CommentListBean item = new CircleFriendBean.CircleListBean.CommentListBean(); item.setDirection(1); - item.setUser_name(SharePrefUtil.getInstance().getUserNickName()); - item.setUid(SharePrefUtil.getInstance().getUserId()); + item.setUser_name(username); + item.setUid(uid); item.setSymbol_name(Symbol_name); item.setContent(content); return item; diff --git a/app/src/main/java/com/yundian/celebrity/utils/DisplayUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/DisplayUtil.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/DisplayUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/DisplayUtil.java index 00f0940..ee42628 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/DisplayUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/DisplayUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Activity; import android.content.Context; @@ -11,7 +11,7 @@ import android.view.WindowManager; import android.widget.LinearLayout; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.app.AppApplication; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/ErrorCodeUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/ErrorCodeUtil.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/utils/ErrorCodeUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/ErrorCodeUtil.java index c1fafc3..5a73953 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ErrorCodeUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ErrorCodeUtil.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.text.TextUtils; -import com.yundian.celebrity.app.AppConstant; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; +import com.cloudTop.starshare.app.AppConstant; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPINettyBootstrap; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/utils/FormatUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/FormatUtil.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/FormatUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/FormatUtil.java index b6878c4..54921b0 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/FormatUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/FormatUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/utils/GetIPAddressUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/GetIPAddressUtils.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/utils/GetIPAddressUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/GetIPAddressUtils.java index 4e8b79a..4297af8 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/GetIPAddressUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/GetIPAddressUtils.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.text.TextUtils; import com.alibaba.fastjson.JSON; -import com.yundian.celebrity.bean.MyAddressBean; -import com.yundian.celebrity.bean.MyIpBean; +import com.cloudTop.starshare.bean.MyAddressBean; +import com.cloudTop.starshare.bean.MyIpBean; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/GlideRoundTransformUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/GlideRoundTransformUtil.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/utils/GlideRoundTransformUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/GlideRoundTransformUtil.java index 1fb25bb..0051cc8 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/GlideRoundTransformUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/GlideRoundTransformUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.graphics.Bitmap; diff --git a/app/src/main/java/com/yundian/celebrity/utils/HttpUrlConnectionUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/HttpUrlConnectionUtil.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/HttpUrlConnectionUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/HttpUrlConnectionUtil.java index e0fff66..228f9d0 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/HttpUrlConnectionUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/HttpUrlConnectionUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.util.Log; diff --git a/app/src/main/java/com/yundian/celebrity/utils/HttpUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/HttpUtils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/HttpUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/HttpUtils.java index 03d0cad..9e6f2f5 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/HttpUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/HttpUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; diff --git a/app/src/main/java/com/yundian/celebrity/utils/IPHttpUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/IPHttpUtils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/IPHttpUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/IPHttpUtils.java index 8821431..160fa66 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/IPHttpUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/IPHttpUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/app/src/main/java/com/yundian/celebrity/utils/ImageLoaderUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/ImageLoaderUtils.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/ImageLoaderUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/ImageLoaderUtils.java index 324cafc..1f82b61 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ImageLoaderUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ImageLoaderUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.widget.ImageView; @@ -6,8 +6,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.DecodeFormat; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppConfig; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppConfig; import java.io.File; @@ -151,7 +151,7 @@ public static void displayRound(Context context, ImageView imageView, int resId) } public static void displayWithDefaultImg(Context context, ImageView imageView, String url,int resurce) { - url = AppConfig.QI_NIU_PIC_ADRESS+url; +// url = AppConfig.QI_NIU_PIC_ADRESS+url; LogUtils.loge("ysl_url"+url); if (imageView == null) { throw new IllegalArgumentException("argument error"); @@ -166,14 +166,14 @@ public static void displayWithDefaultImg(Context context, ImageView imageView, S //预览图 public static void displayWithPreviewImg(Context context, final ImageView imageView, String url,int resurce) { - url = AppConfig.QI_NIU_PIC_ADRESS+url; +// url = AppConfig.QI_NIU_PIC_ADRESS+url; LogUtils.loge("ysl_url"+url); if (imageView == null) { throw new IllegalArgumentException("argument error"); } Glide.with(context) .load(url) - .fitCenter() +// .fitCenter() .diskCacheStrategy(DiskCacheStrategy.SOURCE) .placeholder(R.drawable.edit_cursor) .error(resurce) diff --git a/app/src/main/java/com/yundian/celebrity/utils/JsonUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/JsonUtils.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/JsonUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/JsonUtils.java index ca43abb..6a9fa32 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/JsonUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils;// +package com.cloudTop.starshare.utils;// // Source code recreated from a .class file by IntelliJ IDEA // (powered by Fernflower decompiler) // diff --git a/app/src/main/java/com/yundian/celebrity/utils/JudgeIdentityUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/JudgeIdentityUtils.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/JudgeIdentityUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/JudgeIdentityUtils.java index b3042bd..a243d7a 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/JudgeIdentityUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/JudgeIdentityUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Dialog; import android.content.Context; @@ -7,7 +7,7 @@ import android.widget.Button; import android.widget.ImageView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/JudgeIsSetPayPwd.java b/app/src/main/java/com/cloudTop/starshare/utils/JudgeIsSetPayPwd.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/utils/JudgeIsSetPayPwd.java rename to app/src/main/java/com/cloudTop/starshare/utils/JudgeIsSetPayPwd.java index 150289b..d2987bf 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/JudgeIsSetPayPwd.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/JudgeIsSetPayPwd.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Dialog; import android.content.Context; @@ -7,8 +7,8 @@ import android.widget.Button; import android.widget.ImageView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.main.activity.SettingDealPwdActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.main.activity.SettingDealPwdActivity; /** * 校验是否设置支付密码 diff --git a/app/src/main/java/com/yundian/celebrity/utils/KeyBordUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/KeyBordUtil.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/KeyBordUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/KeyBordUtil.java index 0c7d382..7148c85 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/KeyBordUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/KeyBordUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.view.View; diff --git a/app/src/main/java/com/cloudTop/starshare/utils/KiwiTrackWrapper.java b/app/src/main/java/com/cloudTop/starshare/utils/KiwiTrackWrapper.java new file mode 100644 index 0000000..c8d391f --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/utils/KiwiTrackWrapper.java @@ -0,0 +1,189 @@ +//package com.cloudTop.starshare.utils; +// +//import android.app.Activity; +//import android.content.Context; +//import android.opengl.GLES20; +//import android.os.Build; +//import android.util.Log; +// +//import com.kiwi.tracker.KwFaceTracker; +//import com.kiwi.tracker.KwFilterType; +//import com.kiwi.tracker.KwTrackerManager; +//import com.kiwi.tracker.KwTrackerSettings; +//import com.kiwi.tracker.bean.conf.StickerConfig; +//import com.kiwi.tracker.common.Config; +//import com.kiwi.ui.OnViewEventListener; +//import com.kiwi.ui.ResourceHelper; +//import com.kiwi.ui.SharedPreferenceManager; +// +//import static com.kiwi.ui.widget.KwControlView.BEAUTY_BIG_EYE_TYPE; +//import static com.kiwi.ui.widget.KwControlView.BEAUTY_THIN_FACE_TYPE; +//import static com.kiwi.ui.widget.KwControlView.REMOVE_BLEMISHES; +//import static com.kiwi.ui.widget.KwControlView.SKIN_SHINNING_TENDERNESS; +//import static com.kiwi.ui.widget.KwControlView.SKIN_TONE_PERFECTION; +//import static com.kiwi.ui.widget.KwControlView.SKIN_TONE_SATURATION; +// +// +//public class KiwiTrackWrapper { +// private static final String TAG = KiwiTrackWrapper.class.getName(); +// +// private KwTrackerSettings mKwTrackerSettings; +// private KwTrackerManager mKwTrackerManager; +// +// public KiwiTrackWrapper(Context context, int cameraFaceId) { +// SharedPreferenceManager spManager = SharedPreferenceManager.getInstance(); +// +// // 瘦脸大眼 +// KwTrackerSettings.BeautySettings beautySettings = new KwTrackerSettings.BeautySettings(); +// beautySettings.setBigEyeScaleProgress(spManager.getBigEye()); +// beautySettings.setThinFaceScaleProgress(spManager.getThinFace()); +// +// // 美颜 +// KwTrackerSettings.BeautySettings2 beautySettings2 = new KwTrackerSettings.BeautySettings2(); +// beautySettings2.setWhiteProgress(spManager.getSkinWhite()); +// beautySettings2.setDermabrasionProgress(spManager.getSkinRemoveBlemishes()); +// beautySettings2.setSaturatedProgress(spManager.getSkinSaturation()); +// beautySettings2.setPinkProgress(spManager.getSkinTenderness()); +// +// mKwTrackerSettings = new KwTrackerSettings(). +// setBeauty2Enabled(spManager.isBeautyEnabled()). +// setBeautySettings2(beautySettings2). +// setBeautyFaceEnabled(spManager.isLocalBeautyEnabled()). +// setBeautySettings(beautySettings). +// setCameraFaceId(cameraFaceId). +// setDefaultDirection(KwFaceTracker.CV_CLOCKWISE_ROTATE_180); +// +// mKwTrackerManager = new KwTrackerManager(context).setTrackerSetting(mKwTrackerSettings).build(); +// +// ResourceHelper.copyResource2SD(context); +// +// String manufacturer = Build.MANUFACTURER.toLowerCase(); +// Log.i(TAG, String.format("manufacturer:%s,model:%s,sdk:%s", manufacturer, Build.MODEL, Build.VERSION.SDK_INT)); +// boolean isOppoVivo = manufacturer.contains("oppo") || manufacturer.contains("vivo"); +// if (isOppoVivo || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { +// Config.TRACK_MODE = Config.TRACK_PRIORITY_PERFORMANCE; +// } +// //关闭日志打印,release版本请务必关闭日志打印 +// Config.isDebug = true; +// Config.outPutTestBitmap = true; +// } +// +// public void onCreate(Activity activity) { +// mKwTrackerManager.onCreate(activity); +// } +// +// public void onResume(Activity activity) { +// mKwTrackerManager.onResume(activity); +// } +// +// public void onPause(Activity activity) { +// mKwTrackerManager.onPause(activity); +// } +// +// public void onDestroy(Activity activity) { +// mKwTrackerManager.onDestory(activity); +// } +// +// public void onSurfaceCreated(Context context) { +// mKwTrackerManager.onSurfaceCreated(context); +// } +// +// public void onSurfaceChanged(int width, int height, int previewWidth, int previewHeight) { +// mKwTrackerManager.onSurfaceChanged(width, height, previewWidth, previewHeight); +// } +// +// public void onSurfaceDestroyed() { +// mKwTrackerManager.onSurfaceDestroyed(); +// } +// +// public void switchCamera(int ordinal) { +// mKwTrackerManager.switchCamera(ordinal); +// } +// +// /** +// * 对纹理进行特效处理（美颜、大眼瘦脸、人脸贴纸、哈哈镜、滤镜） +// * +// * @param texId YUV格式纹理 +// * @param texWidth 纹理宽度 +// * @param texHeight 纹理高度 +// * @return 特效处理后的纹理 +// */ +// public int onDrawFrame(int texId, int texWidth, int texHeight) { +// Log.e("tracker", "isNeedTrack:" + mKwTrackerSettings.isNeedTrack()); +// Log.e(TAG, "width" + texWidth + "-----height" + texHeight); +// +// int newTexId = texId; +// int filterTexId = mKwTrackerManager.onDrawTexture2D(texId, texWidth, texHeight, 1); +// Log.e(TAG, "filterTexId: " + filterTexId); +// if (filterTexId != -1) { +// newTexId = filterTexId; +// } +// int error = GLES20.glGetError(); //请勿删除当前行获取opengl错误代码 +// if (error != GLES20.GL_NO_ERROR) { +// Log.d("Tracker", "glError:" + error); +// } +// return newTexId; +// } +// +// public OnViewEventListener initUIEventListener() { +// OnViewEventListener eventListener = new OnViewEventListener() { +// +// @Override +// public void onStickerChanged(StickerConfig item) { +// getKwTrackerManager().switchSticker(item); +// Log.e(TAG, "switchSticker, item: " + item.getName() + " Dir: " + item.getDir()); +// } +// +// @Override +// public void onSwitchEyeAndThin(boolean enable) { +// getKwTrackerManager().setBeautyFaceEnabled(enable); +// } +// +// @Override +// public void onSwitchFaceBeauty(boolean enable) { +// getKwTrackerManager().setBeauty2Enabled(enable); +// } +// +// @Override +// public void onDistortionChanged(KwFilterType filterType) { +// getKwTrackerManager().switchDistortion(filterType); +// +// } +// +// @Override +// public void onAdjustFaceBeauty(int type, float param) { +// switch (type) { +// case BEAUTY_BIG_EYE_TYPE: +// getKwTrackerManager().setEyeMagnifying((int) param); +// break; +// case BEAUTY_THIN_FACE_TYPE: +// getKwTrackerManager().setChinSliming((int) param); +// break; +// case SKIN_SHINNING_TENDERNESS: +// getKwTrackerManager().setSkinTenderness((int) param); +// break; +// case SKIN_TONE_SATURATION: +// getKwTrackerManager().setSkinSaturation((int) param); +// break; +// case REMOVE_BLEMISHES: +// getKwTrackerManager().setSkinBlemishRemoval((int) param); +// break; +// case SKIN_TONE_PERFECTION: +// getKwTrackerManager().setSkinWhitening((int) param); +// break; +// } +// } +// +// @Override +// public void onFaceBeautyLevel(float level) { +// getKwTrackerManager().adjustBeauty(level); +// } +// +// private KwTrackerManager getKwTrackerManager() { +// return mKwTrackerManager; +// } +// }; +// +// return eventListener; +// } +//} diff --git a/app/src/main/java/com/yundian/celebrity/utils/ListViewUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/ListViewUtil.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/ListViewUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/ListViewUtil.java index 9a21c60..ce6b205 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ListViewUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ListViewUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/yundian/celebrity/utils/LogUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/LogUtils.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/utils/LogUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/LogUtils.java index 9052f11..ae3b92b 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/LogUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/LogUtils.java @@ -1,8 +1,8 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import com.orhanobut.logger.LogLevel; import com.orhanobut.logger.Logger; -import com.yundian.celebrity.app.AppConfig; +import com.cloudTop.starshare.app.AppConfig; /** * 如果用于android平台，将信息记录到“LogCat”。如果用于java平台，将信息记录到“Console” diff --git a/app/src/main/java/com/yundian/celebrity/utils/MD5Util.java b/app/src/main/java/com/cloudTop/starshare/utils/MD5Util.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/MD5Util.java rename to app/src/main/java/com/cloudTop/starshare/utils/MD5Util.java index 7775f5c..260426d 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/MD5Util.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/MD5Util.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/app/src/main/java/com/yundian/celebrity/utils/MyTabLayoutUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/MyTabLayoutUtils.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/utils/MyTabLayoutUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/MyTabLayoutUtils.java index 586da43..7192b53 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/MyTabLayoutUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/MyTabLayoutUtils.java @@ -14,14 +14,14 @@ * limitations under the License. * */ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Activity; import android.support.design.widget.TabLayout; import android.view.View; import android.view.ViewGroup; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.app.AppApplication; public class MyTabLayoutUtils { diff --git a/app/src/main/java/com/yundian/celebrity/utils/NetWorkUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/NetWorkUtil.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/NetWorkUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/NetWorkUtil.java index 226b6eb..4c1867d 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/NetWorkUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/NetWorkUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.net.ConnectivityManager; diff --git a/app/src/main/java/com/yundian/celebrity/utils/NumberUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/NumberUtils.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/NumberUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/NumberUtils.java index 6566017..34847bb 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/NumberUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/NumberUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yundian/celebrity/utils/ResultCodeUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/ResultCodeUtil.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/utils/ResultCodeUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/ResultCodeUtil.java index af2bd22..2f79e09 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ResultCodeUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ResultCodeUtil.java @@ -1,10 +1,10 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.text.TextUtils; -import com.yundian.celebrity.app.AppConstant; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.networkapi.socketapi.SocketReqeust.SocketAPIResponse; +import com.cloudTop.starshare.app.AppConstant; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.networkapi.socketapi.SocketReqeust.SocketAPIResponse; import org.greenrobot.eventbus.EventBus; import org.json.JSONException; diff --git a/app/src/main/java/com/yundian/celebrity/utils/SharePrefUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/SharePrefUtil.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/utils/SharePrefUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/SharePrefUtil.java index 75036ed..19fcc08 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/SharePrefUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/SharePrefUtil.java @@ -1,13 +1,13 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.content.SharedPreferences; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.bean.AssetDetailsBean; -import com.yundian.celebrity.bean.LoginReturnInfo; -import com.yundian.celebrity.bean.UserinfoBean; -import com.yundian.celebrity.ui.wangyi.DemoCache; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.bean.AssetDetailsBean; +import com.cloudTop.starshare.bean.LoginReturnInfo; +import com.cloudTop.starshare.bean.UserinfoBean; +import com.cloudTop.starshare.ui.wangyi.DemoCache; import static android.content.Context.MODE_PRIVATE; @@ -84,6 +84,27 @@ public void setToken(String token){ sp.edit().putString("token", token).apply(); } + public void setLoginCity(String city){ + sp = context.getSharedPreferences(UserInfo, MODE_PRIVATE); + sp.edit().putString("city", city).apply(); + } + public String getLoginCity() { + sp = context.getSharedPreferences(UserInfo, MODE_PRIVATE); + String city = sp.getString("city", ""); + return city; + } + + public void setLoginRegion(String region){ + sp = context.getSharedPreferences(UserInfo, MODE_PRIVATE); + sp.edit().putString("region", region).apply(); + } + public String getLoginRegion() { + sp = context.getSharedPreferences(UserInfo, MODE_PRIVATE); + String region = sp.getString("region", ""); + return region; + } + + /** * 清空UserInfo diff --git a/app/src/main/java/com/yundian/celebrity/utils/SoftKeyBoardListener.java b/app/src/main/java/com/cloudTop/starshare/utils/SoftKeyBoardListener.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/SoftKeyBoardListener.java rename to app/src/main/java/com/cloudTop/starshare/utils/SoftKeyBoardListener.java index 8141143..54d3453 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/SoftKeyBoardListener.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/SoftKeyBoardListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Activity; import android.graphics.Rect; diff --git a/app/src/main/java/com/yundian/celebrity/utils/StringUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/StringUtil.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/utils/StringUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/StringUtil.java index 8c55381..bd87009 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/StringUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/StringUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; /** * Created by yaowang on 16/4/1. diff --git a/app/src/main/java/com/yundian/celebrity/utils/SystemUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/SystemUtil.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/SystemUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/SystemUtil.java index 322d689..d1fc8fd 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/SystemUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/SystemUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.ActivityManager; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/utils/TUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/TUtil.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/utils/TUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/TUtil.java index 81a80d9..615844b 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/TUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/TUtil.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import java.lang.reflect.ParameterizedType; diff --git a/app/src/main/java/com/yundian/celebrity/utils/ThirdPartLoginControler.java b/app/src/main/java/com/cloudTop/starshare/utils/ThirdPartLoginControler.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/ThirdPartLoginControler.java rename to app/src/main/java/com/cloudTop/starshare/utils/ThirdPartLoginControler.java index 3b84773..f3200ab 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ThirdPartLoginControler.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ThirdPartLoginControler.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.app.Activity; import android.content.Intent; @@ -10,7 +10,7 @@ import com.umeng.socialize.UMShareAPI; import com.umeng.socialize.UMShareConfig; import com.umeng.socialize.bean.SHARE_MEDIA; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.app.AppApplication; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/com/yundian/celebrity/utils/TimeUtil.java b/app/src/main/java/com/cloudTop/starshare/utils/TimeUtil.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/TimeUtil.java rename to app/src/main/java/com/cloudTop/starshare/utils/TimeUtil.java index aa65c4b..17661cd 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/TimeUtil.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/TimeUtil.java @@ -1,10 +1,9 @@ /* * */ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.annotation.SuppressLint; -import android.provider.ContactsContract; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/com/yundian/celebrity/utils/ToastUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/ToastUtils.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/ToastUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/ToastUtils.java index 7044f05..0e01c3f 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ToastUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ToastUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.content.Context; import android.text.TextUtils; @@ -9,8 +9,8 @@ import android.widget.TextView; import android.widget.Toast; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.baseapp.BaseApplication; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.baseapp.BaseApplication; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/Utils.java b/app/src/main/java/com/cloudTop/starshare/utils/Utils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/Utils.java rename to app/src/main/java/com/cloudTop/starshare/utils/Utils.java index 3441d57..6374fbb 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/Utils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/Utils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; import android.annotation.TargetApi; import android.app.AppOpsManager; @@ -23,7 +23,7 @@ import android.widget.ListAdapter; import android.widget.ListView; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.app.AppApplication; import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; diff --git a/app/src/main/java/com/yundian/celebrity/utils/VerifyCodeUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/VerifyCodeUtils.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/utils/VerifyCodeUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/VerifyCodeUtils.java index 26029ef..a4ec20e 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/VerifyCodeUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/VerifyCodeUtils.java @@ -1,7 +1,7 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; -import com.yundian.celebrity.bean.RegisterVerifyCodeBeen; -import com.yundian.celebrity.widget.WPEditText; +import com.cloudTop.starshare.bean.RegisterVerifyCodeBeen; +import com.cloudTop.starshare.widget.WPEditText; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/ViewConcurrencyUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/ViewConcurrencyUtils.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/utils/ViewConcurrencyUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/ViewConcurrencyUtils.java index 1a85e79..4a2b505 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/ViewConcurrencyUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/ViewConcurrencyUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils; +package com.cloudTop.starshare.utils; /** diff --git a/app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeController.java b/app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeController.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeController.java rename to app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeController.java index 3958aea..1ba4de9 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeController.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeController.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.daynightmodeutils; +package com.cloudTop.starshare.utils.daynightmodeutils; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -18,7 +18,7 @@ import android.view.ViewGroup; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeHelper.java b/app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeHelper.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeHelper.java rename to app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeHelper.java index 6b3c97b..8ba073f 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/daynightmodeutils/ChangeModeHelper.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/daynightmodeutils/ChangeModeHelper.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.daynightmodeutils; +package com.cloudTop.starshare.utils.daynightmodeutils; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPickTask.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPickTask.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPickTask.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPickTask.java index b05f1d3..4d2225a 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPickTask.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPickTask.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.app.ProgressDialog; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPicker.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPicker.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPicker.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPicker.java index cd70613..d3a168c 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/AddressPicker.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/AddressPicker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Area.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Area.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Area.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Area.java index 690831c..2eab112 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Area.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Area.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.text.TextUtils; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/BasicPopup.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/BasicPopup.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/BasicPopup.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/BasicPopup.java index 2cf615e..f67d45c 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/BasicPopup.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/BasicPopup.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.app.Dialog; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/City.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/City.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/City.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/City.java index 8b3dd99..967dc2e 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/City.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/City.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConfirmPopup.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConfirmPopup.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConfirmPopup.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConfirmPopup.java index f64190b..0382d50 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConfirmPopup.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConfirmPopup.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.graphics.Color; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConvertUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConvertUtils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConvertUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConvertUtils.java index 5c6db05..71bc9c6 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ConvertUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ConvertUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.annotation.TargetApi; import android.content.ContentUris; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/County.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/County.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/County.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/County.java index 640a78d..488497f 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/County.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/County.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; /** * 区县 diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DatePicker.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DatePicker.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DatePicker.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DatePicker.java index e6fff54..66cfd6e 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DatePicker.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DatePicker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateTimePicker.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateTimePicker.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateTimePicker.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateTimePicker.java index b43d974..7d7202f 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateTimePicker.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateTimePicker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.support.annotation.IntDef; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateUtils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateUtils.java index d1136ca..7be1403 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/DateUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/DateUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.support.annotation.IntDef; import android.support.annotation.NonNull; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/JavaBean.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/JavaBean.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/JavaBean.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/JavaBean.java index bae4728..faf1a80 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/JavaBean.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/JavaBean.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageFirst.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageFirst.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageFirst.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageFirst.java index 29ea545..47a1b58 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageFirst.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageFirst.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageItem.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageItem.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageItem.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageItem.java index 69a1b8b..b9951e4 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageItem.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageItem.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; /** * 用于联动选择器展示的条目 diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkagePicker.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkagePicker.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkagePicker.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkagePicker.java index 63057ba..faa6560 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkagePicker.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkagePicker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.support.annotation.FloatRange; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageSecond.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageSecond.java similarity index 83% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageSecond.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageSecond.java index cea9374..ae7d029 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageSecond.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageSecond.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageThird.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageThird.java similarity index 80% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageThird.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageThird.java index b1747f6..6d8d4e2 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/LinkageThird.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/LinkageThird.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; /** * 用于联动选择器展示的第三级条目 diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Province.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Province.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Province.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Province.java index 2392004..b1f7f5a 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/Province.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/Province.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ScreenUtils.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ScreenUtils.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ScreenUtils.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ScreenUtils.java index f3e6721..2aafe13 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/ScreenUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/ScreenUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelItem.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelItem.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelItem.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelItem.java index 03c2cc8..2bfa059 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelItem.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelItem.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; /** * 用于滑轮选择器展示的条目 diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelPicker.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelPicker.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelPicker.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelPicker.java index f8af0dc..27064c3 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelPicker.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelPicker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.app.Activity; import android.support.annotation.ColorInt; diff --git a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelView.java b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelView.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelView.java rename to app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelView.java index 429b97e..203472c 100644 --- a/app/src/main/java/com/yundian/celebrity/utils/timeselectutils/WheelView.java +++ b/app/src/main/java/com/cloudTop/starshare/utils/timeselectutils/WheelView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.utils.timeselectutils; +package com.cloudTop.starshare.utils.timeselectutils; import android.content.Context; import android.graphics.Canvas; diff --git a/app/src/main/java/com/yundian/celebrity/widget/AudioRecordButton.java b/app/src/main/java/com/cloudTop/starshare/widget/AudioRecordButton.java similarity index 85% rename from app/src/main/java/com/yundian/celebrity/widget/AudioRecordButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/AudioRecordButton.java index f502300..d015d21 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/AudioRecordButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/AudioRecordButton.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.graphics.Bitmap; @@ -7,8 +7,7 @@ import android.graphics.Paint; import android.util.AttributeSet; -import com.yundian.celebrity.R; -import com.yundian.celebrity.widget.photobutton.CaptureButton; +import com.cloudTop.starshare.widget.photobutton.CaptureButton; /** * Created by Administrator on 2017/8/29. @@ -23,8 +22,8 @@ public AudioRecordButton(Context context, AttributeSet attrs) { super(context, attrs); } - public AudioRecordButton(Context context, int size) { - super(context, size); + public AudioRecordButton(Context context, int size,int bitmapRes) { + super(context, size,bitmapRes); } @Override @@ -48,7 +47,7 @@ protected void onDraw(Canvas canvas) { canvas.drawArc(rectF, -90, progress, false, mPaint); } - Bitmap bitmap = BitmapFactory.decodeResource(getResources(), R.drawable.audio); + Bitmap bitmap = BitmapFactory.decodeResource(getResources(), bitmapRes); canvas.drawBitmap(bitmap,center_X-bitmap.getWidth()/2,center_Y-bitmap.getHeight()/2,null); } diff --git a/app/src/main/java/com/yundian/celebrity/widget/BaseLinearLayout.java b/app/src/main/java/com/cloudTop/starshare/widget/BaseLinearLayout.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/widget/BaseLinearLayout.java rename to app/src/main/java/com/cloudTop/starshare/widget/BaseLinearLayout.java index 912f8ed..4668892 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/BaseLinearLayout.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/BaseLinearLayout.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.util.AttributeSet; @@ -6,7 +6,7 @@ import android.view.View; import android.widget.LinearLayout; -import com.yundian.celebrity.listener.OnChildViewClickListener; +import com.cloudTop.starshare.listener.OnChildViewClickListener; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/yundian/celebrity/widget/CheckException.java b/app/src/main/java/com/cloudTop/starshare/widget/CheckException.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/widget/CheckException.java rename to app/src/main/java/com/cloudTop/starshare/widget/CheckException.java index 1b00620..8ea5d2f 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/CheckException.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/CheckException.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; /** * @author : created by chuangWu diff --git a/app/src/main/java/com/yundian/celebrity/widget/CircleMovementMethod.java b/app/src/main/java/com/cloudTop/starshare/widget/CircleMovementMethod.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/CircleMovementMethod.java rename to app/src/main/java/com/cloudTop/starshare/widget/CircleMovementMethod.java index d485805..cd371b2 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/CircleMovementMethod.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/CircleMovementMethod.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.text.Layout; import android.text.Selection; @@ -10,8 +10,8 @@ import android.view.MotionEvent; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; public class CircleMovementMethod extends BaseMovementMethod { public final String TAG = CircleMovementMethod.class.getSimpleName(); diff --git a/app/src/main/java/com/yundian/celebrity/widget/ClearEditText.java b/app/src/main/java/com/cloudTop/starshare/widget/ClearEditText.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/ClearEditText.java rename to app/src/main/java/com/cloudTop/starshare/widget/ClearEditText.java index cf58b32..597405b 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/ClearEditText.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/ClearEditText.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.graphics.drawable.Drawable; @@ -10,8 +10,8 @@ import android.view.View; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.listener.OnTextChangeListener; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.listener.OnTextChangeListener; ; diff --git a/app/src/main/java/com/yundian/celebrity/widget/CommentListView.java b/app/src/main/java/com/cloudTop/starshare/widget/CommentListView.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/widget/CommentListView.java rename to app/src/main/java/com/cloudTop/starshare/widget/CommentListView.java index d0ef050..eca0441 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/CommentListView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/CommentListView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; @@ -17,10 +17,10 @@ import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.CircleFriendBean; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.widget.emoji.MoonUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.CircleFriendBean; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.widget.emoji.MoonUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/cloudTop/starshare/widget/CustomPopupWindow.java b/app/src/main/java/com/cloudTop/starshare/widget/CustomPopupWindow.java new file mode 100644 index 0000000..6db1b4d --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/widget/CustomPopupWindow.java @@ -0,0 +1,198 @@ +package com.cloudTop.starshare.widget; + +import android.content.Context; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.os.Build; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.PopupWindow; +import android.widget.Toast; + +/** + * Created by Administrator on 2017/8/19. + */ + +public class CustomPopupWindow { + private PopupWindow mPopupWindow; + private View contentview; + private Context mContext; + public CustomPopupWindow(Builder builder) { + mContext = builder.context; + contentview = LayoutInflater.from(mContext).inflate(builder.contentviewid,null); + mPopupWindow = + new PopupWindow(contentview,builder.width,builder.height,builder.fouse); + + //需要跟 setBackGroundDrawable 结合 + mPopupWindow.setOutsideTouchable(builder.outsidecancel); + mPopupWindow.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + mPopupWindow.setAnimationStyle(builder.animstyle); + + + + } + + + + /** + * popup 消失 + */ + public void dismiss(){ + if (mPopupWindow != null){ + mPopupWindow.dismiss(); + } + } + + /** + * 根据id获取view + * @param viewid + * @return + */ + public View getItemView(int viewid){ + if (mPopupWindow != null){ + return this.contentview.findViewById(viewid); + } + return null; + } + + /** + * 根据父布局，显示位置 + * @param rootviewid + * @param gravity + * @param x + * @param y + * @return + */ + public CustomPopupWindow showAtLocation(int rootviewid,int gravity,int x,int y){ + if (mPopupWindow != null){ + View rootview = LayoutInflater.from(mContext).inflate(rootviewid,null); + mPopupWindow.showAtLocation(rootview,gravity,x,y); + } + return this; + } + + public CustomPopupWindow showAtLocation(View targetview,int gravity,int x,int y){ + if (mPopupWindow != null){ +// View rootview = LayoutInflater.from(mContext).inflate(rootviewid,null); + mPopupWindow.showAtLocation(targetview,gravity,x,y); + } + return this; + } + + public CustomPopupWindow showAtLocation(View targetview){ + if (mPopupWindow != null){ + int[] location = new int[2]; + targetview.getLocationOnScreen(location); + +// View rootview = LayoutInflater.from(mContext).inflate(rootviewid,null); + mPopupWindow.showAtLocation(targetview, Gravity.NO_GRAVITY,location[0]+targetview.getWidth(),location[1]-mPopupWindow.getHeight()); + } + return this; + } + + /** + * 根据id获取view ，并显示在该view的位置 + * @param targetviewId + * @param gravity + * @param offx + * @param offy + * @return + */ + public CustomPopupWindow showAsLaction(int targetviewId,int gravity,int offx,int offy){ + if (mPopupWindow != null){ + View targetview = LayoutInflater.from(mContext).inflate(targetviewId,null); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + mPopupWindow.showAsDropDown(targetview,gravity,offx,offy); + }else{ + // TODO: 2017/8/19 + Toast.makeText(mContext,"手机版本兼容下啦",Toast.LENGTH_SHORT).show(); + + } + } + return this; + } + + /** + * 显示在 targetview 的不同位置 + * @param targetview + * @param gravity + * @param offx + * @param offy + * @return + */ + public CustomPopupWindow showAsLaction(View targetview,int gravity,int offx,int offy){ + if (mPopupWindow != null){ + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + mPopupWindow.showAsDropDown(targetview,gravity,offx,offy); + } + } + return this; + } + + + /** + * 根据id设置焦点监听 + * @param viewid + * @param listener + */ + public void setOnFocusListener(int viewid,View.OnFocusChangeListener listener){ + View view = getItemView(viewid); + view.setOnFocusChangeListener(listener); + } + + + /** + * builder 类 + */ + public static class Builder{ + private int contentviewid; + private int width; + private int height; + private boolean fouse; + private boolean outsidecancel; + private int animstyle; + private Context context; + + public Builder setContext(Context context){ + this.context = context; + return this; + } + + + public Builder setContentView(int contentviewid){ + this.contentviewid = contentviewid; + return this; + } + + public Builder setwidth(int width){ + this.width = width; + return this; + } + public Builder setheight(int height){ + this.height = height; + return this; + } + + public Builder setFouse(boolean fouse){ + this.fouse = fouse; + return this; + } + + public Builder setOutSideCancel(boolean outsidecancel){ + this.outsidecancel = outsidecancel; + return this; + } + public Builder setAnimationStyle(int animstyle){ + this.animstyle = animstyle; + return this; + } + + + + public CustomPopupWindow builder(){ + return new CustomPopupWindow(this); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/yundian/celebrity/widget/EasySwitchButton.java b/app/src/main/java/com/cloudTop/starshare/widget/EasySwitchButton.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/EasySwitchButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/EasySwitchButton.java index fa7724b..aec5675 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/EasySwitchButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/EasySwitchButton.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -12,7 +12,7 @@ public interface OnOpenedListener { void onChecked(View v, boolean isOpened); } - private String NAMESPACE = "http://schemas.android.com/apk/res/com.yundian.celebrity"; + private String NAMESPACE = "http://schemas.android.com/apk/res/com.cloudTop.starshare"; private String ATTR_IS_OPENED = "isOpened"; Bitmap mSwitchBackOn; diff --git a/app/src/main/java/com/yundian/celebrity/widget/LoadingDialog.java b/app/src/main/java/com/cloudTop/starshare/widget/LoadingDialog.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/widget/LoadingDialog.java rename to app/src/main/java/com/cloudTop/starshare/widget/LoadingDialog.java index 0447111..b85d2d5 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/LoadingDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/LoadingDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.app.Dialog; @@ -7,7 +7,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/widget/LoadingTip.java b/app/src/main/java/com/cloudTop/starshare/widget/LoadingTip.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/LoadingTip.java rename to app/src/main/java/com/cloudTop/starshare/widget/LoadingTip.java index e559a10..736f7dc 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/LoadingTip.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/LoadingTip.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.annotation.TargetApi; import android.content.Context; @@ -12,7 +12,7 @@ import android.widget.ProgressBar; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * des:加载页面内嵌提示 diff --git a/app/src/main/java/com/yundian/celebrity/widget/LogoutDialog.java b/app/src/main/java/com/cloudTop/starshare/widget/LogoutDialog.java similarity index 82% rename from app/src/main/java/com/yundian/celebrity/widget/LogoutDialog.java rename to app/src/main/java/com/cloudTop/starshare/widget/LogoutDialog.java index 7169a49..e2bdb86 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/LogoutDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/LogoutDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.app.Dialog; @@ -8,13 +8,13 @@ import android.view.View; import android.widget.TextView; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.ui.main.activity.MainActivity; -import com.yundian.celebrity.R; -import com.yundian.celebrity.base.baseapp.AppManager; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.login.LogoutHelper; -import com.yundian.celebrity.utils.SharePrefUtil; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.ui.main.activity.MainActivity; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.base.baseapp.AppManager; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.login.LogoutHelper; +import com.cloudTop.starshare.utils.SharePrefUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/widget/MyListView.java b/app/src/main/java/com/cloudTop/starshare/widget/MyListView.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/widget/MyListView.java rename to app/src/main/java/com/cloudTop/starshare/widget/MyListView.java index c389977..d064e82 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/MyListView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/MyListView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yundian/celebrity/widget/NormalTitleBar.java b/app/src/main/java/com/cloudTop/starshare/widget/NormalTitleBar.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/NormalTitleBar.java rename to app/src/main/java/com/cloudTop/starshare/widget/NormalTitleBar.java index 2c0c72e..2e08eee 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/NormalTitleBar.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/NormalTitleBar.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.content.Context; @@ -9,8 +9,8 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.DisplayUtil; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.DisplayUtil; public class NormalTitleBar extends RelativeLayout { diff --git a/app/src/main/java/com/yundian/celebrity/widget/NumberBoubleButton.java b/app/src/main/java/com/cloudTop/starshare/widget/NumberBoubleButton.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/NumberBoubleButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/NumberBoubleButton.java index 9812d03..a0a61ab 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/NumberBoubleButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/NumberBoubleButton.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.content.Context; @@ -30,8 +30,8 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.LogUtils; /** * 价格浮点型数据 diff --git a/app/src/main/java/com/yundian/celebrity/widget/NumberButton.java b/app/src/main/java/com/cloudTop/starshare/widget/NumberButton.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/NumberButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/NumberButton.java index e3ab960..fae15da 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/NumberButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/NumberButton.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.content.Context; @@ -30,7 +30,7 @@ import android.widget.LinearLayout; import android.widget.TextView; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * 购物车商品数量、增加和减少控制按钮。 diff --git a/app/src/main/java/com/yundian/celebrity/widget/PasswordView.java b/app/src/main/java/com/cloudTop/starshare/widget/PasswordView.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/widget/PasswordView.java rename to app/src/main/java/com/cloudTop/starshare/widget/PasswordView.java index 2e5a214..7a756bb 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/PasswordView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/PasswordView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.content.Intent; @@ -12,18 +12,18 @@ import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.bean.OrderReturnBeen; -import com.yundian.celebrity.bean.RequestResultBean; -import com.yundian.celebrity.listener.OnAPIListener; -import com.yundian.celebrity.networkapi.NetworkAPIFactoryImpl; -import com.yundian.celebrity.ui.main.activity.ResetPayPwdActivity; -import com.yundian.celebrity.ui.main.adapter.KeyBoardAdapter; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.MD5Util; -import com.yundian.celebrity.utils.SharePrefUtil; -import com.yundian.celebrity.utils.ToastUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.bean.OrderReturnBeen; +import com.cloudTop.starshare.bean.RequestResultBean; +import com.cloudTop.starshare.listener.OnAPIListener; +import com.cloudTop.starshare.networkapi.NetworkAPIFactoryImpl; +import com.cloudTop.starshare.ui.main.activity.ResetPayPwdActivity; +import com.cloudTop.starshare.ui.main.adapter.KeyBoardAdapter; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.MD5Util; +import com.cloudTop.starshare.utils.SharePrefUtil; +import com.cloudTop.starshare.utils.ToastUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/widget/PraiseListView.java b/app/src/main/java/com/cloudTop/starshare/widget/PraiseListView.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/widget/PraiseListView.java rename to app/src/main/java/com/cloudTop/starshare/widget/PraiseListView.java index 9773ca3..ba0fb5b 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/PraiseListView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/PraiseListView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.content.res.TypedArray; @@ -12,9 +12,9 @@ import android.util.AttributeSet; import android.view.View; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.bean.CircleFriendBean; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.bean.CircleFriendBean; import java.util.List; diff --git a/app/src/main/java/com/yundian/celebrity/widget/PutPasPopupWindow.java b/app/src/main/java/com/cloudTop/starshare/widget/PutPasPopupWindow.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/PutPasPopupWindow.java rename to app/src/main/java/com/cloudTop/starshare/widget/PutPasPopupWindow.java index 9d05db0..eac6389 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/PutPasPopupWindow.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/PutPasPopupWindow.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.animation.ValueAnimator; import android.app.Activity; diff --git a/app/src/main/java/com/yundian/celebrity/widget/SimpleTextWatcher.java b/app/src/main/java/com/cloudTop/starshare/widget/SimpleTextWatcher.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/widget/SimpleTextWatcher.java rename to app/src/main/java/com/cloudTop/starshare/widget/SimpleTextWatcher.java index 8544f0d..f360e8b 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/SimpleTextWatcher.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/SimpleTextWatcher.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.text.Editable; import android.text.TextWatcher; diff --git a/app/src/main/java/com/yundian/celebrity/widget/SnsPopupWindow.java b/app/src/main/java/com/cloudTop/starshare/widget/SnsPopupWindow.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/widget/SnsPopupWindow.java rename to app/src/main/java/com/cloudTop/starshare/widget/SnsPopupWindow.java index f3e2317..a5371f8 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/SnsPopupWindow.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/SnsPopupWindow.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.graphics.Rect; @@ -10,9 +10,9 @@ import android.widget.PopupWindow; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.ActionItem; -import com.yundian.celebrity.utils.DisplayUtil; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.ActionItem; +import com.cloudTop.starshare.utils.DisplayUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/yundian/celebrity/widget/SpannableClickable.java b/app/src/main/java/com/cloudTop/starshare/widget/SpannableClickable.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/widget/SpannableClickable.java rename to app/src/main/java/com/cloudTop/starshare/widget/SpannableClickable.java index 99033c6..a47c229 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/SpannableClickable.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/SpannableClickable.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.text.TextPaint; import android.text.style.ClickableSpan; import android.view.View; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; /** * @author yiw diff --git a/app/src/main/java/com/yundian/celebrity/widget/StatusBarCompat.java b/app/src/main/java/com/cloudTop/starshare/widget/StatusBarCompat.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/StatusBarCompat.java rename to app/src/main/java/com/cloudTop/starshare/widget/StatusBarCompat.java index 5961923..14340e2 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/StatusBarCompat.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/StatusBarCompat.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/widget/VirtualKeyboardView.java b/app/src/main/java/com/cloudTop/starshare/widget/VirtualKeyboardView.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/widget/VirtualKeyboardView.java rename to app/src/main/java/com/cloudTop/starshare/widget/VirtualKeyboardView.java index 76c1aad..4019870 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/VirtualKeyboardView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/VirtualKeyboardView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.util.AttributeSet; @@ -6,8 +6,8 @@ import android.widget.GridView; import android.widget.RelativeLayout; -import com.yundian.celebrity.R; -import com.yundian.celebrity.ui.main.adapter.KeyBoardAdapter; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.ui.main.adapter.KeyBoardAdapter; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/yundian/celebrity/widget/WPEditText.java b/app/src/main/java/com/cloudTop/starshare/widget/WPEditText.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/WPEditText.java rename to app/src/main/java/com/cloudTop/starshare/widget/WPEditText.java index 56cb838..627d108 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/WPEditText.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/WPEditText.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.content.Context; import android.content.res.TypedArray; @@ -11,9 +11,9 @@ import android.widget.ImageView; import android.widget.TextView; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.StringUtil; -import com.yundian.celebrity.utils.ToastUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.StringUtil; +import com.cloudTop.starshare.utils.ToastUtils; import butterknife.Bind; diff --git a/app/src/main/java/com/yundian/celebrity/widget/ZoomImageView.java b/app/src/main/java/com/cloudTop/starshare/widget/ZoomImageView.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/ZoomImageView.java rename to app/src/main/java/com/cloudTop/starshare/widget/ZoomImageView.java index 49f42a1..143a356 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/ZoomImageView.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/ZoomImageView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget; +package com.cloudTop.starshare.widget; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/widget/audioplayer/MyAudioPlayer.java b/app/src/main/java/com/cloudTop/starshare/widget/audioplayer/MyAudioPlayer.java similarity index 62% rename from app/src/main/java/com/yundian/celebrity/widget/audioplayer/MyAudioPlayer.java rename to app/src/main/java/com/cloudTop/starshare/widget/audioplayer/MyAudioPlayer.java index 61c049e..6425344 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/audioplayer/MyAudioPlayer.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/audioplayer/MyAudioPlayer.java @@ -1,7 +1,10 @@ -package com.yundian.celebrity.widget.audioplayer; +package com.cloudTop.starshare.widget.audioplayer; import android.media.AudioManager; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ToastUtils; + import java.io.IOException; import tv.danmaku.ijk.media.player.IMediaPlayer; @@ -15,7 +18,9 @@ public class MyAudioPlayer { private IjkMediaPlayer ijkMediaPlayer; private boolean mIsStopped=true; + private boolean mIsError=false; private boolean isPrepared=false; + private IMediaPlayer.OnCompletionListener mCompletionListener; public MyAudioPlayer() { @@ -24,6 +29,7 @@ public MyAudioPlayer() { IjkMediaPlayer.native_profileBegin("libijkplayer.so"); ijkMediaPlayer = new IjkMediaPlayer(); ijkMediaPlayer.setOnPreparedListener(mPreparedListener); + ijkMediaPlayer.setOnErrorListener(mErrorListener); ijkMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); } @@ -37,19 +43,38 @@ public void onPrepared(IMediaPlayer mp) { }; public void setOnCompleteListener(IMediaPlayer.OnCompletionListener mCompletionListener){ + this.mCompletionListener=mCompletionListener; ijkMediaPlayer.setOnCompletionListener(mCompletionListener); } + IMediaPlayer.OnErrorListener mErrorListener=new IMediaPlayer.OnErrorListener() { + @Override + public boolean onError(IMediaPlayer iMediaPlayer, int i, int i1) { + isPrepared=false; + mIsError=true; + resetWithError(); +// stop(); + LogUtils.logd("urlerror"); + ToastUtils.showShort("获取url链接失败"); + return true; + } + }; public MyAudioPlayer setDataSource(String path) { try { - isPrepared=true; + if(!mIsStopped){ stop(); } +// if(mIsError){ +// resetWithError(); +// } + ijkMediaPlayer.setDataSource(path); + isPrepared=true; ijkMediaPlayer.prepareAsync(); } catch (IOException e) { e.printStackTrace(); + } return this; } @@ -64,19 +89,34 @@ private void start() { public void stop(){ if (ijkMediaPlayer != null&&!mIsStopped) { ijkMediaPlayer.stop(); + ijkMediaPlayer.reset(); } mIsStopped = true; // mMediaPlayer = null; } - public void release(){ + public void releaseMedia(){ if (ijkMediaPlayer != null) { ijkMediaPlayer.stop(); ijkMediaPlayer.release(); ijkMediaPlayer = null; } } + + public void resetWithError(){ + if (ijkMediaPlayer != null) { +// ijkMediaPlayer.stop(); + ijkMediaPlayer.release(); + ijkMediaPlayer =new IjkMediaPlayer(); + ijkMediaPlayer.setOnPreparedListener(mPreparedListener); + ijkMediaPlayer.setOnErrorListener(mErrorListener); + + ijkMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); + setOnCompleteListener(mCompletionListener); + } + mIsError=false; + } public boolean isMediaPlayerStop(){ return mIsStopped; } diff --git a/app/src/main/java/com/yundian/celebrity/widget/audiorecorder/AndroidAACProcessor.java b/app/src/main/java/com/cloudTop/starshare/widget/audiorecorder/AndroidAACProcessor.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/audiorecorder/AndroidAACProcessor.java rename to app/src/main/java/com/cloudTop/starshare/widget/audiorecorder/AndroidAACProcessor.java index 54710b1..e28673e 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/audiorecorder/AndroidAACProcessor.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/audiorecorder/AndroidAACProcessor.java @@ -1,11 +1,9 @@ -package com.yundian.celebrity.widget.audiorecorder; +package com.cloudTop.starshare.widget.audiorecorder; import android.media.MediaCodec; import android.media.MediaCodecInfo; import android.media.MediaCodecList; import android.media.MediaFormat; -import android.os.Build; -import android.support.annotation.RequiresApi; import android.util.Log; import com.liulishuo.engzo.lingorecorder.processor.AudioProcessor; @@ -274,7 +272,7 @@ public void end() { // try { // if (codec != null) { // codec.stop(); -// codec.release(); +// codec.resetWithError(); // codec = null; // } // diff --git a/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/CustomUIVideo.java b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/CustomUIVideo.java new file mode 100644 index 0000000..32f11ee --- /dev/null +++ b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/CustomUIVideo.java @@ -0,0 +1,378 @@ +package com.cloudTop.starshare.widget.customVideoPlayer; + +import android.app.Activity; +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.widget.ImageView; +import android.widget.ProgressBar; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.shuyu.gsyvideoplayer.utils.Debuger; +import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.bean.FansAskBean; +import com.cloudTop.starshare.utils.ImageLoaderUtils; +import com.cloudTop.starshare.utils.LogUtils; + +import java.util.Timer; +import java.util.TimerTask; + +import moe.codeest.enviews.ENDownloadView; + +/** + * Created by shuyu on 2016/12/7. + * 注意 + * 这个播放器的demo配置切换到全屏播放器 + * 这只是单纯的作为全屏播放显示，如果需要做大小屏幕切换，请记得在这里耶设置上视频全屏的需要的自定义配置 + */ + +public class CustomUIVideo extends StandardGSYVideoPlayer { + + private ProgressBar topProgress; + + private ImageView close; + private ImageView ivHead; + private TextView tvName; + private TextView tvQuestion; + private ImageView question; + private RelativeLayout askContent; + + public CustomUIVideo(Context context, Boolean fullFlag) { + super(context, fullFlag); + } + + public CustomUIVideo(Context context) { + super(context); + } + + public CustomUIVideo(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public int getLayoutId() { + return R.layout.video_layout_customed; + } + + @Override + protected void init(Context context) { + super.init(context); + this.mContext = context; + initView(); + } + + private void initView() { + question = (ImageView) findViewById(R.id.iv_question); + + topProgress = (ProgressBar) findViewById(R.id.top_progressbar); + close = (ImageView) findViewById(R.id.close); + + + askContent = (RelativeLayout) findViewById(R.id.rl_ask_content); + ivHead = (ImageView) findViewById(R.id.iv_head); + tvName = (TextView) findViewById(R.id.tv_name); + tvQuestion = (TextView) findViewById(R.id.tv_question_content); + + question.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { +// CustomPopupWindow popupWindow = new CustomPopupWindow.Builder() +// .setContext(mContext) //设置 context +// .setContentView(R.layout.content_ask) //设置布局文件 +// .setwidth(LinearLayout.LayoutParams.WRAP_CONTENT) //设置宽度，由于我已经在布局写好，这里就用 wrap_content就好了 +// .setheight(LinearLayout.LayoutParams.WRAP_CONTENT) //设置高度 +// .setFouse(true) //设置popupwindow 是否可以获取焦点 +// .setOutSideCancel(true) //设置点击外部取消 +// .setAnimationStyle(R.style.popup_anim_style) //设置popupwindow动画 +// .builder() // +// .showAtLocation(question); //设置popupwindow居中显示 + + if(askContent.getVisibility()==View.VISIBLE){ + askContent.setVisibility(View.GONE); + }else{ + askContent.setVisibility(View.VISIBLE); + } + } + }); + + close.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { +// getBackButton().performClick(); + callBack.onClickBack(); + + } + }); + + +// final LinearLayout anchor = (LinearLayout)findViewById(R.id.anchor); + + +// question.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// CustomPopupWindow popupWindow = new CustomPopupWindow.Builder() +// .setContext(mContext) //设置 context +// .setContentView(R.layout.content_ask) //设置布局文件 +// .setwidth(LinearLayout.LayoutParams.WRAP_CONTENT) //设置宽度，由于我已经在布局写好，这里就用 wrap_content就好了 +// .setheight(LinearLayout.LayoutParams.WRAP_CONTENT) //设置高度 +// .setFouse(true) //设置popupwindow 是否可以获取焦点 +// .setOutSideCancel(true) //设置点击外部取消 +// .setAnimationStyle(R.style.popup_anim_style) //设置popupwindow动画 +// .builder() // +// .showAtLocation(question); //设置popupwindow居中显示 +// } +// }); + } + + // @Override +// protected void hideAllWidget() { +// setViewShowState(mBottomContainer, INVISIBLE); +// setViewShowState(mTopContainer, INVISIBLE); +// setViewShowState(mBottomProgressBar, VISIBLE); +// setViewShowState(mStartButton, INVISIBLE); +// setViewShowState(mStartButton, INVISIBLE); +// setViewShowState(close, INVISIBLE); +// } + public void setQuestionContent(FansAskBean fansAskBean){ + ImageLoaderUtils.displayUrl(mContext,ivHead,fansAskBean.getHeadUrl()); + tvName.setText(fansAskBean.getNickName()); + tvQuestion.setText(fansAskBean.getUask()); + + } + + + @Override + protected void startDismissControlViewTimer() { + cancelDismissControlViewTimer(); + mDismissControlViewTimer = new Timer(); + DismissControlViewTimerTask mDismissControlViewTimerTask = new DismissControlViewTimerTask(); + mDismissControlViewTimer.schedule(mDismissControlViewTimerTask, mDismissControlTime); + } + + + + private class DismissControlViewTimerTask extends TimerTask { + + @Override + public void run() { + if (mCurrentState != CURRENT_STATE_NORMAL + && mCurrentState != CURRENT_STATE_ERROR + && mCurrentState != CURRENT_STATE_AUTO_COMPLETE) { + if (getActivityContext() != null) { + ((Activity) getActivityContext()).runOnUiThread(new Runnable() { + @Override + public void run() { + setViewShowState(mStartButton, INVISIBLE); +// hideAllWidget(); +// setViewShowState(mLockScreen, GONE); +// if (mHideKey && mIfCurrentIsFullscreen && mShowVKey) { +// hideNavKey(mContext); +// } + } + }); + } + } + } + } + + /** + * 点击触摸显示和隐藏逻辑 + */ + @Override + protected void onClickUiToggle() { + if (mIfCurrentIsFullscreen && mLockCurScreen && mNeedLockFull) { + setViewShowState(mLockScreen, VISIBLE); + return; + } + if (mCurrentState == CURRENT_STATE_PREPAREING) { + if (mStartButton != null) { + if (mStartButton.getVisibility() == View.VISIBLE) { + changeUiToPrepareingClear(); + } else { + changeUiToPreparingShow(); + } + } + } else if (mCurrentState == CURRENT_STATE_PLAYING) { + if (mStartButton != null) { + if (mStartButton.getVisibility() == View.VISIBLE) { + changeUiToPlayingClear(); + } else { + changeUiToPlayingShow(); + } + } + } else if (mCurrentState == CURRENT_STATE_PAUSE) { + if (mStartButton != null) { + if (mStartButton.getVisibility() == View.VISIBLE) { + changeUiToPauseClear(); + } else { + changeUiToPauseShow(); + } + } + } else if (mCurrentState == CURRENT_STATE_AUTO_COMPLETE) { + if (mStartButton != null) { + if (mStartButton.getVisibility() == View.VISIBLE) { + changeUiToCompleteClear(); + } else { + changeUiToCompleteShow(); + } + } + } else if (mCurrentState == CURRENT_STATE_PLAYING_BUFFERING_START) { + if (mStartButton != null) { + if (mStartButton.getVisibility() == View.VISIBLE) { + changeUiToPlayingBufferingClear(); + } else { + changeUiToPlayingBufferingShow(); + } + } + } + } + + @Override + protected void changeUiToPlayingClear() { + Debuger.printfLog("changeUiToPlayingClear"); + changeUiToClear(); + setViewShowState(mBottomProgressBar, VISIBLE); + } + @Override + protected void changeUiToPauseClear() { + Debuger.printfLog("changeUiToPauseClear"); + changeUiToClear(); + setViewShowState(mBottomProgressBar, VISIBLE); + updatePauseCover(); + } + + @Override + protected void changeUiToClear() { + Debuger.printfLog("changeUiToClear"); + +// setViewShowState(mTopContainer, INVISIBLE); +// setViewShowState(mBottomContainer, INVISIBLE); + setViewShowState(mStartButton, INVISIBLE); + setViewShowState(mLoadingProgressBar, INVISIBLE); + setViewShowState(mThumbImageViewLayout, INVISIBLE); +// setViewShowState(mBottomProgressBar, INVISIBLE); +// setViewShowState(close, INVISIBLE); + +// setViewShowState(mLockScreen, GONE); + + if (mLoadingProgressBar instanceof ENDownloadView) { + ((ENDownloadView) mLoadingProgressBar).reset(); + } + } + + @Override + protected void changeUiToPlayingShow() { + Debuger.printfLog("changeUiToPlayingShow"); + +// setViewShowState(mTopContainer, VISIBLE); +// setViewShowState(mBottomContainer, VISIBLE); + setViewShowState(mStartButton, VISIBLE); +// setViewShowState(close, VISIBLE); +// + setViewShowState(mLoadingProgressBar, INVISIBLE); + setViewShowState(mThumbImageViewLayout, INVISIBLE); +// setViewShowState(mBottomProgressBar, INVISIBLE); +// setViewShowState(mLockScreen, (mIfCurrentIsFullscreen && mNeedLockFull) ? VISIBLE : GONE); + + if (mLoadingProgressBar instanceof ENDownloadView) { + ((ENDownloadView) mLoadingProgressBar).reset(); + } + updateStartImage(); + } + +// @Override +// protected void changeUiToNormal() { +// Debuger.printfLog("changeUiToNormal"); +// +// setViewShowState(mTopContainer, VISIBLE); +// setViewShowState(mBottomContainer, INVISIBLE); +// setViewShowState(mStartButton, VISIBLE); +// setViewShowState(mLoadingProgressBar, INVISIBLE); +// setViewShowState(mThumbImageViewLayout, VISIBLE); +// setViewShowState(mBottomProgressBar, INVISIBLE); +// setViewShowState(mLockScreen, (mIfCurrentIsFullscreen && mNeedLockFull) ? VISIBLE : GONE); +// +// updateStartImage(); +// if (mLoadingProgressBar instanceof ENDownloadView) { +// ((ENDownloadView) mLoadingProgressBar).reset(); +// } +// } + + @Override + protected void setProgressAndTime(int progress, int secProgress, int currentTime, int totalTime) { + +// if (mProgressBar == null || mTotalTimeTextView == null || mCurrentTimeTextView == null) { +// return; +// } + + LogUtils.logd("progress:" + progress); +// if (progress > 88) progress = 100; + if (secProgress > 94) secProgress = 100; +// if (secProgress != 0 && !mCacheFile) { +// mProgressBar.setSecondaryProgress(secProgress); +// } +// mTotalTimeTextView.setText(CommonUtil.stringForTime(totalTime)); +// if (currentTime > 0) +// mCurrentTimeTextView.setText(CommonUtil.stringForTime(currentTime)); + + if (topProgress != null) { + if (progress != 0) topProgress.setProgress(progress); + if (secProgress != 0 && !mCacheFile) + topProgress.setSecondaryProgress(secProgress); + } + } +// @Override +// protected void setTextAndProgress(int secProgress) { +// int position = this.getCurrentPositionWhenPlaying(); +// int duration = this.getDuration(); +// +//// int progress = position * 100 / (duration == 0?1:duration); +// LogUtils.logd("当前状态:"+mCurrentState); +// LogUtils.logd("position:"+position+"duration:"+duration); +// if(mCurrentState == CURRENT_STATE_AUTO_COMPLETE){ +// this.setProgressAndTime(100, secProgress, position, duration); +// LogUtils.logd("进来了吗"); +// }else{ +// super.setTextAndProgress(secProgress); +// } +// } + + @Override + protected void updateStartImage() { + if (mStartButton instanceof ImageView) { + ImageView imageView = (ImageView) mStartButton; + if (mCurrentState == CURRENT_STATE_PLAYING) { + imageView.setImageResource(R.drawable.video_click_pause_selector); + } else if (mCurrentState == CURRENT_STATE_ERROR) { + imageView.setImageResource(R.drawable.video_click_play_selector); + } else { + imageView.setImageResource(R.drawable.video_click_play_selector); + } + } + } + + @Override + public void onAutoCompletion() { + int position = this.getCurrentPositionWhenPlaying(); + int duration = this.getDuration(); + LogUtils.logd("我播完了"); + setProgressAndTime(100, 0, position, duration); + super.onAutoCompletion(); + callBack.onCompletion(); + } + + + CallBack callBack; + + public interface CallBack { + void onClickBack(); + void onCompletion(); + } + + public void setOnCallBack(CallBack callBack) { + this.callBack = callBack; + } +} diff --git a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/OnTransitionListener.java b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/OnTransitionListener.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/OnTransitionListener.java rename to app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/OnTransitionListener.java index 670f51c..9c7e5c1 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/OnTransitionListener.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/OnTransitionListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.customVideoPlayer; +package com.cloudTop.starshare.widget.customVideoPlayer; import android.annotation.TargetApi; import android.os.Build; diff --git a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/SwitchVideoModel.java b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/SwitchVideoModel.java similarity index 90% rename from app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/SwitchVideoModel.java rename to app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/SwitchVideoModel.java index 487fb26..abf2948 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/SwitchVideoModel.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/customVideoPlayer/SwitchVideoModel.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.customVideoPlayer; +package com.cloudTop.starshare.widget.customVideoPlayer; /** * Created by shuyu on 2016/12/7. diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiAdapter.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiAdapter.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiAdapter.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiAdapter.java index 28bb035..63cd610 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; @@ -10,7 +10,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public class EmojiAdapter extends BaseAdapter { diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiManager.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiManager.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiManager.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiManager.java index 267f8fb..8d033b6 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmojiManager.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmojiManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.content.res.Resources; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionKeyboard.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionKeyboard.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionKeyboard.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionKeyboard.java index f68a5fc..13ce48e 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionKeyboard.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionKeyboard.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.annotation.TargetApi; import android.app.Activity; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionLayout.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionLayout.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionLayout.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionLayout.java index d19c2b6..ed94869 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionLayout.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionLayout.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.graphics.drawable.Drawable; @@ -15,7 +15,7 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** * CSDN_LQR diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionTab.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionTab.java similarity index 93% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionTab.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionTab.java index 13af289..94ac2b4 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionTab.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionTab.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.text.TextUtils; @@ -6,7 +6,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionViewPagerAdapter.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionViewPagerAdapter.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionViewPagerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionViewPagerAdapter.java index 98f2f26..17281bd 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/EmotionViewPagerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/EmotionViewPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.support.v4.view.PagerAdapter; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionExtClickListener.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionExtClickListener.java similarity index 82% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionExtClickListener.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionExtClickListener.java index c402760..c3f0f1d 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionExtClickListener.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionExtClickListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.view.View; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionSelectedListener.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionSelectedListener.java similarity index 80% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionSelectedListener.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionSelectedListener.java index 53ad54f..cddd128 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/IEmotionSelectedListener.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IEmotionSelectedListener.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; public interface IEmotionSelectedListener { void onEmojiSelected(String key); diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/IImageLoader.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IImageLoader.java similarity index 84% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/IImageLoader.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/IImageLoader.java index f0175f7..afaeab2 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/IImageLoader.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/IImageLoader.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.widget.ImageView; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/LQREmotionKit.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/LQREmotionKit.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/LQREmotionKit.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/LQREmotionKit.java index 5b0cf17..fd0ec05 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/LQREmotionKit.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/LQREmotionKit.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.content.res.AssetManager; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/MoonUtils.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/MoonUtils.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/MoonUtils.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/MoonUtils.java index 7c8313c..636278a 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/MoonUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/MoonUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerAdapter.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerAdapter.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/StickerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerAdapter.java index c115dbb..55fcd74 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.content.Context; import android.view.View; @@ -8,7 +8,7 @@ import android.widget.ImageView; import android.widget.RelativeLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; /** diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerCategory.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerCategory.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/StickerCategory.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerCategory.java index b4c45ab..33750ca 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerCategory.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerCategory.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import java.io.File; diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerItem.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerItem.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/StickerItem.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerItem.java index f0de44e..5ac0d24 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerItem.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerItem.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; public class StickerItem { diff --git a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerManager.java b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerManager.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/emoji/StickerManager.java rename to app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerManager.java index 5299c8e..453d93e 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/emoji/StickerManager.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/emoji/StickerManager.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.emoji; +package com.cloudTop.starshare.widget.emoji; import android.support.annotation.Nullable; diff --git a/app/src/main/java/com/yundian/celebrity/widget/indicator/IconPageIndicator.java b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPageIndicator.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/indicator/IconPageIndicator.java rename to app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPageIndicator.java index 0b5596e..66b2849 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/indicator/IconPageIndicator.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPageIndicator.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.indicator; +package com.cloudTop.starshare.widget.indicator; import android.content.Context; import android.support.v4.view.PagerAdapter; @@ -11,7 +11,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import static android.view.ViewGroup.LayoutParams.FILL_PARENT; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; diff --git a/app/src/main/java/com/yundian/celebrity/widget/indicator/IconPagerAdapter.java b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPagerAdapter.java similarity index 80% rename from app/src/main/java/com/yundian/celebrity/widget/indicator/IconPagerAdapter.java rename to app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPagerAdapter.java index 8ca5dde..f467039 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/indicator/IconPagerAdapter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IconPagerAdapter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.indicator; +package com.cloudTop.starshare.widget.indicator; public interface IconPagerAdapter { /** diff --git a/app/src/main/java/com/yundian/celebrity/widget/indicator/IcsLinearLayout.java b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IcsLinearLayout.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/indicator/IcsLinearLayout.java rename to app/src/main/java/com/cloudTop/starshare/widget/indicator/IcsLinearLayout.java index 46a4c71..db8bb7e 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/indicator/IcsLinearLayout.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/indicator/IcsLinearLayout.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.indicator; +package com.cloudTop.starshare.widget.indicator; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/com/yundian/celebrity/widget/indicator/PageIndicator.java b/app/src/main/java/com/cloudTop/starshare/widget/indicator/PageIndicator.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/indicator/PageIndicator.java rename to app/src/main/java/com/cloudTop/starshare/widget/indicator/PageIndicator.java index 4f85319..8e07330 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/indicator/PageIndicator.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/indicator/PageIndicator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.yundian.celebrity.widget.indicator; +package com.cloudTop.starshare.widget.indicator; import android.support.v4.view.ViewPager; diff --git a/app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureButton.java b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureButton.java similarity index 97% rename from app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureButton.java index 05b7559..ed09b2a 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureButton.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.photobutton; +package com.cloudTop.starshare.widget.photobutton; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -13,9 +13,9 @@ import android.view.View; import android.view.animation.LinearInterpolator; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.DisplayUtil; -import com.yundian.celebrity.widget.photobutton.lisenter.CaptureLisenter; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.DisplayUtil; +import com.cloudTop.starshare.widget.photobutton.lisenter.CaptureLisenter; /** @@ -35,8 +35,7 @@ public class CaptureButton extends View { public static final int BUTTON_STATE_ONLY_RECORDER = 0x102; //两者都可以 public static final int BUTTON_STATE_BOTH = 0x103; - - + protected int bitmapRes=R.drawable.audio; //按钮可执行的功能状态 @@ -145,9 +144,10 @@ public CaptureButton(Context context,AttributeSet attrs) { } //customize construction method - public CaptureButton(Context context, int size) { + public CaptureButton(Context context, int size,int bitmapRes) { super(context); this.button_size = size; + this.bitmapRes = bitmapRes; button_radius = size / 2.0f; button_outside_radius = button_radius; diff --git a/app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureLayout.java b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureLayout.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureLayout.java rename to app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureLayout.java index 5a29ab1..9bfbc29 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/photobutton/CaptureLayout.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/CaptureLayout.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.photobutton; +package com.cloudTop.starshare.widget.photobutton; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -14,8 +14,10 @@ import android.widget.FrameLayout; import android.widget.TextView; -import com.yundian.celebrity.widget.photobutton.lisenter.CaptureLisenter; -import com.yundian.celebrity.widget.photobutton.lisenter.TypeLisenter; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.widget.AudioRecordButton; +import com.cloudTop.starshare.widget.photobutton.lisenter.CaptureLisenter; +import com.cloudTop.starshare.widget.photobutton.lisenter.TypeLisenter; /** @@ -146,7 +148,7 @@ public void startAlphaAnimation() { private void initView() { setWillNotDraw(false); //btn_capture - btn_capture = new CaptureButton(getContext(), button_size); + btn_capture = new AudioRecordButton(getContext(), button_size, R.drawable.video); LayoutParams btn_capture_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); // btn_capture_param.addRule(CENTER_IN_PARENT, TRUE); btn_capture_param.gravity = Gravity.CENTER; @@ -271,7 +273,7 @@ public void onClick(View view) { LayoutParams txt_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); txt_param.gravity = Gravity.CENTER_HORIZONTAL; txt_param.setMargins(0, 0, 0, 0); - txt_tip.setText("轻触拍照，长按摄像"); + txt_tip.setText("长按录制视频"); txt_tip.setTextColor(0xFFFFFFFF); txt_tip.setGravity(Gravity.CENTER); txt_tip.setLayoutParams(txt_param); diff --git a/app/src/main/java/com/yundian/celebrity/widget/photobutton/TypeButton.java b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/TypeButton.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/widget/photobutton/TypeButton.java rename to app/src/main/java/com/cloudTop/starshare/widget/photobutton/TypeButton.java index f988c2d..5c30b95 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/photobutton/TypeButton.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/TypeButton.java @@ -1,8 +1,7 @@ -package com.yundian.celebrity.widget.photobutton; +package com.cloudTop.starshare.widget.photobutton; import android.content.Context; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; @@ -64,11 +63,11 @@ protected void onDraw(Canvas canvas) { //如果类型为取消，则绘制内部为返回箭头 if (button_type == TYPE_CANCEL) { mPaint.setAntiAlias(true); - mPaint.setColor(0xEECCCCCC); + mPaint.setColor(0xFFFFFFFF); mPaint.setStyle(Paint.Style.FILL); canvas.drawCircle(center_X, center_Y, button_radius, mPaint); - mPaint.setColor(Color.BLACK); + mPaint.setColor(0xff999999); mPaint.setStyle(Paint.Style.STROKE); mPaint.setStrokeWidth(strokeWidth); @@ -95,7 +94,7 @@ protected void onDraw(Canvas canvas) { canvas.drawCircle(center_X, center_Y, button_radius, mPaint); mPaint.setAntiAlias(true); mPaint.setStyle(Paint.Style.STROKE); - mPaint.setColor(0xFF00CC00); + mPaint.setColor(0xFFFB9938); mPaint.setStrokeWidth(strokeWidth); path.moveTo(center_X - button_size / 6f, center_Y); diff --git a/app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/CaptureLisenter.java b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/CaptureLisenter.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/CaptureLisenter.java rename to app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/CaptureLisenter.java index 5c4584d..15d21a4 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/CaptureLisenter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/CaptureLisenter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.photobutton.lisenter; +package com.cloudTop.starshare.widget.photobutton.lisenter; /** * create by CJT2325 diff --git a/app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/TypeLisenter.java b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/TypeLisenter.java similarity index 81% rename from app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/TypeLisenter.java rename to app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/TypeLisenter.java index c7b76bf..21710f7 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/photobutton/lisenter/TypeLisenter.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/photobutton/lisenter/TypeLisenter.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.photobutton.lisenter; +package com.cloudTop.starshare.widget.photobutton.lisenter; /** * ===================================== diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/Config.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/Config.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/Config.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/Config.java index de5eb9d..e1d0acf 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/Config.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/Config.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import android.os.Environment; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/CustomProgressDialog.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/CustomProgressDialog.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/CustomProgressDialog.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/CustomProgressDialog.java index a6bd2e8..bdd2f0d 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/CustomProgressDialog.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/CustomProgressDialog.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import android.app.ProgressDialog; import android.content.Context; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/FocusIndicator.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/FocusIndicator.java similarity index 96% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/FocusIndicator.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/FocusIndicator.java index e71eeb9..bdfff5d 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/FocusIndicator.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/FocusIndicator.java @@ -1,11 +1,11 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import android.content.Context; import android.support.annotation.Nullable; import android.util.AttributeSet; import android.view.View; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; public class FocusIndicator extends View { diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/PermissionChecker.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/PermissionChecker.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/PermissionChecker.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/PermissionChecker.java index 076eefd..c203f98 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/PermissionChecker.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/PermissionChecker.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import android.Manifest; import android.annotation.TargetApi; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/RecordSettings.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/RecordSettings.java similarity index 99% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/RecordSettings.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/RecordSettings.java index 79d3c7f..da4b3bc 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/RecordSettings.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/RecordSettings.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import com.qiniu.pili.droid.shortvideo.PLCameraSetting; import com.qiniu.pili.droid.shortvideo.PLVideoEncodeSetting; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/ToastUtils.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/ToastUtils.java similarity index 86% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/ToastUtils.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/ToastUtils.java index 195ee0b..a17b64b 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/ToastUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/ToastUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder; +package com.cloudTop.starshare.widget.videorecorder; import android.content.Context; import android.widget.Toast; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/GLRenderer.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/GLRenderer.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/GLRenderer.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/GLRenderer.java index 6573deb..2818bfb 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/GLRenderer.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/GLRenderer.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder.render; +package com.cloudTop.starshare.widget.videorecorder.render; import android.content.Context; import android.graphics.SurfaceTexture; @@ -10,7 +10,7 @@ import android.util.Log; import android.view.Surface; -import com.yundian.celebrity.R; +import com.cloudTop.starshare.R; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/ShaderUtils.java b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/ShaderUtils.java similarity index 98% rename from app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/ShaderUtils.java rename to app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/ShaderUtils.java index a0a93c3..7240af1 100644 --- a/app/src/main/java/com/yundian/celebrity/widget/videorecorder/render/ShaderUtils.java +++ b/app/src/main/java/com/cloudTop/starshare/widget/videorecorder/render/ShaderUtils.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.widget.videorecorder.render; +package com.cloudTop.starshare.widget.videorecorder.render; import android.content.Context; import android.opengl.GLES20; diff --git a/app/src/main/java/com/yundian/celebrity/wxapi/LineMarkerView.java b/app/src/main/java/com/cloudTop/starshare/wxapi/LineMarkerView.java similarity index 91% rename from app/src/main/java/com/yundian/celebrity/wxapi/LineMarkerView.java rename to app/src/main/java/com/cloudTop/starshare/wxapi/LineMarkerView.java index 8402680..3fff3c2 100644 --- a/app/src/main/java/com/yundian/celebrity/wxapi/LineMarkerView.java +++ b/app/src/main/java/com/cloudTop/starshare/wxapi/LineMarkerView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.wxapi; +package com.cloudTop.starshare.wxapi; import android.content.Context; import android.widget.LinearLayout; @@ -7,9 +7,8 @@ import com.github.mikephil.charting.components.MarkerView; import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.highlight.Highlight; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.DisplayUtil; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.DisplayUtil; /** * Created by Administrator on 2017/3/20. diff --git a/app/src/main/java/com/yundian/celebrity/wxapi/MyScrollView.java b/app/src/main/java/com/cloudTop/starshare/wxapi/MyScrollView.java similarity index 95% rename from app/src/main/java/com/yundian/celebrity/wxapi/MyScrollView.java rename to app/src/main/java/com/cloudTop/starshare/wxapi/MyScrollView.java index 2eae54b..121748c 100644 --- a/app/src/main/java/com/yundian/celebrity/wxapi/MyScrollView.java +++ b/app/src/main/java/com/cloudTop/starshare/wxapi/MyScrollView.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.wxapi; +package com.cloudTop.starshare.wxapi; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/com/yundian/celebrity/wxapi/RadiusMarkerView.java b/app/src/main/java/com/cloudTop/starshare/wxapi/RadiusMarkerView.java similarity index 92% rename from app/src/main/java/com/yundian/celebrity/wxapi/RadiusMarkerView.java rename to app/src/main/java/com/cloudTop/starshare/wxapi/RadiusMarkerView.java index 10de71c..6fd68ba 100644 --- a/app/src/main/java/com/yundian/celebrity/wxapi/RadiusMarkerView.java +++ b/app/src/main/java/com/cloudTop/starshare/wxapi/RadiusMarkerView.java @@ -1,7 +1,6 @@ -package com.yundian.celebrity.wxapi; +package com.cloudTop.starshare.wxapi; import android.content.Context; -import android.view.ViewParent; import android.widget.LinearLayout; import android.widget.TextView; @@ -9,8 +8,8 @@ import com.github.mikephil.charting.components.MarkerView; import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.highlight.Highlight; -import com.yundian.celebrity.R; -import com.yundian.celebrity.utils.DisplayUtil; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.utils.DisplayUtil; /** * Created by Administrator on 2017/3/20. diff --git a/app/src/main/java/com/yundian/celebrity/wxapi/WXEntryActivity.java b/app/src/main/java/com/cloudTop/starshare/wxapi/WXEntryActivity.java similarity index 94% rename from app/src/main/java/com/yundian/celebrity/wxapi/WXEntryActivity.java rename to app/src/main/java/com/cloudTop/starshare/wxapi/WXEntryActivity.java index f467e98..94c012e 100644 --- a/app/src/main/java/com/yundian/celebrity/wxapi/WXEntryActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/wxapi/WXEntryActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.wxapi; +package com.cloudTop.starshare.wxapi; import android.content.Intent; import android.os.Bundle; @@ -17,19 +17,19 @@ import com.tencent.mm.opensdk.modelmsg.SendAuth; import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; import com.umeng.weixin.callback.WXCallbackActivity; -import com.yundian.celebrity.R; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.app.Constant; -import com.yundian.celebrity.bean.RegisterReturnWangYiBeen; -import com.yundian.celebrity.bean.WXAccessTokenEntity; -import com.yundian.celebrity.bean.WXUserInfoEntity; -import com.yundian.celebrity.bean.WXinLoginReturnBeen; -import com.yundian.celebrity.ui.wangyi.DemoCache; -import com.yundian.celebrity.ui.wangyi.config.preference.Preferences; -import com.yundian.celebrity.ui.wangyi.config.preference.UserPreferences; -import com.yundian.celebrity.utils.HttpUrlConnectionUtil; -import com.yundian.celebrity.utils.LogUtils; -import com.yundian.celebrity.utils.ToastUtils; +import com.cloudTop.starshare.R; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.app.Constant; +import com.cloudTop.starshare.bean.RegisterReturnWangYiBeen; +import com.cloudTop.starshare.bean.WXAccessTokenEntity; +import com.cloudTop.starshare.bean.WXUserInfoEntity; +import com.cloudTop.starshare.bean.WXinLoginReturnBeen; +import com.cloudTop.starshare.ui.wangyi.DemoCache; +import com.cloudTop.starshare.ui.wangyi.config.preference.Preferences; +import com.cloudTop.starshare.ui.wangyi.config.preference.UserPreferences; +import com.cloudTop.starshare.utils.HttpUrlConnectionUtil; +import com.cloudTop.starshare.utils.LogUtils; +import com.cloudTop.starshare.utils.ToastUtils; /** diff --git a/app/src/main/java/com/yundian/celebrity/wxapi/WXPayEntryActivity.java b/app/src/main/java/com/cloudTop/starshare/wxapi/WXPayEntryActivity.java similarity index 89% rename from app/src/main/java/com/yundian/celebrity/wxapi/WXPayEntryActivity.java rename to app/src/main/java/com/cloudTop/starshare/wxapi/WXPayEntryActivity.java index 7904ddf..4b528db 100644 --- a/app/src/main/java/com/yundian/celebrity/wxapi/WXPayEntryActivity.java +++ b/app/src/main/java/com/cloudTop/starshare/wxapi/WXPayEntryActivity.java @@ -1,4 +1,4 @@ -package com.yundian.celebrity.wxapi; +package com.cloudTop.starshare.wxapi; import android.app.Activity; import android.content.Intent; @@ -9,9 +9,9 @@ import com.tencent.mm.opensdk.modelbase.BaseResp; import com.tencent.mm.opensdk.openapi.IWXAPI; import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler; -import com.yundian.celebrity.app.AppApplication; -import com.yundian.celebrity.bean.EventBusMessage; -import com.yundian.celebrity.utils.LogUtils; +import com.cloudTop.starshare.app.AppApplication; +import com.cloudTop.starshare.bean.EventBusMessage; +import com.cloudTop.starshare.utils.LogUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/yundian/celebrity/alipay/PayResult.java b/app/src/main/java/com/yundian/celebrity/alipay/PayResult.java deleted file mode 100644 index e410e3b..0000000 --- a/app/src/main/java/com/yundian/celebrity/alipay/PayResult.java +++ /dev/null @@ -1 +0,0 @@ -package com.yundian.celebrity.alipay; import android.text.TextUtils; import java.util.Map; public class PayResult { private String resultStatus; private String result; private String memo; public PayResult(Map rawResult) { if (rawResult == null) { return; } for (String key : rawResult.keySet()) { if (TextUtils.equals(key, "resultStatus")) { resultStatus = rawResult.get(key); } else if (TextUtils.equals(key, "result")) { result = rawResult.get(key); } else if (TextUtils.equals(key, "memo")) { memo = rawResult.get(key); } } } @Override public String toString() { return "resultStatus={" + resultStatus + "};memo={" + memo + "};result={" + result + "}"; } /** * @return the resultStatus */ public String getResultStatus() { return resultStatus; } /** * @return the memo */ public String getMemo() { return memo; } /** * @return the result */ public String getResult() { return result; } } \ No newline at end of file diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CustomAudioAdapter.java b/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CustomAudioAdapter.java deleted file mode 100644 index fc118fe..0000000 --- a/app/src/main/java/com/yundian/celebrity/ui/main/adapter/CustomAudioAdapter.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.yundian.celebrity.ui.main.adapter; - -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yundian.celebrity.R; -import com.yundian.celebrity.bean.FansAskBean; -import com.yundian.celebrity.utils.ImageLoaderUtils; -import com.yundian.celebrity.utils.TimeUtil; - -import java.util.List; - -/** - * Created by sll on 2017/5/25. - */ - -public class CustomAudioAdapter extends BaseQuickAdapter { - OnAdapterCallBack onAdapterCallBack; - - public interface OnAdapterCallBack { - void onGoRecord(FansAskBean item,int positon); - void onListenAnswer(FansAskBean item,int positon,ImageView ivPlay); - } - - - public CustomAudioAdapter(@LayoutRes int layoutResId, @Nullable List data, OnAdapterCallBack OnAdapterCallBack) { - super(layoutResId, data); - this.onAdapterCallBack = OnAdapterCallBack; -// this.mContext = context; - } - - @Override - protected void convert(final BaseViewHolder helper, final FansAskBean item) { - - final int layoutPosition = helper.getLayoutPosition(); - helper.setText(R.id.tv_ask_question,item.getUask()); - TextView tvHeardNum = helper.getView(R.id.tv_heard_num); - String heardNum = mContext.getResources().getString(R.string.heard_num, item.getS_total()); - - tvHeardNum.setText(heardNum); - helper.setText(R.id.tv_name,item.getNickName()); - - String askTime = TimeUtil.formatData(TimeUtil.dateFormatYMD, item.getAsk_t()); - helper.setText(R.id.tv_time,askTime); - - if(item.getC_type()==0){ - helper.setText(R.id.tv_custom_time,"15s定制"); - }else if(item.getC_type()==1){ - helper.setText(R.id.tv_custom_time,"30s定制"); - }else if(item.getC_type()==2){ - helper.setText(R.id.tv_custom_time,"45s定制"); - }else if(item.getC_type()==3){ - helper.setText(R.id.tv_custom_time,"60s定制"); - } -// -// -// -// - LinearLayout ll_go_record = helper.getView(R.id.ll_go_record); - LinearLayout ll_listen = helper.getView(R.id.ll_listen); - final ImageView ivPlay = (ImageView)ll_listen.findViewById(R.id.iv_play_record); - ll_go_record.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onAdapterCallBack.onGoRecord(item,layoutPosition); - } - }); - ll_listen.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onAdapterCallBack.onListenAnswer(item,layoutPosition,ivPlay); - } - }); - - ImageView headView = helper.getView(R.id.iv_head); - - if(item.getAnswer_t()==0){ - ll_go_record.setVisibility(View.VISIBLE); - ll_listen.setVisibility(View.GONE); - }else{ - ll_go_record.setVisibility(View.GONE); - ll_listen.setVisibility(View.VISIBLE); - - } - - - ImageLoaderUtils.displaySmallPhotoRound(mContext, headView, item.getHeadUrl()); -// helper.setText(R.id.tv_star_name, item.getNickname()); -// helper.setText(R.id.tv_talk_msg_count, item.get); - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/TestPresenter.java b/app/src/main/java/com/yundian/celebrity/ui/main/presenter/TestPresenter.java deleted file mode 100644 index 4220fb1..0000000 --- a/app/src/main/java/com/yundian/celebrity/ui/main/presenter/TestPresenter.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yundian.celebrity.ui.main.presenter; - -import com.yundian.celebrity.ui.main.contract.TestContract; - -/** - * Created by Null on 2017/5/6. - */ - -public class TestPresenter extends TestContract.Presenter { -} diff --git a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/CustomUIVideo.java b/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/CustomUIVideo.java deleted file mode 100644 index 10664a2..0000000 --- a/app/src/main/java/com/yundian/celebrity/widget/customVideoPlayer/CustomUIVideo.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.yundian.celebrity.widget.customVideoPlayer; - -import android.content.Context; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageView; -import android.widget.ProgressBar; - -import com.shuyu.gsyvideoplayer.utils.Debuger; -import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer; -import com.yundian.celebrity.R; - -import moe.codeest.enviews.ENDownloadView; - -/** - * Created by shuyu on 2016/12/7. - * 注意 - * 这个播放器的demo配置切换到全屏播放器 - * 这只是单纯的作为全屏播放显示，如果需要做大小屏幕切换，请记得在这里耶设置上视频全屏的需要的自定义配置 - */ - -public class CustomUIVideo extends StandardGSYVideoPlayer { - - private ProgressBar topProgress; - - private ImageView close; - - public CustomUIVideo(Context context, Boolean fullFlag) { - super(context, fullFlag); - } - - public CustomUIVideo(Context context) { - super(context); - } - - public CustomUIVideo(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public int getLayoutId() { - return R.layout.video_layout_customed; - } - @Override - protected void init(Context context) { - super.init(context); - this.mContext=context; - initView(); - } - - private void initView() { - final ImageView question = (ImageView)findViewById(R.id.iv_question); - topProgress = (ProgressBar)findViewById(R.id.top_progressbar); - close = (ImageView)findViewById(R.id.close); - close.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { -// getBackButton().performClick(); - callBack.onClickBack(); - - } - }); - - - -// final LinearLayout anchor = (LinearLayout)findViewById(R.id.anchor); - - -// question.setOnClickListener(new View.OnClickListener() { -// @Override -// public void onClick(View view) { -// CustomPopupWindow popupWindow = new CustomPopupWindow.Builder() -// .setContext(mContext) //设置 context -// .setContentView(R.layout.content_ask) //设置布局文件 -// .setwidth(LinearLayout.LayoutParams.WRAP_CONTENT) //设置宽度，由于我已经在布局写好，这里就用 wrap_content就好了 -// .setheight(LinearLayout.LayoutParams.WRAP_CONTENT) //设置高度 -// .setFouse(true) //设置popupwindow 是否可以获取焦点 -// .setOutSideCancel(true) //设置点击外部取消 -// .setAnimationStyle(R.style.popup_anim_style) //设置popupwindow动画 -// .builder() // -// .showAtLocation(question); //设置popupwindow居中显示 -// } -// }); - } -// @Override -// protected void hideAllWidget() { -// setViewShowState(mBottomContainer, INVISIBLE); -// setViewShowState(mTopContainer, INVISIBLE); -// setViewShowState(mBottomProgressBar, VISIBLE); -// setViewShowState(mStartButton, INVISIBLE); -// setViewShowState(mStartButton, INVISIBLE); -// setViewShowState(close, INVISIBLE); -// } - - protected void changeUiToClear() { - Debuger.printfLog("changeUiToClear"); - - setViewShowState(mTopContainer, INVISIBLE); - setViewShowState(mBottomContainer, INVISIBLE); - setViewShowState(mStartButton, INVISIBLE); - setViewShowState(mLoadingProgressBar, INVISIBLE); - setViewShowState(mThumbImageViewLayout, INVISIBLE); - setViewShowState(mBottomProgressBar, INVISIBLE); - setViewShowState(close, INVISIBLE); - - setViewShowState(mLockScreen, GONE); - - if (mLoadingProgressBar instanceof ENDownloadView) { - ((ENDownloadView) mLoadingProgressBar).reset(); - } - } - - @Override - protected void changeUiToPlayingShow() { - Debuger.printfLog("changeUiToPlayingShow"); - - setViewShowState(mTopContainer, VISIBLE); - setViewShowState(mBottomContainer, VISIBLE); - setViewShowState(mStartButton, VISIBLE); - setViewShowState(close, VISIBLE); - - setViewShowState(mLoadingProgressBar, INVISIBLE); - setViewShowState(mThumbImageViewLayout, INVISIBLE); - setViewShowState(mBottomProgressBar, INVISIBLE); - setViewShowState(mLockScreen, (mIfCurrentIsFullscreen && mNeedLockFull) ? VISIBLE : GONE); - - if (mLoadingProgressBar instanceof ENDownloadView) { - ((ENDownloadView) mLoadingProgressBar).reset(); - } - updateStartImage(); - } - -// @Override -// protected void changeUiToNormal() { -// Debuger.printfLog("changeUiToNormal"); -// -// setViewShowState(mTopContainer, VISIBLE); -// setViewShowState(mBottomContainer, INVISIBLE); -// setViewShowState(mStartButton, VISIBLE); -// setViewShowState(mLoadingProgressBar, INVISIBLE); -// setViewShowState(mThumbImageViewLayout, VISIBLE); -// setViewShowState(mBottomProgressBar, INVISIBLE); -// setViewShowState(mLockScreen, (mIfCurrentIsFullscreen && mNeedLockFull) ? VISIBLE : GONE); -// -// updateStartImage(); -// if (mLoadingProgressBar instanceof ENDownloadView) { -// ((ENDownloadView) mLoadingProgressBar).reset(); -// } -// } - - @Override - protected void setProgressAndTime(int progress, int secProgress, int currentTime, int totalTime) { - -// if (mProgressBar == null || mTotalTimeTextView == null || mCurrentTimeTextView == null) { -// return; -// } - - - if (secProgress > 94) secProgress = 100; -// if (secProgress != 0 && !mCacheFile) { -// mProgressBar.setSecondaryProgress(secProgress); -// } -// mTotalTimeTextView.setText(CommonUtil.stringForTime(totalTime)); -// if (currentTime > 0) -// mCurrentTimeTextView.setText(CommonUtil.stringForTime(currentTime)); - - if (topProgress != null) { - if (progress != 0) topProgress.setProgress(progress); - if (secProgress != 0 && !mCacheFile) - topProgress.setSecondaryProgress(secProgress); - } - } - - @Override - protected void updateStartImage() { - if(mStartButton instanceof ImageView) { - ImageView imageView = (ImageView) mStartButton; - if (mCurrentState == CURRENT_STATE_PLAYING) { - imageView.setImageResource(R.drawable.video_click_pause_selector); - } else if (mCurrentState == CURRENT_STATE_ERROR) { - imageView.setImageResource(R.drawable.video_click_play_selector); - } else { - imageView.setImageResource(R.drawable.video_click_play_selector); - } - } - } - - CallBack callBack; - - public interface CallBack{ - void onClickBack(); - } - - public void setOnCallBack(CallBack callBack) { - this.callBack=callBack; - } -} diff --git a/app/src/main/res/anim/menudiss.xml b/app/src/main/res/anim/menudiss.xml new file mode 100644 index 0000000..1401c29 --- /dev/null +++ b/app/src/main/res/anim/menudiss.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/menushow.xml b/app/src/main/res/anim/menushow.xml new file mode 100644 index 0000000..f1382d1 --- /dev/null +++ b/app/src/main/res/anim/menushow.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/btn_switch_camera.png b/app/src/main/res/drawable-xhdpi/btn_switch_camera.png index 56cff1a..c411a2e 100644 Binary files a/app/src/main/res/drawable-xhdpi/btn_switch_camera.png and b/app/src/main/res/drawable-xhdpi/btn_switch_camera.png differ diff --git a/app/src/main/res/drawable-xhdpi/cancel.png b/app/src/main/res/drawable-xhdpi/cancel.png new file mode 100644 index 0000000..2989177 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/cancel.png differ diff --git a/app/src/main/res/drawable-xhdpi/hide_question.png b/app/src/main/res/drawable-xhdpi/hide_question.png new file mode 100644 index 0000000..1a509a8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/hide_question.png differ diff --git a/app/src/main/res/drawable-xhdpi/look.png b/app/src/main/res/drawable-xhdpi/look.png new file mode 100644 index 0000000..51aaa1f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/look.png differ diff --git a/app/src/main/res/drawable-xhdpi/switch_camera.png b/app/src/main/res/drawable-xhdpi/switch_camera.png new file mode 100644 index 0000000..c411a2e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/switch_camera.png differ diff --git a/app/src/main/res/drawable-xhdpi/video.png b/app/src/main/res/drawable-xhdpi/video.png new file mode 100644 index 0000000..9d42c66 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/video.png differ diff --git a/app/src/main/res/drawable-xhdpi/video_btn.png b/app/src/main/res/drawable-xhdpi/video_btn.png new file mode 100644 index 0000000..9251c67 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/video_btn.png differ diff --git a/app/src/main/res/drawable-xhdpi/video_close.png b/app/src/main/res/drawable-xhdpi/video_close.png new file mode 100644 index 0000000..1c5d767 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/video_close.png differ diff --git a/app/src/main/res/drawable-xhdpi/video_play.png b/app/src/main/res/drawable-xhdpi/video_play.png new file mode 100644 index 0000000..1ae0568 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/video_play.png differ diff --git a/app/src/main/res/drawable-xxhdpi/btn_switch_camera.png b/app/src/main/res/drawable-xxhdpi/btn_switch_camera.png new file mode 100644 index 0000000..73900e4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_switch_camera.png differ diff --git a/app/src/main/res/drawable-xxhdpi/cancel.png b/app/src/main/res/drawable-xxhdpi/cancel.png index 2989177..700bcc3 100644 Binary files a/app/src/main/res/drawable-xxhdpi/cancel.png and b/app/src/main/res/drawable-xxhdpi/cancel.png differ diff --git a/app/src/main/res/drawable-xxhdpi/hide_question.png b/app/src/main/res/drawable-xxhdpi/hide_question.png new file mode 100644 index 0000000..e32d616 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/hide_question.png differ diff --git a/app/src/main/res/drawable-xxhdpi/look.png b/app/src/main/res/drawable-xxhdpi/look.png new file mode 100644 index 0000000..4cd480b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/look.png differ diff --git a/app/src/main/res/drawable-xxhdpi/video_btn.png b/app/src/main/res/drawable-xxhdpi/video_btn.png new file mode 100644 index 0000000..3a45e0b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/video_btn.png differ diff --git a/app/src/main/res/drawable-xxhdpi/video_close.png b/app/src/main/res/drawable-xxhdpi/video_close.png new file mode 100644 index 0000000..d5b2dab Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/video_close.png differ diff --git a/app/src/main/res/drawable-xxhdpi/video_play.png b/app/src/main/res/drawable-xxhdpi/video_play.png new file mode 100644 index 0000000..f718b33 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/video_play.png differ diff --git a/app/src/main/res/drawable/sel_common_view_text.xml b/app/src/main/res/drawable/sel_common_view_text.xml index 165aa98..12c0796 100644 --- a/app/src/main/res/drawable/sel_common_view_text.xml +++ b/app/src/main/res/drawable/sel_common_view_text.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/video_play_progress.xml b/app/src/main/res/drawable/video_play_progress.xml index 0b4005c..023ae47 100644 --- a/app/src/main/res/drawable/video_play_progress.xml +++ b/app/src/main/res/drawable/video_play_progress.xml @@ -2,9 +2,9 @@ - + - + @@ -13,8 +13,8 @@ - - + + @@ -22,8 +22,8 @@ - - + + diff --git a/app/src/main/res/layout/activity_add_bank_card.xml b/app/src/main/res/layout/activity_add_bank_card.xml index dec82d6..c163c84 100644 --- a/app/src/main/res/layout/activity_add_bank_card.xml +++ b/app/src/main/res/layout/activity_add_bank_card.xml @@ -6,7 +6,7 @@ android:background="@color/color_fafafa" android:orientation="vertical"> - @@ -90,7 +90,53 @@ + + + + + + + + + + + + + + + + + + + + + + + +